[darcs-devel] [issue669] darcs2 repair fails where darcs 1 latest stable does not

[Nicolai Richter (nrG)]

New submission from Nicolai Richter (nrG) <mail at nicolai-richter.de>:

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 at 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 at 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

----------
files: unnamed
messages: 3261
nosy: beschmi, droundy, kowey, mail1, tommy
status: unread
title: darcs2 repair fails where darcs 1 latest stable does not

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue669>
__________________________________
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osuosl.org/pipermail/darcs-devel/attachments/20080209/8e09060c/attachment-0001.htm