[darcs-devel] [darcs #243] crash when there is a conflict during unrevert

Peter Hercek via RT bugs at darcs.net
Sat Mar 5 09:01:54 PST 2005


Sat Mar 05 12:01:51 2005: New ticket: 243.
Transaction: Ticket created by peter at syncad.com
       Queue: Darcs
     Subject: crash when there is a conflict during unrevert
       Owner: Nobody
  Requestors: peter at syncad.com
      Status: new
 Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=243 >

Imerged with conflict markers and crashed. It left behind
 the file with conflict markers so it looks ok otherwise.
Here is the sesion log

16:28:14 j:0 s:0 Peto at metod[552] ~/c/peto/darcs
$ darcs unrevert
merger 0.0 (
hunk ./Lcs.lhs 7
-%
+%  ooooch
hunk ./Lcs.lhs 8
+% test1
+% test2
+%
)
Shall I unrevert this patch? (1/2) [ynWsfqadjk], or ? for help:
hunk ./Lcs.lhs 7
-%
+v v v v v v v
+%
+% test1
+% test2
+%
+*************
+%  ooooch
+^ ^ ^ ^ ^ ^ ^
Shall I unrevert this patch? (2/2) [ynWsfqadjk], or ? for help:

Fail: bug in darcs!
There was an attempt to write an invalid pending!
If possible, please send the contents of _darcs/pending_buggy along
with a bug report.
Please report this to bugs at darcs.net
If possible include the output of 'darcs --exact-version'.
16:29:22 j:0 s:1 Peto at metod[553] ~/c/peto/darcs
$ darcs --exact-version
darcs compiled on Feb  4 2005, at 09:02:07
# configured Fri Feb 4 08:56:21 USMST 2005
sh ./configure --disable-mmap --target=mingw

Context:

[TAG 1.0.2
David Roundy <droundy at abridgegame.org>**20050204123805]

16:30:37 j:0 s:0 Peto at metod[554] ~/c/peto/darcs
$ ls -ld _darcs/
checkpoints  current      inventories  inventory    patches      prefs
16:30:37 j:0 s:0 Peto at metod[554] ~/c/peto/darcs
$ file _darcs/pending_buggy
_darcs/pending_buggy: cannot open `_darcs/pending_buggy' (No such file 
or directory)
16:32:07 j:0 s:0 Peto at metod[555] ~/c/peto/darcs
$





More information about the darcs-devel mailing list