[darcs-devel] [issue279] bug in get_extra commuting patch

[Andrew Pimlott]

New submission from Andrew Pimlott <andrew at pimlott.net>:

Below is the transcript of a bug that comes from pulling the resolution
of a three-way conflict onto a four-way conflict (the three-way conflict
plus another).  Specifically, there are four conflicting patches a, b,
c, and d.  The first three are combined in repo c, and then resolved by
patch rc.  All four are combined in repo d, then we try to pull rc from
repo c.

Andrew

~% mkdir 0
~% cd 0
~/0% darcs init
~/0% echo 0 > f           
~/0% darcs add f
~/0% darcs record -a -m 0 
Finished recording patch '0'
~/0% cd ..
~% for r in a b c d; do darcs get 0 $r; (cd $r; echo $r > f; darcs record --ignore-times -a -m $r); done
Copying patch 1 of 1... done!
Finished getting.
Finished recording patch 'a'
Copying patch 1 of 1... done!
Finished getting.
Finished recording patch 'b'
Copying patch 1 of 1... done!
Finished getting.
Finished recording patch 'c'
Copying patch 1 of 1... done!
Finished getting.
Finished recording patch 'd'
~% cd d
~/d% darcs pull -a ../a
We have conflicts in the following files:
./f
Finished pulling and applying.
~/d% darcs pull -a ../b
We have conflicts in the following files:
./f
Finished pulling and applying.
~/d% darcs pull -a ../c
We have conflicts in the following files:
./f
Finished pulling and applying.
~/d% cd ../c
~/c% darcs pull -a ../a
We have conflicts in the following files:
./f
Finished pulling and applying.
~/c% darcs pull -a ../b
We have conflicts in the following files:
./f
Finished pulling and applying.
~/c% echo rc > f
~/c% darcs record -a -m rc
Finished recording patch 'rc'
~/c% cd ../d
~/d% darcs pull -a ../c
Pulling from "../c"...
darcs: bug in get_extra commuting patch:
Fri Sep 29 15:37:15 PDT 2006  andrew.pimlott.ctr at metnet.navy.mil
  * d
zsh: exit 1     /home/andrew/tmp/darcs-unstable/darcs pull -a ../c

----------
messages: 1025
nosy: EricKow, andrew1, droundy, tommy
status: unread
title: bug in get_extra commuting patch

____________________________________
Darcs issue tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue279>
____________________________________