[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-conflicts
Subject:    [darcs-conflicts] minimal test case for reconcile_unwindings bug?
From:       "Eric Kow" <eric.kow () gmail ! com>
Date:       2006-10-13 11:32:05
Message-ID: 4a0b969d0610130432u2b39a427yc04429b23367c8ac () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (text/plain)]

Hi,

I found this while working on the RT -> Roundup migration.  Perhaps it
is relevant for people interested in patch theory and conflicts?  (Or
it might just be an implementation issue; I can't tell)

It is current (1.0.8), reproducable and minimal.

Summary of the steps
--------------------
mkdir foo; cd foo ; darcs init ; cd ..
darcs get foo bar
cd bar/ ; echo 'x' > _darcs/prefs/author ; cd ..
cd foo/ ; echo 'x' > _darcs/prefs/author ; cd ..

cd foo/
touch test ; darcs record
darcs add test     ; darcs record -a -m 'test'
darcs mv test best ; darcs record -a -m 'test -> best'
darcs mv best test ; darcs record -a -m 'best -> test'
cd ..

cd bar/
touch test2
darcs add test2     ; darcs record -a -m 'test2'
darcs mv test2 best ; darcs record -a -m 'test2 -> best'
darcs mv best test2 ; darcs record -a -m 'best -> test2'

darcs pull ../foo/ -a

The error
---------
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.9 (
merger 0.0 (
(
move ./best ./best-conflict
move ./test ./best
)
move ./best ./test2
)
merger 0.0 (
move ./test2 ./best-conflict
move ./best ./test
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.


darcs --exact-version
---------------------
darcs compiled on Jun 20 2006, at 18:10:15
# configured Fri Jun 16 14:55:21 EDT 2006
./configure --no-create --no-recursion

Context:

[TAG 1.0.8
Tommy Pettersson <ptp@lysator.liu.se>**20060616160213]


-- 
Eric Kow                     http://www.loria.fr/~kow
PGP Key ID: 08AC04F9         Merci de corriger mon français.


_______________________________________________
darcs-conflicts mailing list
darcs-conflicts@darcs.net
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-conflicts


[prev in list] [next in list] [prev in thread] [next in thread]