changeset 9121 | a85a3d398cc3 |
parent 9093 | 0b2b269ba3d0 |
child 10398 | ace3cf2bc991 |
--- a/tests/test-fetch Mon Jul 13 20:19:17 2009 +0200 +++ b/tests/test-fetch Sun Jul 12 22:33:00 2009 -0400 @@ -194,7 +194,7 @@ hg --cwd i1726r1 ci -m second echo c > i1726r2/a hg --cwd i1726r2 ci -m third -HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 | sed 's/new changeset 3:[0-9a-zA-Z]\+/new changeset 3/' +HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 | sed 's/new changeset 3:[0-9a-zA-Z]* /new changeset 3 /' hg --cwd i1726r2 heads default --template '{rev}\n' "$TESTDIR/killdaemons.py"