Mercurial > hg-stable
diff tests/test-rename-merge1.t @ 18605:bcf29565d89f
manifestmerge: pass in branchmerge and force separately
This will be used in an upcoming patch.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 08 Feb 2013 15:23:23 +0000 |
parents | 5ed6a375e9ca |
children | e2dc5397bc82 |
line wrap: on
line diff
--- a/tests/test-rename-merge1.t Sat Feb 09 15:43:02 2013 +0000 +++ b/tests/test-rename-merge1.t Fri Feb 08 15:23:23 2013 +0000 @@ -34,7 +34,7 @@ src: 'a2' -> dst: 'c2' ! checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c a: remote moved to b -> m preserving a for resolve of b @@ -179,7 +179,7 @@ src: 'file' -> dst: 'newfile' % checking for directory renames resolving manifests - overwrite: False, partial: False + branchmerge: True, force: False, partial: False ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 file: rename and delete -> rd newfile: remote created -> g