Mercurial > public > mercurial-scm > hg
diff tests/test-up-local-change.out @ 767:61ed30e82b27
Update tests to match new addremove chattiness.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri, 22 Jul 2005 19:46:02 -0800 |
| parents | 7e4843b7efd2 |
| children | 20e95c245bc3 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out Fri Jul 22 19:45:48 2005 -0800 +++ b/tests/test-up-local-change.out Fri Jul 22 19:46:02 2005 -0800 @@ -3,6 +3,7 @@ + hg init + echo a + hg addremove +adding a + hg commit -m 1 -d '0 0' + hg clone . ../r2 + cd ../r2 @@ -20,6 +21,7 @@ + echo b + echo a2 + hg addremove +adding b + hg commit -m 2 -d '0 0' + cd ../r2 + hg -q pull ../r1 @@ -68,9 +70,3 @@ + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' -diff -r 1e71731e6fbb a ---- a/a -+++ b/a -@@ -1,1 +1,1 @@ --a2 -+abc