1 checkout |
|
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 created new head |
|
4 merge |
|
5 searching for copies back to rev 1 |
|
6 unmatched files in local: |
|
7 c2 |
|
8 unmatched files in other: |
|
9 b |
|
10 b2 |
|
11 all copies found (* = to merge, ! = divergent): |
|
12 c2 -> a2 ! |
|
13 b -> a * |
|
14 b2 -> a2 ! |
|
15 checking for directory renames |
|
16 a2: divergent renames -> dr |
|
17 resolving manifests |
|
18 overwrite None partial False |
|
19 ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c |
|
20 a: remote moved to b -> m |
|
21 b2: remote created -> g |
|
22 preserving a for resolve of b |
|
23 removing a |
|
24 updating: a 1/3 files (33.33%) |
|
25 picked tool 'internal:merge' for b (binary False symlink False) |
|
26 merging a and b to b |
|
27 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
|
28 premerge successful |
|
29 updating: a2 2/3 files (66.67%) |
|
30 warning: detected divergent renames of a2 to: |
|
31 c2 |
|
32 b2 |
|
33 updating: b2 3/3 files (100.00%) |
|
34 getting b2 |
|
35 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
36 (branch merge, don't forget to commit) |
|
37 M b |
|
38 a |
|
39 M b2 |
|
40 R a |
|
41 C c2 |
|
42 blahblah |
|
43 rev offset length base linkrev nodeid p1 p2 |
|
44 0 0 67 0 1 57eacc201a7f 000000000000 000000000000 |
|
45 1 67 72 1 3 4727ba907962 000000000000 57eacc201a7f |
|
46 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |
|