darcs

Issue 2369 Merge commute unit test fails

Title Merge commute unit test fails
Priority Status unknown
Milestone Resolved in
Superseder Nosy List ganesh, mdiaz, owst
Assigned To
Topics

Created on 2014-04-05.18:41:56 by mdiaz, last changed 2014-04-07.09:16:12 by owst.

Files
File name Uploaded Type Edit Remove
exact_version.txt mdiaz, 2014-04-05.18:41:54 text/plain
Messages
msg17266 (view) Author: mdiaz Date: 2014-04-05.18:41:53
This is the output I got:

 merge (twfp): merge commute: [Failed]
*** Failed! (after 68 tests): 
mergeCommute 2 failed
x
duplicate
rotcilfnoc [
move ./Z.txt ./Us/zUY.txt
]
:
rmdir ./Us
move ./Us/zUY.txt ./Z.txt
:
rmdir ./Us
y
conflictor {{
:
move ./Z.txt ./Us/zUY.txt
:
rmdir ./Us
}} []
:
move ./Z.txt ./IX.txt
x'
duplicate
rotcilfnoc {{
:
move ./Z.txt ./IX.txt
:
move ./Z.txt ./Us/zUY.txt
}} []
:
rmdir ./Us
rotcilfnoc [
move ./Z.txt ./IX.txt
]
:
move ./Z.txt ./Us/zUY.txt
:
rmdir ./Us
y'
conflictor {{
:
move ./Z.txt ./Us/zUY.txt
:
rmdir ./Us
}} []
:
move ./Z.txt ./IX.txt
Sealed (WithStartState V1Model{ "Us" "Z.txt"["r f" "Q R" "u e" "p" "o K" 
"O b" "E P" "a z" "C" "d" "d l" "O" "w f" "q" "w P" "s" "L j" "M" "S D" 
"o" "M X" "H" "J f" "Q s"] } (TWFP 4 (ParTree (ParTree (SeqTree (DP 
(fp2fn "./Us") RmDir) NilTree) (SeqTree (DP (fp2fn "./Us") RmDir) 
NilTree)) (ParTree (SeqTree (Move (fp2fn "./Z.txt") (fp2fn 
"./Us/zUY.txt")) (SeqTree (FP (fp2fn "./Us/zUY.txt") (TokReplace "A-Za-
z_0-9" "O" "I")) NilTree)) (SeqTree (DP (fp2fn "./Us") RmDir) (SeqTree 
(Move (fp2fn "./Z.txt") (fp2fn "./IX.txt")) (SeqTree (FP (fp2fn 
"./IX.txt") (Hunk 1 ["r f","Q R","u e","p","o K","O b","E P","a 
z","C","d","d l","O","w f","q","w P","s"] ["b q"])) NilTree)))))))
(used seed 1036523552)

My operating system is Ubuntu:
3.11.0-18-generic #32-Ubuntu SMP i686 GNU/Linux.

Attached is the exact version of darcs 2.9.8.
Attachments
msg17275 (view) Author: ganesh Date: 2014-04-07.05:43:52
I think this test may occasionally fail depending on the random cases 
generated. I'm adding Owen in case he remembers anything as I think he 
was looking at it some time ago.

In any case, we should probably just disable it to avoid confusion for 
now. I doubt anything broke it recently.
msg17276 (view) Author: owst Date: 2014-04-07.09:12:56
Yes, conflictors and duplicates don't play well together. I don't
remember the details well (and annoyingly can't find the bug report),
but I figured out what the issue was at the April sprint in Southampton
a few years ago.

I agree it should be disabled for now.
msg17277 (view) Author: owst Date: 2014-04-07.09:16:11
Ah, here it is: http://bugs.darcs.net/issue2047

I'm not sure it's exactly the same issue, but it's at least very related.
History
Date User Action Args
2014-04-05 18:41:56mdiazcreate
2014-04-07 05:43:53ganeshsetnosy: + ganesh, owst
messages: + msg17275
2014-04-07 09:12:58owstsetmessages: + msg17276
2014-04-07 09:16:12owstsetmessages: + msg17277