Mercurial > hg
diff tests/test-rename-merge1.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 | 18adc15635a1 |
line wrap: on
line diff
--- a/tests/test-rename-merge1.t Sat Feb 09 15:21:58 2013 -0800 +++ b/tests/test-rename-merge1.t Sat Feb 09 15:22:04 2013 -0800 @@ -41,17 +41,17 @@ 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 - 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 - 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,11 +183,11 @@ 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 - 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