[Bug 4583] New: Occasional change in merge tool test
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Tue Mar 31 18:18:50 UTC 2015
http://bz.selenic.com/show_bug.cgi?id=4583
Priority: normal
Bug ID: 4583
CC: mercurial-devel at selenic.com
Assignee: bugzilla at selenic.com
Summary: Occasional change in merge tool test
Severity: bug
Classification: Unclassified
OS: Mac OS
Reporter: matt_harbison at 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
..........................................................................
..........................................................................
............................
--- /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:
ERROR: test-merge-tools.t output changed
!.........................................................................
..............^C
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list