Mercurial > hg

comparison tests/test-rename-merge1.t @ 18605:bcf29565d89f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
18604:a1141f04e368 18605:bcf29565d89f
32 src: 'a' -> dst: 'b' * 32 src: 'a' -> dst: 'b' *
33 src: 'a2' -> dst: 'b2' ! 33 src: 'a2' -> dst: 'b2' !
34 src: 'a2' -> dst: 'c2' ! 34 src: 'a2' -> dst: 'c2' !
35 checking for directory renames 35 checking for directory renames
36 resolving manifests 36 resolving manifests
37 overwrite: False, partial: False 37 branchmerge: True, force: False, partial: False
38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c 38 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c
39 a: remote moved to b -> m 39 a: remote moved to b -> m
40 preserving a for resolve of b 40 preserving a for resolve of b
41 a2: divergent renames -> dr 41 a2: divergent renames -> dr
42 b2: remote created -> g 42 b2: remote created -> g
177 newfile 177 newfile
178 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 178 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
179 src: 'file' -> dst: 'newfile' % 179 src: 'file' -> dst: 'newfile' %
180 checking for directory renames 180 checking for directory renames
181 resolving manifests 181 resolving manifests
182 overwrite: False, partial: False 182 branchmerge: True, force: False, partial: False
183 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 183 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0
184 file: rename and delete -> rd 184 file: rename and delete -> rd
185 newfile: remote created -> g 185 newfile: remote created -> g
186 updating: file 1/2 files (50.00%) 186 updating: file 1/2 files (50.00%)
187 note: possible conflict - file was deleted and renamed to: 187 note: possible conflict - file was deleted and renamed to: