33 src: 'foo' -> dst: 'bar' * |
33 src: 'foo' -> dst: 'bar' * |
34 checking for directory renames |
34 checking for directory renames |
35 resolving manifests |
35 resolving manifests |
36 branchmerge: True, force: False, partial: False |
36 branchmerge: True, force: False, partial: False |
37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
|
38 preserving foo for resolve of bar |
|
39 preserving foo for resolve of foo |
38 bar: remote copied from foo -> m |
40 bar: remote copied from foo -> m |
39 preserving foo for resolve of bar |
|
40 foo: versions differ -> m |
|
41 preserving foo for resolve of foo |
|
42 updating: bar 1/2 files (50.00%) |
41 updating: bar 1/2 files (50.00%) |
43 picked tool 'internal:merge' for bar (binary False symlink False) |
42 picked tool 'internal:merge' for bar (binary False symlink False) |
44 merging foo and bar to bar |
43 merging foo and bar to bar |
45 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
46 premerge successful |
45 premerge successful |
|
46 foo: versions differ -> m |
47 updating: foo 2/2 files (100.00%) |
47 updating: foo 2/2 files (100.00%) |
48 picked tool 'internal:merge' for foo (binary False symlink False) |
48 picked tool 'internal:merge' for foo (binary False symlink False) |
49 merging foo |
49 merging foo |
50 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc |
50 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc |
51 premerge successful |
51 premerge successful |