[darcs-devel] [issue2369] Merge commute unit test fails

[Marcio Díaz]

New submission from Marcio Díaz <marcio.diaz at gmail.com>:

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.

----------
files: exact_version.txt
messages: 17266
nosy: mdiaz
status: unknown
title: Merge commute unit test fails

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue2369>
__________________________________
-------------- next part --------------
darcs compiled on Apr  5 2014, at 14:58:38

Context:

[Accept issue2365: whatsnew fails in repos made w get --no-working-dir
Guillaume Hoffmann <guillaumh at gmail.com>**20140330181949
 Ignore-this: 6adb6532f754db663c9151d1e7fa1749
] 

[polish help string on get --set-strings-executable
Guillaume Hoffmann <guillaumh at gmail.com>**20140325151348
 Ignore-this: 6d2fdf85bed232fc39536a8ca80cbf17
] 

[Resolve Issue2263: Option --set-scripts-executable is not properly documented
Ale Gadea <alex.aegf at gmail.com>**20140322232156
 Ignore-this: cdfff821ce91e6e5070fdcd62f0f3ad2
] 

[eliminate withRepoReadLock obsolete since old-fashioned deprecation
Guillaume Hoffmann <guillaumh at gmail.com>**20140317015844
 Ignore-this: 9d31bb2cb715e22e437381ecf82d1515
] 

[conditionally use local copy of Data.Map.Strict in Darcs.Repository.Util
Ganesh Sittampalam <ganesh at earth.li>**20140316144749
 Ignore-this: 2bfc70346ff0b9ac3bd3221d8c527b18
 This is needed for building with containers<0.5, e.g. on Debian stable
] 

[pandoc-ize README and remove mention of old flags and warnings
Guillaume Hoffmann <guillaumh at gmail.com>**20140302185217
 Ignore-this: febf1153bb4e0a7147b59d2e40e02b1a
] 

[resolve issue2357: switching to regex-compat-tdfa for unicode support
Dan Frumin <difrumin at gmail.com>**20140214125459
 Ignore-this: 1b06d02c87195cdc3b69dd6dde62b88
 
] 

[A shell test for `whatsnew --interactive`
Dan Frumin <difrumin at gmail.com>**20140208141137
 Ignore-this: 804fc09330f4a9c5d5348c55fd9f432f
 
] 

[hashed-storage: GHC 7.8 build fix
Ganesh Sittampalam <ganesh at earth.li>**20140208115747
 Ignore-this: b99072d3f917827bff35fd08e562221c
] 

[support GHC 7.8 and various assorted other version bumps
Ganesh Sittampalam <ganesh at earth.li>**20140208103709
 Ignore-this: fad23b680a11066be6676dff971a9dc4
 The MAPI symbol change seems to be needed for the new gcc
] 

[resolve issue851: interactive mode for whatsnew
Dan Frumin <difrumin at gmail.com>**20140207110051
 Ignore-this: 898f8e458fa5d135fc9a4307422fe039
] 

[Cleaning up the headers in WhatsNew and SelectChanges
Dan Frumin <difrumin at gmail.com>**20140207105911
 Ignore-this: 7ca97c8346cff8d5d8cbeae572ccc96b
 
] 

[drop support for GHC 7.0/7.2
Ganesh Sittampalam <ganesh at earth.li>**20140207202157
 Ignore-this: 357bfc1a3a7e0e2be97764e2b0bc3a8
] 

[get rid of now redundant conditionalisation
Ganesh Sittampalam <ganesh at earth.li>**20140207202201
 Ignore-this: b89a72419decdb551743d604b9f38a9c
] 

[remove accidentally added file
Ganesh Sittampalam <ganesh at earth.li>**20140207062105
 Ignore-this: 4c5b6aeb9b2e87ea73ed76667cf2ef2a
] 

[fix hashed-storage build on Windows
Ganesh Sittampalam <ganesh at earth.li>**20140207074913
 Ignore-this: dc828bfb3bc4ce41b31b80657a976233
] 

[we need utf8-string on Windows too now for the fast-export/import code
Ganesh Sittampalam <ganesh at earth.li>**20140207192923
 Ignore-this: 3efb47cda6b07965e7c877c762aa90ab
] 

[bump cryptohash dependency
Ganesh Sittampalam <ganesh at earth.li>**20140102204117
 Ignore-this: 485b2d5923057f6db89abec99ead91e4
] 

[Making sure darcs builds on OSX Mavericks
Dan Frumin <difrumin at gmail.com>**20140126163054
 Ignore-this: 42fb6ce2ca175f0689fc6b599ff49127
] 

[resolve issue2332: ignore case of characters in prompt
Guillaume Hoffmann <guillaumh at gmail.com>**20140128201657
 Ignore-this: 1b6d417b5d707a95d2d6e6dc6aff7a4b
] 

[Implement convert --export and --import for git conversion
Guillaume Hoffmann <guillaumh at gmail.com>**20140125154537
 Ignore-this: e0a5b62dfca26639e27eb30784b7d0d2
 Port of code by Petr Rockai and Owen Stephens.
] 

[resolve issue2345: solution using cabal's checkForeignDeps
Dan Frumin <difrumin at gmail.com>**20140120220552
 Ignore-this: 57f9b20bdd5ec2973f9ddbb87f394513
 
 Usually, Cabal performs the external dependencies check after the
 configuration phase, in the `postConf` hook. This patch moves this
 check into the configure section.
 
] 

[resolve issue2209: Automatically detect replace
Jose Luis Neder <jlneder at gmail.com>**20140110042013
 Ignore-this: 71ebf9ddde0b761b34e5c00eff88b171
 This patch add the flag --look-for-replaces to amend-record, record and
 whatsnew commands, to automatically detect possible replaces.
] 

[add hashed-storage 0.5.11
Guillaume Hoffmann <guillaumh at gmail.com>**20140110003402
 Ignore-this: 55f60bb158abd29e44b7d2b4eb9e22de
] 

[resolve issue642: Automatic detection of file renames
Jose Luis Neder <jlneder at gmail.com>**20130915234126
 Ignore-this: ef673bf6a47a65355ca96efe3a6c6d8
] 

[Show fileid info with show index
Jose Luis Neder <jlneder at gmail.com>**20140109230042
 Ignore-this: e4127a3a598d24a252e3c367e5af51e9
 Update timestamp index with new adds and moves in pending
 (darcs mv, darcs add)
 Require hashed-storage 0.5.11
] 

[remove useless check of xml-output in get and convert
Guillaume Hoffmann <guillaumh at gmail.com>**20140108050714
 Ignore-this: c7cbc0dddcd28b7b573ccdcab776b38
] 

[resolve issue2348: switch to cabal's test framework
ryan at desfo.org**20131128071057
 Ignore-this: 498f2556a8e598a8201e33897758d6f7
] 

[fix bug when global prefs dir does not exist and try to save author name
Guillaume Hoffmann <guillaumh at gmail.com>**20131127003229
 Ignore-this: ff060527d2b12df8a4ce3ac5fbdab37f
] 

[improve help text
Ganesh Sittampalam <ganesh at earth.li>**20131126070820
 Ignore-this: 25186788203ef343aeb3dba860568ce6
] 

[need to use ByteString to read tests on unix
Ganesh Sittampalam <ganesh at earth.li>**20131126070804
 Ignore-this: 3ec9b4fb831023def0062c62f95c23d0
 Files may not be valid UTF-8
] 

[fix warnings
Ganesh Sittampalam <ganesh at earth.li>**20131126062227
 Ignore-this: 97fb8bc885b35eb4231e952ee23c2ca1
] 

[add a TODO comment
Ganesh Sittampalam <ganesh at earth.li>**20131115063910
 Ignore-this: 77eb074fb7afb37e88e3fa4cd0c5e49c
] 

[add pragmas to shell tests to allow for the test to specify configurations
Ganesh Sittampalam <ganesh at earth.li>**20131115000411
 Ignore-this: 68ec1ad0e28ce1275d9450ceb64fc6f8
] 

[remove explicit choice of Myers diff from test
Ganesh Sittampalam <ganesh at earth.li>**20131114063838
 Ignore-this: a3ea3033ba13c049f6ac9baf90405e72
 it passes fine with patience diff
] 

[add command-line options to control global test options
Ganesh Sittampalam <ganesh at earth.li>**20131114062418
 Ignore-this: fe686da9d5bb1d8138148f0ca3572233
 Default to just running for darcs-2 and patience diff
] 

[rename changes command to log, keep changes as alias
Guillaume Hoffmann <guillaumh at gmail.com>**20131119232432
 Ignore-this: 978423a89a3692c088875ea2408cfd62
] 

[output darcs changes to a pager if more than 20 lines big
Guillaume Hoffmann <guillaumh at gmail.com>**20131119223227
 Ignore-this: fcd35c3bd21239c074b56eb8945ba835
] 

[Make changes non-interactive by default again
Guillaume Hoffmann <guillaumh at gmail.com>**20131119212949
 Ignore-this: 22631dcad9bb328bb2fa983e067df8c1
] 

[record: no longer accept first commented line as patch name
Guillaume Hoffmann <guillaumh at gmail.com>**20131028183826
 Ignore-this: c09f01d5706c4afc025dd0f6b8965054
] 

[TAG 2.9.8
Guillaume Hoffmann <guillaumh at gmail.com>**20131027233606
 Ignore-this: f5f821af5bc64feda0c2850efb94a57c
] 

Compiled with:

HTTP-4000.2.12
array-0.4.0.1
attoparsec-0.11.2.1
base-4.6.0.1
base16-bytestring-0.1.1.6
binary-0.5.1.1
bytestring-0.10.0.2
containers-0.5.0.0
cryptohash-0.11.4
data-ordlist-0.4.6
datetime-0.2.1
directory-1.2.0.1
filepath-1.3.0.1
hashable-1.2.1.0
hashed-storage-0.5.11
haskeline-0.7.1.2
html-1.0.1.2
mmap-0.5.9
mtl-2.1.3.1
network-2.4.2.2
old-time-1.1.0.1
parsec-3.1.5
process-1.1.0.2
random-1.0.1.1
regex-compat-tdfa-0.95.1.4
tar-0.4.0.1
terminfo-0.3.2.6
text-0.11.3.1
unix-2.6.0.1
utf8-string-0.3.7
vector-0.10.9.1
zlib-0.5.4.1
FindBin-0.0.5
HUnit-1.2.5.2
QuickCheck-2.6
cmdlib-0.3.5
shellish-0.1.4
split-0.2.2
test-framework-0.8.0.3
test-framework-hunit-0.3.0.1
test-framework-quickcheck2-0.3.0.2