New submission from Jason Dagit <[EMAIL PROTECTED]>:
Checking the unravelling of a merge of a sequence... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
{
changepref color
silly
this
changepref color
test
silly
move ./6lV-d5IVWEPl6wJ48 ./test
hunk ./world 2
-
+{
hunk ./world 1
-world world token
-{
+
rmdir ./Uj0fM8r,hXH2J2P4BxUQA0Dd5jp1ldiE2RKxB
replace ./hello [A-Za-z] new old
hunk ./hello 26
-world world hello
-vfWQi7.GPhCiaR8U-
+{
+hurFgKTBZ34JM,82wI
replace ./4 [A-Za-z_] this a
changepref movie
silly
test
hunk ./hello 31
-
-r,VhF-7p6BV-ptSf53ft5t,p3~R/PRY9G4
+sdosqoN1kt
+{
+is test token
hunk ./hello 39
+
hunk ./hello 10
-a this test
-{
+{
+QKFdxqT9iu
hunk ./4M53ram,0UkY5UNgpsoaq~ 1
-world test hello
-{
+silly is silly
+
hunk ./hello 34
+{
+test token silly
binary ./test
oldhex
*7452
newhex
*6851776b2c2f6954737e786d6b7641316551626555637167706376
hunk ./world 5
-
+world hello this
+
+world token is
hunk ./hello 2
-{
-i
+}
+{
}
{
binary ./Tdd-gmE/04BZAlZiw6UgsNt3Q.Ms6vdg0/Wzs
oldhex
*4c3557684968387e3957714c6d39644776584f54396932
newhex
*58504332444f4a426c7347
}
)
merger 0.0 (
replace ./test [A-Za-z_] is test
replace ./test [A-Za-z_] test is
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
Checking that conflict resolution is valid... Falsifiable, after 12 tests:
{
replace ./world [A-Za-z] new old
merger 0.0 (
hunk ./world 3
-a is is
-}
-}
-hello test test
-{
-world a this
-xNSW6E
-a world world
-test a this
-is is a
-3IpPy
-token is hello
-a test hello
-{
-this world hello
-a world this
-world token test
-a hello hello
-1Z
-this hello this
-world a a
-is silly world
-}
-is is world
-{
-is test this
-test world hello
-a this this
-world a a
-world silly test
-}
-test world this
-
-world is a
merger 0.0 (
replace ./world [A-Za-z] new old
replace ./world [A-Za-z_] silly is
)
)
}
adddir ./hello
Checking the order of commutes... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
replace ./test [A-Za-z_] a hello
hunk ./test 1
-
+
+FmSfrg
+token world is
+a test silly
+silly token silly
+test world this
+test world test
+
+world silly this
+
+a a a
+silly is a
+}
+}
+world hello world
+test this token
+is hello world
+
)
merger 0.0 (
hunk ./test 2
-{
-this world silly
-test token is
-test hello is
-ghwCPCfH5wZwE/k~j
-this token hello
-world a silly
-}
-world silly silly
-}
-}
-EBBOTGR8S
-}
-hello a world
-this hello token
-{
-,VjPFy
-silly test test
-test token silly
-{
-test is this
-is is world
-token is world
-is silly hello
-is test this
-this is this
-
-world is this
-}
-a is test
-
hunk ./test 23
+test a a
+a token this
+token world a
+{
+token world token
+{
+}
+
+token a token
+this silly world
+silly is token
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
Checking the unravelling of a merge of a sequence... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
hunk ./test 7
-token test hello
-hello world test
{
merger 0.0 (
hunk ./world 1
-{
-test hello silly
-hello test token
+
+{
+test silly token
+{
+hello this token
+this this world
+
+
+}
+token silly hello
+.BpFd
+}
+token a silly
+test token token
+
+{
+{
+token a test
+silly world world
replace ./world [A-Za-z_] a this
)
}
)
merger 0.0 (
hunk ./test 2
+a test hello
+silly silly token
+K
+hello world silly
+yV
+{
+test hello hello
+token this a
+test is a
+token is a
+}
+
+
+hello token a
+a token a
+{
+{
+uT
+hello token test
+a is is
+
+k
+}
+{
+
+token token silly
+
+test a test
+}
+token silly is
merger 0.0 (
replace ./test [A-Za-z_] is test
binary ./test
oldhex
*357443
newhex
*35386e4b4c4351
)
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
Checking the unravelling of a merge of a sequence... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
{
hunk ./tjbQoo5KPeY 1
+7k1dzd6ln1Z3Ez0,djXBctrlAVf~
+test silly token
+{
+}
+is test a
+silly silly world
+token this hello
+is a token
+this silly world
+hello token is
+silly silly silly
+a world a
+world is test
+{
+cUne04hz
hunk ./mZc63rcWXSt 1
-Oxz0RjG6D
+A9evwZIU
rmdir ./test
hunk ./TPM1tWIP3e4A2fv1L8Vc2 33
-world hello token
hunk ./GkSI6oJfQbrVR7pB93BcdVgzphu2xDhTJNBI 3
-}
+is world token
hunk ./ypcQDEs2TrZKjnt 1
-
-{
+
changepref movie
new
old
move ./iX3SXu5I95PyVl5W6LoWEFMgP2q0iHnAe ./test
changepref movie
this
world
binary ./world
oldhex
*6844673074666a314d397357614652546e4d
newhex
*664134624a4c695873773159317839722e7746322c466a514b6c4c7a2d
hunk ./ubJdSf 2
+test world a
hunk ./test 1
+is silly token
+is this test
adddir ./hello
replace ./,YvXtwKS,XBTSU4sPRkN2rgjX-g/o/test [A-Za-z_] this silly
hunk ./0YVBDxcTxZ/Iacls/world/world 24
-}
+
+is test silly
}
changepref movie
hello
is
)
merger 0.0 (
replace ./world [A-Za-z_] this silly
hunk ./world 7
-hello token this
+
+silly token a
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
Checking again that merges can be swapped (I'm paranoid) ... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
hunk ./hello 2
-is silly test
-m0-joWshVQT
+is is this
+j4AUJbPx2s.T
+}
hunk ./hello 1
-a token test
)
merger 0.0 (
replace ./hello [A-Za-z_] test a
hunk ./hello 2
+hello token a
+world silly silly
+is token world
+
+this token this
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
Checking that merges commute and are well behaved... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
replace ./test [A-Za-z_] world hello
binary ./test
oldhex
*44793748617e793659
newhex
*39496e3879684754
)
merger 0.0 (
replace ./test [A-Za-z] old new
replace ./test [A-Za-z_] a test
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
Checking nontrivial commutes are correct for subcommute force_commute...
Falsifiable, after 39 tests:
rmfile ./test
merger 0.0 (
rmfile ./test
move ./test ./Smx
)
Checking nontrivial commutes are correct for subcommute commute... Falsifiable,
after 62 tests:
{
hunk ./SLG 2
-is a test
-{
-world world silly
+is world is
+}
rmdir ./test
changepref movie
test
world
}
merger 0.0 (
rmdir ./test
move ./test ./hello/world
)
Checking the unravelling of a merge of a sequence... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
{
hunk ./test 3
-
+
merger 0.0 (
hunk ./test 3
-
+
hunk ./test 2
-silly a test
)
}
hunk ./test 2
-token hello is
+token is is
)
merger 0.0 (
hunk ./test 3
-test test silly
+
hunk ./test 3
+token silly test
+is this this
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
Checking nontrivial commutes are correct for subcommute force_commute...
Falsifiable, after 51 tests:
{
move ./test ./hello
addfile ./world
}
(
move ./world ./world-conflict
adddir ./world
)
Checking nontrivial commutes are correct for subcommute commute... Falsifiable,
after 10 tests:
{
addfile ./test
}
move ./world/hello ./test-conflict
Checking the unravelling of three merges... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
move ./test ./D0da0.QWAOh
move ./test ./hello
)
hunk ./hello 1
-,5VKPM
-}
)
merger 0.0 (
hunk ./hello 3
+a this is
+ebFW8dJVt/mp2aqw
hunk ./hello 1
-}
-hello test a
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
Checking nontrivial commutes are correct for subcommute force_commute...
Falsifiable, after 43 tests:
[m
gil**W
gyH
]
<
[-9
/qd**Gr6
G
]
> addfile ./hello
merger 0.0 (
addfile ./hello
addfile ./hello
)
Checking the unravelling of three merges... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
move ./test ./D0da0.QWAOh
move ./test ./hello
)
hunk ./hello 1
-,5VKPM
-}
)
merger 0.0 (
hunk ./hello 3
+a this is
+ebFW8dJVt/mp2aqw
hunk ./hello 1
-}
-hello test a
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
----------
messages: 360
nosy: dagit, droundy, tommy
priority: bug
status: chatting
title: Bugs reported by unit testing
____________________________________
Darcs issue tracker <[EMAIL PROTECTED]>
<http://bugs.darcs.net/issue96>
____________________________________
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
