Update tests to match new addremove chattiness.

tests/test-merge2.out

@@ -1,47 +1,49 b''
 + mkdir t
 + cd t
 + hg init
 + echo This is file a1
 + hg add a
 + hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
 + hg commit -m 'commit #1' -d '0 0'
 + rm b
 + hg update 0
 + echo This is file b2
 + hg add b
 + hg commit -m 'commit #2' -d '0 0'
 + cd ..
 + /bin/rm -rf t
 + mkdir t
 + cd t
 + hg init
 + echo This is file a1
 + hg add a
 + hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
 + hg commit -m 'commit #1' -d '0 0'
 + rm b
 + 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
 + cd t
 + hg init
 + echo This is file a1
 + hg add a
 + hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
 + hg commit -m 'commit #1' -d '0 0'
 + rm b
 + hg remove b
 + hg update 0
 + echo This is file b2
 + hg commit -A -m 'commit #2' -d '0 0'
+adding b
 + cd ..
 + /bin/rm -rf t

tests/test-merge3.out

@@ -1,9 +1,10 b''
 + hg init
 + echo This is file a1
 + hg add a
 + hg commit -m 'commit #0' -d '0 0'
 + touch b
 + hg add b
 + rm b
 + hg commit -A '-mcomment #1' -d '0 0'
+removing b
 b never committed!

tests/test-merge5.out

@@ -1,19 +1,20 b''
 + mkdir t
 + cd t
 + hg init
 + echo This is file a1
 + echo This is file b1
 + hg add a b
 + hg commit -m 'commit #0' -d '0 0'
 + echo This is file b22
 + hg commit '-mcomment #1' -d '0 0'
 + 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:
  b
 aborting update spanning branches!
 (use update -m to perform a branch merge)
 + exit 0

tests/test-pull.out

@@ -1,21 +1,22 b''
+adding foo
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
 adding file revisions
 modified 1 files, added 1 changesets and 1 new revisions
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 foo
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
 pulling from http://localhost:20059/
 searching for changes
 no changes found
 killed!

tests/test-simple-update.out

@@ -1,38 +1,39 b''
 + mkdir test
 + cd test
 + echo foo
 + hg init
 + hg addremove
+adding foo
 + hg commit -m 1
 + hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 + hg clone . ../branch
 + cd ../branch
 + hg co
 + echo bar
 + hg commit -m 2
 + cd ../test
 + hg pull ../branch
 pulling from ../branch
 searching for changes
 adding changesets
 adding manifests
 adding file revisions
 modified 1 files, added 1 changesets and 1 new revisions
 (run 'hg update' to get a working copy)
 + hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 + hg co
 + cat foo
 foo
 bar
 + hg manifest
 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo

tests/test-up-local-change.out

@@ -1,76 +1,72 b''
 + mkdir r1
 + cd r1
 + hg init
 + echo a
 + hg addremove
+adding a
 + hg commit -m 1 -d '0 0'
 + hg clone . ../r2
 + cd ../r2
 + hg up
 + echo abc
 + hg diff
 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
 diff -r c19d34741b0a a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a
 +abc
 + cd ../r1
 + echo b
 + echo a2
 + hg addremove
+adding b
 + hg commit -m 2 -d '0 0'
 + cd ../r2
 + hg -q pull ../r1
 + hg status
 M a
 + hg --debug up
 resolving manifests
  force None allow None moddirstate True linear True
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
 getting b
 merging a
 resolving a
 file a: other d730145abbf9 ancestor b789fdd96dc2
 + hg --debug up -m
 resolving manifests
  force None allow 1 moddirstate True linear True
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
 + hg -v history
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a b
 description:
 2
 
 
 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
 manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a
 description:
 1
 
 
 + hg diff
 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
-diff -r 1e71731e6fbb a
---- a/a
-+++ b/a
-@@ -1,1 +1,1 @@
--a2
-+abc