Mercurial > hg

comparison tests/test-copy-move-merge.t @ 18360:760c0d67ce5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: process files in sorted order
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 02:59:12 +0100
parents a6fe1b9cc68f
children 5a4f220fbfca
comparison
equal deleted inserted replaced
18359:4b09e6f7d7de 18360:760c0d67ce5e
29 src: 'a' -> dst: 'b' * 29 src: 'a' -> dst: 'b' *
30 checking for directory renames 30 checking for directory renames
31 resolving manifests 31 resolving manifests
32 overwrite: False, partial: False 32 overwrite: False, partial: False
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
34 a: remote moved to b -> m
34 a: remote moved to c -> m 35 a: remote moved to c -> m
35 a: remote moved to b -> m
36 preserving a for resolve of b 36 preserving a for resolve of b
37 preserving a for resolve of c 37 preserving a for resolve of c
38 removing a 38 removing a
39 updating: a 1/2 files (50.00%) 39 updating: a 1/2 files (50.00%)
40 picked tool 'internal:merge' for b (binary False symlink False) 40 picked tool 'internal:merge' for b (binary False symlink False)