Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 6592c4f5cd4f ec85f9e6f3b1 |
children | 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-up-local-change +++ b/tests/test-up-local-change @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -e mkdir r1 cd r1 hg init @@ -13,7 +13,7 @@ cd ../r2 hg up echo abc > a hg diff > ../d -sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d +sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d cd ../r1 echo b > b @@ -29,5 +29,5 @@ hg --debug up -m hg parents hg -v history hg diff > ../d -sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d +sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d