diff --git a/tests/test-graft.t b/tests/test-graft.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC1ncmFmdC50..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC1ncmFmdC50 100644
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -150,4 +150,5 @@
    branchmerge: True, force: True, partial: False
    ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
    e: remote is newer -> g
+  getting e
   updating: e 1/1 files (100.00%)
@@ -153,5 +154,4 @@
   updating: e 1/1 files (100.00%)
-  getting e
   e
   grafting revision 4
     searching for copies back to rev 1
@@ -161,4 +161,5 @@
    d: remote is newer -> g
    e: versions differ -> m
     preserving e for resolve of e
+  getting d
   updating: d 1/2 files (50.00%)
@@ -164,5 +165,4 @@
   updating: d 1/2 files (50.00%)
-  getting d
   updating: e 2/2 files (100.00%)
   picked tool 'internal:merge' for e (binary False symlink False)
   merging e
diff --git a/tests/test-issue522.t b/tests/test-issue522.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC1pc3N1ZTUyMi50..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC1pc3N1ZTUyMi50 100644
--- a/tests/test-issue522.t
+++ b/tests/test-issue522.t
@@ -32,4 +32,5 @@
    branchmerge: True, force: False, partial: False
    ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
    foo: remote is newer -> g
+  getting foo
   updating: foo 1/1 files (100.00%)
@@ -35,5 +36,4 @@
   updating: foo 1/1 files (100.00%)
-  getting foo
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
diff --git a/tests/test-issue672.t b/tests/test-issue672.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC1pc3N1ZTY3Mi50..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC1pc3N1ZTY3Mi50 100644
--- a/tests/test-issue672.t
+++ b/tests/test-issue672.t
@@ -36,4 +36,5 @@
    ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
    1: other deleted -> r
    1a: remote created -> g
+  removing 1
   updating: 1 1/2 files (50.00%)
@@ -39,3 +40,3 @@
   updating: 1 1/2 files (50.00%)
-  removing 1
+  getting 1a
   updating: 1a 2/2 files (100.00%)
@@ -41,5 +42,4 @@
   updating: 1a 2/2 files (100.00%)
-  getting 1a
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLnQ=..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC1sYXJnZWZpbGVzLnQ= 100644
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -1679,4 +1679,5 @@
    branchmerge: False, force: False, partial: False
    ancestor: 000000000000, local: 000000000000+, remote: cf03e5bb9936
    .hglf/f1: remote created -> g
+  getting .hglf/f1
   updating: .hglf/f1 1/1 files (100.00%)
@@ -1682,5 +1683,4 @@
   updating: .hglf/f1 1/1 files (100.00%)
-  getting .hglf/f1
   getting changed largefiles
   using http://localhost:$HGPORT2/
   sending capabilities command
diff --git a/tests/test-rename-dir-merge.t b/tests/test-rename-dir-merge.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC1yZW5hbWUtZGlyLW1lcmdlLnQ=..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC1yZW5hbWUtZGlyLW1lcmdlLnQ= 100644
--- a/tests/test-rename-dir-merge.t
+++ b/tests/test-rename-dir-merge.t
@@ -44,4 +44,5 @@
    a/c: remote renamed directory to b/c -> d
    b/a: remote created -> g
    b/b: remote created -> g
+  removing a/a
   updating: a/a 1/5 files (20.00%)
@@ -47,4 +48,2 @@
   updating: a/a 1/5 files (20.00%)
-  removing a/a
-  updating: a/b 2/5 files (40.00%)
   removing a/b
@@ -50,3 +49,8 @@
   removing a/b
-  updating: a/c 3/5 files (60.00%)
+  updating: a/b 2/5 files (40.00%)
+  getting b/a
+  updating: b/a 3/5 files (60.00%)
+  getting b/b
+  updating: b/b 4/5 files (80.00%)
+  updating: a/c 5/5 files (100.00%)
   moving a/c to b/c
@@ -52,8 +56,4 @@
   moving a/c to b/c
-  updating: b/a 4/5 files (80.00%)
-  getting b/a
-  updating: b/b 5/5 files (100.00%)
-  getting b/b
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC1yZW5hbWUtbWVyZ2UxLnQ=..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC1yZW5hbWUtbWVyZ2UxLnQ= 100644
--- a/tests/test-rename-merge1.t
+++ b/tests/test-rename-merge1.t
@@ -41,8 +41,10 @@
    a2: divergent renames -> dr
    b2: remote created -> g
   removing a
-  updating: a 1/3 files (33.33%)
+  getting b2
+  updating: b2 1/3 files (33.33%)
+  updating: a 2/3 files (66.67%)
   picked tool 'internal:merge' for b (binary False symlink False)
   merging a and b to b
   my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
    premerge successful
@@ -45,8 +47,8 @@
   picked tool 'internal:merge' for b (binary False symlink False)
   merging a and b to b
   my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
    premerge successful
-  updating: a2 2/3 files (66.67%)
+  updating: a2 3/3 files (100.00%)
   note: possible conflict - a2 was renamed multiple times to:
    c2
    b2
@@ -50,8 +52,6 @@
   note: possible conflict - a2 was renamed multiple times to:
    c2
    b2
-  updating: b2 3/3 files (100.00%)
-  getting b2
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
@@ -183,6 +183,8 @@
    ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0
    file: rename and delete -> rd
    newfile: remote created -> g
-  updating: file 1/2 files (50.00%)
+  getting newfile
+  updating: newfile 1/2 files (50.00%)
+  updating: file 2/2 files (100.00%)
   note: possible conflict - file was deleted and renamed to:
    newfile
@@ -187,7 +189,5 @@
   note: possible conflict - file was deleted and renamed to:
    newfile
-  updating: newfile 2/2 files (100.00%)
-  getting newfile
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg status
diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC1yZW5hbWUtbWVyZ2UyLnQ=..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC1yZW5hbWUtbWVyZ2UyLnQ= 100644
--- a/tests/test-rename-merge2.t
+++ b/tests/test-rename-merge2.t
@@ -126,4 +126,5 @@
     preserving b for resolve of b
    rev: versions differ -> m
     preserving rev for resolve of rev
+  getting a
   updating: a 1/3 files (33.33%)
@@ -129,5 +130,4 @@
   updating: a 1/3 files (33.33%)
-  getting a
   updating: b 2/3 files (66.67%)
   picked tool 'python ../merge' for b (binary False symlink False)
   merging b and a to b
@@ -231,4 +231,5 @@
    b: remote created -> g
    rev: versions differ -> m
     preserving rev for resolve of rev
+  getting b
   updating: b 1/2 files (50.00%)
@@ -234,5 +235,4 @@
   updating: b 1/2 files (50.00%)
-  getting b
   updating: rev 2/2 files (100.00%)
   picked tool 'python ../merge' for rev (binary False symlink False)
   merging rev
@@ -289,4 +289,5 @@
    b: remote created -> g
    rev: versions differ -> m
     preserving rev for resolve of rev
+  removing a
   updating: a 1/3 files (33.33%)
@@ -292,3 +293,3 @@
   updating: a 1/3 files (33.33%)
-  removing a
+  getting b
   updating: b 2/3 files (66.67%)
@@ -294,5 +295,4 @@
   updating: b 2/3 files (66.67%)
-  getting b
   updating: rev 3/3 files (100.00%)
   picked tool 'python ../merge' for rev (binary False symlink False)
   merging rev
@@ -380,7 +380,9 @@
    c: remote created -> g
    rev: versions differ -> m
     preserving rev for resolve of rev
-  updating: a 1/3 files (33.33%)
+  getting c
+  updating: c 1/3 files (33.33%)
+  updating: a 2/3 files (66.67%)
   note: possible conflict - a was renamed multiple times to:
    b
    c
@@ -384,8 +386,6 @@
   note: possible conflict - a was renamed multiple times to:
    b
    c
-  updating: c 2/3 files (66.67%)
-  getting c
   updating: rev 3/3 files (100.00%)
   picked tool 'python ../merge' for rev (binary False symlink False)
   merging rev
@@ -439,4 +439,5 @@
     preserving b for resolve of b
    rev: versions differ -> m
     preserving rev for resolve of rev
+  removing a
   updating: a 1/3 files (33.33%)
@@ -442,5 +443,4 @@
   updating: a 1/3 files (33.33%)
-  removing a
   updating: b 2/3 files (66.67%)
   picked tool 'python ../merge' for b (binary False symlink False)
   merging b
@@ -469,4 +469,5 @@
     preserving b for resolve of b
    rev: versions differ -> m
     preserving rev for resolve of rev
+  getting a
   updating: a 1/3 files (33.33%)
@@ -472,5 +473,4 @@
   updating: a 1/3 files (33.33%)
-  getting a
   updating: b 2/3 files (66.67%)
   picked tool 'python ../merge' for b (binary False symlink False)
   merging b
@@ -500,4 +500,5 @@
     preserving b for resolve of b
    rev: versions differ -> m
     preserving rev for resolve of rev
+  removing a
   updating: a 1/3 files (33.33%)
@@ -503,5 +504,4 @@
   updating: a 1/3 files (33.33%)
-  removing a
   updating: b 2/3 files (66.67%)
   picked tool 'python ../merge' for b (binary False symlink False)
   merging b
@@ -530,4 +530,5 @@
     preserving b for resolve of b
    rev: versions differ -> m
     preserving rev for resolve of rev
+  getting a
   updating: a 1/3 files (33.33%)
@@ -533,5 +534,4 @@
   updating: a 1/3 files (33.33%)
-  getting a
   updating: b 2/3 files (66.67%)
   picked tool 'python ../merge' for b (binary False symlink False)
   merging b
@@ -591,4 +591,5 @@
     preserving b for resolve of b
    rev: versions differ -> m
     preserving rev for resolve of rev
+  getting a
   updating: a 1/3 files (33.33%)
@@ -594,5 +595,4 @@
   updating: a 1/3 files (33.33%)
-  getting a
   updating: b 2/3 files (66.67%)
   picked tool 'python ../merge' for b (binary False symlink False)
   merging b
@@ -731,8 +731,10 @@
    c: remote created -> g
    rev: versions differ -> m
     preserving rev for resolve of rev
-  updating: b 1/3 files (33.33%)
+  getting c
+  updating: c 1/3 files (33.33%)
+  updating: b 2/3 files (66.67%)
   picked tool 'python ../merge' for b (binary False symlink False)
   merging b and a to b
   my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
    premerge successful
@@ -735,9 +737,7 @@
   picked tool 'python ../merge' for b (binary False symlink False)
   merging b and a to b
   my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
    premerge successful
-  updating: c 2/3 files (66.67%)
-  getting c
   updating: rev 3/3 files (100.00%)
   picked tool 'python ../merge' for rev (binary False symlink False)
   merging rev
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC1zdWJyZXBvLnQ=..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC1zdWJyZXBvLnQ= 100644
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -214,4 +214,5 @@
    branchmerge: False, force: False, partial: False
    ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a
    t: remote is newer -> g
+  getting t
   updating: t 1/1 files (100.00%)
@@ -217,5 +218,4 @@
   updating: t 1/1 files (100.00%)
-  getting t
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg debugsub
diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC11cC1sb2NhbC1jaGFuZ2UudA==..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC11cC1sb2NhbC1jaGFuZ2UudA== 100644
--- a/tests/test-up-local-change.t
+++ b/tests/test-up-local-change.t
@@ -49,7 +49,9 @@
    a: versions differ -> m
     preserving a for resolve of a
    b: remote created -> g
-  updating: a 1/2 files (50.00%)
+  getting b
+  updating: b 1/2 files (50.00%)
+  updating: a 2/2 files (100.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
@@ -53,8 +55,6 @@
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
-  updating: b 2/2 files (100.00%)
-  getting b
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents
   changeset:   1:1e71731e6fbb
@@ -70,4 +70,5 @@
    b: other deleted -> r
    a: versions differ -> m
     preserving a for resolve of a
+  removing b
   updating: b 1/2 files (50.00%)
@@ -73,5 +74,4 @@
   updating: b 1/2 files (50.00%)
-  removing b
   updating: a 2/2 files (100.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
@@ -103,7 +103,9 @@
    a: versions differ -> m
     preserving a for resolve of a
    b: remote created -> g
-  updating: a 1/2 files (50.00%)
+  getting b
+  updating: b 1/2 files (50.00%)
+  updating: a 2/2 files (100.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
@@ -107,8 +109,6 @@
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
-  updating: b 2/2 files (100.00%)
-  getting b
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents
   changeset:   1:1e71731e6fbb
diff --git a/tests/test-update-reverse.t b/tests/test-update-reverse.t
index 9b9e2d9e83a114a9da1d0e4d0dfaf250a1f806d1_dGVzdHMvdGVzdC11cGRhdGUtcmV2ZXJzZS50..e2dc5397bc822213cb771e3108030cf24407d080_dGVzdHMvdGVzdC11cGRhdGUtcmV2ZXJzZS50 100644
--- a/tests/test-update-reverse.t
+++ b/tests/test-update-reverse.t
@@ -71,4 +71,5 @@
    side1: other deleted -> r
    side2: other deleted -> r
    main: remote created -> g
+  removing side1
   updating: side1 1/3 files (33.33%)
@@ -74,3 +75,3 @@
   updating: side1 1/3 files (33.33%)
-  removing side1
+  removing side2
   updating: side2 2/3 files (66.67%)
@@ -76,3 +77,3 @@
   updating: side2 2/3 files (66.67%)
-  removing side2
+  getting main
   updating: main 3/3 files (100.00%)
@@ -78,5 +79,4 @@
   updating: main 3/3 files (100.00%)
-  getting main
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ ls