equal
deleted
inserted
replaced
14 b2 -> a2 ! |
14 b2 -> a2 ! |
15 checking for directory renames |
15 checking for directory renames |
16 a2: divergent renames -> dr |
16 a2: divergent renames -> dr |
17 resolving manifests |
17 resolving manifests |
18 overwrite None partial False |
18 overwrite None partial False |
19 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 |
19 ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c |
20 a: remote moved to b -> m |
20 a: remote moved to b -> m |
21 b2: remote created -> g |
21 b2: remote created -> g |
22 preserving a for resolve of b |
22 preserving a for resolve of b |
23 removing a |
23 removing a |
24 update: a 1/3 files (33.33%) |
24 update: a 1/3 files (33.33%) |
25 picked tool 'internal:merge' for b (binary False symlink False) |
25 picked tool 'internal:merge' for b (binary False symlink False) |
26 merging a and b to b |
26 merging a and b to b |
27 my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c |
27 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
28 premerge successful |
28 premerge successful |
29 update: a2 2/3 files (66.67%) |
29 update: a2 2/3 files (66.67%) |
30 warning: detected divergent renames of a2 to: |
30 warning: detected divergent renames of a2 to: |
31 c2 |
31 c2 |
32 b2 |
32 b2 |
39 M b2 |
39 M b2 |
40 R a |
40 R a |
41 C c2 |
41 C c2 |
42 blahblah |
42 blahblah |
43 rev offset length base linkrev nodeid p1 p2 |
43 rev offset length base linkrev nodeid p1 p2 |
44 0 0 67 0 1 dc51707dfc98 000000000000 000000000000 |
44 0 0 67 0 1 57eacc201a7f 000000000000 000000000000 |
45 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98 |
45 1 67 72 1 3 4727ba907962 000000000000 57eacc201a7f |
46 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |
46 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |