# HG changeset patch # User Greg Ward # Date 1247452380 14400 # Node ID a85a3d398cc35b5bfd0b9b74dd2d53cf2a109a04 # Parent d3b995dd4eab7dbef1cedf892820fa822617e43c test-fetch: fix non-portable sed regex. (s/...\+/.../ appears to be a GNU-ism: this test broke on OS X and NetBSD. Changing \+ to * fixes it, although that is a slightly less strict regex.) diff -r d3b995dd4eab -r a85a3d398cc3 tests/test-fetch --- 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"