Mercurial > hg-stable
diff tests/test-rename-dir-merge.t @ 18631:e2dc5397bc82
tests: update test output (will be folded into parent)
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Sat, 09 Feb 2013 15:22:04 -0800 |
| parents | bcf29565d89f |
| children | 4b5d37ca3c11 |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge.t Sat Feb 09 15:21:58 2013 -0800 +++ b/tests/test-rename-dir-merge.t Sat Feb 09 15:22:04 2013 -0800 @@ -44,16 +44,16 @@ 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%) - removing a/a - updating: a/b 2/5 files (40.00%) 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 - 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)