Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change @ 953:52d8d81e72ad
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Fri, 19 Aug 2005 16:45:25 -0800 |
parents | 0902ffece4b4 d997148155f2 |
children | 4f81068ed8cd |
line wrap: on
line diff
--- a/tests/test-up-local-change +++ b/tests/test-up-local-change @@ -12,8 +12,8 @@ hg clone . ../r2 cd ../r2 hg up echo abc > a -hg diff > ../d -sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" cd ../r1 echo b > b @@ -28,6 +28,6 @@ hg --debug up hg --debug up -m hg parents hg -v history -hg diff > ../d -sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d +hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"