Update tests to match new addremove chattiness.
--- a/tests/test-merge2.out Fri Jul 22 19:45:48 2005 -0800
+++ b/tests/test-merge2.out Fri Jul 22 19:46:02 2005 -0800
@@ -27,6 +27,7 @@
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
+adding b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
@@ -43,5 +44,6 @@
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
+adding b
+ cd ..
+ /bin/rm -rf t
--- a/tests/test-merge3.out Fri Jul 22 19:45:48 2005 -0800
+++ b/tests/test-merge3.out Fri Jul 22 19:46:02 2005 -0800
@@ -6,4 +6,5 @@
+ hg add b
+ rm b
+ hg commit -A '-mcomment #1' -d '0 0'
+removing b
b never committed!
--- a/tests/test-merge5.out Fri Jul 22 19:45:48 2005 -0800
+++ b/tests/test-merge5.out Fri Jul 22 19:46:02 2005 -0800
@@ -10,6 +10,7 @@
+ hg update 0
+ rm b
+ hg commit -A '-mcomment #2' -d '0 0'
+removing b
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
--- a/tests/test-pull.out Fri Jul 22 19:45:48 2005 -0800
+++ b/tests/test-pull.out Fri Jul 22 19:46:02 2005 -0800
@@ -1,3 +1,4 @@
+adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
--- a/tests/test-simple-update.out Fri Jul 22 19:45:48 2005 -0800
+++ b/tests/test-simple-update.out Fri Jul 22 19:46:02 2005 -0800
@@ -3,6 +3,7 @@
+ echo foo
+ hg init
+ hg addremove
+adding foo
+ hg commit -m 1
+ hg verify
checking changesets
--- 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