Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-fetch: make output stable
authorVadim Gelfer <vadim.gelfer@gmail.com>
Tue, 08 Aug 2006 16:23:02 -0700
changeset 2823 e0caea53c997
parent 2822 4f7abf341cd4
child 2824 f362222cb8f8
test-fetch: make output stable
tests/test-fetch file | annotate | diff | comparison | revisions
tests/test-fetch.out file | annotate | diff | comparison | revisions 
--- a/tests/test-fetch	Tue Aug 08 16:09:26 2006 -0700
+++ b/tests/test-fetch	Tue Aug 08 16:23:02 2006 -0700
@@ -21,5 +21,5 @@
 
 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	Tue Aug 08 16:09:26 2006 -0700
+++ b/tests/test-fetch.out	Tue Aug 08 16:23:02 2006 -0700
@@ -21,7 +21,7 @@
 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
Mercurial