Mercurial > hg-stable
changeset 9135:df881932362f
merge with -stable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 14 Jul 2009 20:24:16 +0200 |
| parents | a5c060b80082 (current diff) a85a3d398cc3 (diff) |
| children | 31177742f54a |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-fetch Tue Jul 14 20:10:23 2009 +0200 +++ b/tests/test-fetch Tue Jul 14 20:24:16 2009 +0200 @@ -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"