|
Created on 2008-02-09.11:53:03 by mail1, last changed 2009-08-27.13:54:44 by admin.
File name |
Uploaded |
Type |
Edit |
Remove |
unnamed
|
mail1,
2008-02-09.11:53:01
|
text/html |
|
|
msg3261 (view) |
Author: mail1 |
Date: 2008-02-09.11:53:01 |
|
Hi Devs,
being a new user, I wanted to support Darcs2 as much as possible, using it
on not-so-important directories.
I have a dir that stores some command shortcuts which I sync across PCs. I
ran into a failed push and tried to use darcs1 and darcs2 to repair it.
Darcs1 went through and deemed the repo OK, while darcs2 barfed. This is
what I get:
----------
P:\bin>darcs_2008-02-06.exe repair
Unapplicable patch:
Thu Feb 7 12:24:30 Romance Standard Time 2008 xxxx <mail@nxxxxxxxxx.de>
* add_less_and_dcsv
darcs failed: Error applying hunk to file ./dcs.cmd
P:\bin>darcs2 cha -p dcsv -v
P:\bin>darcs_2008-02-06.exe cha -p dcsv -v
diffing dir...
Thu Feb 7 12:24:30 Romance Standard Time 2008 xxxx <mail@nixxxxxxxxxxx.de>
* add_less_and_dcsv
{
addfile ./dcs-v.cmd
hunk ./dcs-v.cmd 1
+"c:\program files\darcs\darcs.exe" %1 -v %2 %3 %4 %5 %6[_^M_][_$_]
hunk ./dcs.cmd 1
-"c:\program files\darcs\darcs.exe" %1 %2 %3 %4 %5 %6[_^M_][_$_]
-
+@"c:\program files\darcs\darcs.exe" %1 %2 %3 %4 %5 %6
addfile ./less.cmd
hunk ./less.cmd 1
+more %1 %2 %3 %4[_^M_][_$_]
}
P:\bin>type dcs.cmd
@"c:\program files\darcs\darcs.exe" %1 %2 %3 %4 %5 %6
P:\bin>
----------
Looks like there is a hunk that wants to change the file to what it already
contains.
If you need any extra info, let me know!
Nico
Attachments
|
|
Date |
User |
Action |
Args |
2008-02-09 11:53:03 | mail1 | create | |
2008-02-09 12:39:37 | droundy | set | priority: bug status: unread -> duplicate nosy:
droundy, tommy, beschmi, kowey, mail1 |
2009-08-06 17:54:00 | admin | set | nosy:
+ markstos, jast, Serware, dmitry.kurochkin, darcs-devel, zooko, dagit, mornfall, simon, thorkilnaur, - droundy, mail1 |
2009-08-06 20:57:27 | admin | set | nosy:
- beschmi |
2009-08-10 22:14:24 | admin | set | nosy:
+ mail1, - markstos, darcs-devel, zooko, jast, dagit, Serware, mornfall |
2009-08-25 18:05:22 | admin | set | nosy:
+ darcs-devel, - simon |
2009-08-27 13:54:44 | admin | set | nosy:
tommy, kowey, darcs-devel, thorkilnaur, mail1, dmitry.kurochkin |
|