New submission from Nicolai Richter (nrG) <[EMAIL PROTECTED]>: 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 <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
* 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
----------
files: unnamed
messages: 3260
nosy: beschmi, droundy, kowey, mail1, tommy
status: unread
title: darcs2 repair fails where darcs 1 latest stable does not
__________________________________
Darcs bug tracker <[EMAIL PROTECTED]>
<http://bugs.darcs.net/issue668>
__________________________________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 <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
* 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
_______________________________________________ darcs-devel mailing list darcs-devel@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-devel
