Mercurial > hg

comparison tests/test-rename-merge1.t @ 18362:5a4f220fbfca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: report found copies sorted
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 12 Dec 2012 02:38:14 +0100
parents a6fe1b9cc68f
children 5ed6a375e9ca
comparison
equal deleted inserted replaced
18361:06f075836010 18362:5a4f220fbfca
27 c2 27 c2
28 unmatched files in other: 28 unmatched files in other:
29 b 29 b
30 b2 30 b2
31 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 31 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
32 src: 'a2' -> dst: 'c2' !
33 src: 'a' -> dst: 'b' * 32 src: 'a' -> dst: 'b' *
34 src: 'a2' -> dst: 'b2' ! 33 src: 'a2' -> dst: 'b2' !
34 src: 'a2' -> dst: 'c2' !
35 checking for directory renames 35 checking for directory renames
36 a2: divergent renames -> dr 36 a2: divergent renames -> dr
37 resolving manifests 37 resolving manifests
38 overwrite: False, partial: False 38 overwrite: False, partial: False
39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c 39 ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c