Mercurial > public > mercurial-scm > hg
diff tests/test-fetch @ 6207:03b13d853dc6
fetch: make test reproducible, tiny code cleanup
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 05 Mar 2008 09:20:57 -0800 |
parents | 0b6f12495276 |
children | bd61e44eb2cc |
line wrap: on
line diff
--- a/tests/test-fetch Wed Mar 05 09:10:45 2008 -0800 +++ b/tests/test-fetch Wed Mar 05 09:20:57 2008 -0800 @@ -24,6 +24,10 @@ hg clone c d hg clone c e +# We cannot use the default commit message if fetching from a local +# repo, because the path of the repo will be included in the commit +# message, making every commit appear different. + echo % should merge c into a hg --cwd c fetch -d '4 0' -m 'automated merge' ../a ls c @@ -49,4 +53,4 @@ hg --cwd g ci -d '6 0' -Amg echo % should merge f into g -hg --cwd g fetch --switch ../f +hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f