Patchwork [Bug,4583] New: Occasional change in merge tool test

login
register
mail settings
Submitter mercurial-bugs@selenic.com
Date March 31, 2015, 6:18 p.m.
Message ID <bug-4583-285@http.bz.selenic.com/>
Download mbox | patch
Permalink /patch/8389/
State Not Applicable
Headers show

Comments

mercurial-bugs@selenic.com - March 31, 2015, 6:18 p.m.
http://bz.selenic.com/show_bug.cgi?id=4583

          Priority: normal
            Bug ID: 4583
                CC: mercurial-devel@selenic.com
          Assignee: bugzilla@selenic.com
           Summary: Occasional change in merge tool test
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: matt_harbison@yahoo.com
          Hardware: Macintosh
            Status: UNCONFIRMED
           Version: default branch
         Component: Mercurial
           Product: Mercurial

I hit this on 10.10 in a full test run, and then eventually hit it again in a
loop with the same python seed.  dirstate/filesystem time resolution issue? 
It's on an HFS+ journaled filesystem (I'm pretty sure I reformatted it with the
10.10 installation).

# Based on 3.3.2+525-888dcab69ca3

MacPro64:tests matt$ export PYTHONHASHSEED=2096877523
MacPro64:tests matt$ ./run-tests.py --local test-merge-tools.t --loop
..........................................................................
..........................................................................
............................

ERROR: test-merge-tools.t output changed
!.........................................................................
..............^C

Patch

--- /usr/local/mercurial/tests/test-merge-tools.t
+++ /usr/local/mercurial/tests/test-merge-tools.t.err
@@ -632,18 +632,12 @@ 
   $ hg update -q 0
   $ hg revert -q -r 1 .
   $ hg update -r 2 --tool false
-  merging f
-  merging f failed!
-  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges
-  [1]
-  $ aftermerge
-  # cat f
-  revision 1
-  space
-  # hg stat
-  M f
-  ? f.orig
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ aftermerge
+  # cat f
+  revision 2
+  space
+  # hg stat

 Default is silent simplemerge: