mercurial at 12494: 93 new changesets
Brodie Rao
brodie at bitheap.org
Mon Sep 27 00:17:00 CDT 2010
On Sep 26, 2010, at 2:50 PM, Mercurial Commits wrote:
> http://selenic.com/repo/hg//rev/dd600141616d
> changeset: 12426:dd600141616d
> user: Matt Mackall <mpm at selenic.com>
> date: Sun Sep 26 13:41:32 2010 -0500
> summary: tests: unify test-fetch
This test seems to behave inconsistently for me:
$ ./run-tests.py -j6
..........................s
..................s
.............................s.............s.....................
ERROR: /home/brodie/src/hg-crew/tests/test-fetch.t output changed
--- /home/brodie/src/hg-crew/tests/test-fetch.t
+++ /home/brodie/src/hg-crew/tests/test-fetch.t.err
@@ -82,7 +82,7 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- new changeset 3:0b6439e938f9 merges remote changes with local
+ new changeset 3:8b1123a5a459 merges remote changes with local
$ hg --cwd d tip --template '{desc}\n'
Automated merge with http://localhost:*/ (glob)
@@ -99,7 +99,7 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- new changeset 3:0b6439e938f9 merges remote changes with local
+ new changeset 3:8b1123a5a459 merges remote changes with local
$ hg --cwd e tip --template '{desc}\n'
Automated merge with http://localhost:*/ (glob)
$ hg clone a f
!........^C
$ ./run-tests.py test-fetch.t
.
# Ran 1 tests, 0 skipped, 0 failed.
It looks like the test used to hide changeset hashes for these two
fetch invocations. Should the unified test be updated to use globs for
those two lines?
More information about the Mercurial-devel
mailing list