test-fetch: make output stable
authorVadim Gelfer <vadim.gelfer@gmail.com>
Tue, 08 Aug 2006 16:23:02 -0700
changeset 2812 e0caea53c997
parent 2811 4f7abf341cd4
child 2813 f362222cb8f8
test-fetch: make output stable
tests/test-fetch
tests/test-fetch.out
--- a/tests/test-fetch
+++ b/tests/test-fetch
@@ -21,5 +21,5 @@ hg --cwd b parents -q
 
 echo c > c/c
 hg --cwd c commit -d '3 0' -Amc
-hg --cwd c fetch ../a
+hg --cwd c fetch -d '4 0' -m 'automated merge' ../a
 ls c
--- a/tests/test-fetch.out
+++ b/tests/test-fetch.out
@@ -21,7 +21,7 @@ adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 merging with new head 2:97d72e5f12c7
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-new changeset 3:5202af1888fa merges remote changes with local
+new changeset 3:cd3a41621cf0 merges remote changes with local
 a
 b
 c