Mercurial > hg
diff tests/test-rename-merge1.t @ 44197:17e12938f8e7
copies: print debug information about copies per side/branch
Differential Revision: https://phab.mercurial-scm.org/D7987
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 24 Jan 2020 10:39:55 -0800 |
parents | 5de70f798ea7 |
children | b4057d001760 |
line wrap: on
line diff
--- a/tests/test-rename-merge1.t Wed Jan 22 15:31:17 2020 -0800 +++ b/tests/test-rename-merge1.t Fri Jan 24 10:39:55 2020 -0800 @@ -28,9 +28,11 @@ b b2 all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'a' -> dst: 'b' * - src: 'a2' -> dst: 'b2' ! - src: 'a2' -> dst: 'c2' ! + on local side: + src: 'a2' -> dst: 'c2' ! + on remote side: + src: 'a' -> dst: 'b' * + src: 'a2' -> dst: 'b2' ! checking for directory renames resolving manifests branchmerge: True, force: False, partial: False @@ -170,7 +172,8 @@ unmatched files in other: newfile all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'file' -> dst: 'newfile' % + on remote side: + src: 'file' -> dst: 'newfile' % checking for directory renames resolving manifests branchmerge: True, force: False, partial: False @@ -206,7 +209,10 @@ # we should not get the prompts about modify/delete conflicts $ hg merge --debug 1 -t :merge3 all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'x' -> dst: 'z' + on local side: + src: 'y' -> dst: 'z' + on remote side: + src: 'x' -> dst: 'z' checking for directory renames resolving manifests branchmerge: True, force: False, partial: False