tests/test-rename-dir-merge.t
changeset 25125 bd625cd4e5e7
parent 23653 0297d8469350
child 26614 ef1eb6df7071
--- a/tests/test-rename-dir-merge.t	Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-rename-dir-merge.t	Sat May 09 23:40:40 2015 -0700
@@ -43,14 +43,11 @@
   removing a/a
    a/b: other deleted -> r
   removing a/b
-  updating: a/b 2/5 files (40.00%)
    b/a: remote created -> g
   getting b/a
    b/b: remote created -> g
   getting b/b
-  updating: b/b 4/5 files (80.00%)
    b/c: remote directory rename - move from a/c -> dm
-  updating: b/c 5/5 files (100.00%)
   moving a/c to b/c (glob)
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
@@ -89,7 +86,6 @@
    branchmerge: True, force: False, partial: False
    ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb
    b/c: local directory rename - get from a/c -> dg
-  updating: b/c 1/1 files (100.00%)
   getting a/c to b/c
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)