[darcs-devel] [issue2609] conflicts in unrevert bundle

[Ben Franksen]

New submission from Ben Franksen <ben.franksen at online.de>:

The setup to reproduce this bug is similar to the one for issue2605, but
note the additional "echo V > f; darcs revert -a":

darcs init R1
cd R1
echo A > f
darcs record -lam A1 f
echo B > f
darcs record -lam B f
# we now have R1=A1:>B
cd ..

darcs init R2
cd R2
echo A > f
darcs record -lam A2 f
echo V > f
darcs revert -a
darcs pull ../R1 -a
darcs obliterate -a -p A1
# we now have R2=A2:>B
cd ..

and now we do:

> cd R2 && darcs unrevert -a
Backing up
/tmp/duplicates-unrevert/Darcs2/PatienceDiff/duplicates-unrevert/R2/f(.~0~)
We have conflicts in the following files:
./f

----------
messages: 20460
nosy: bf
status: unknown
title: conflicts in unrevert bundle

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue2609>
__________________________________