1 adding 1 |
|
2 adding 2 |
|
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
4 created new head |
|
5 searching for copies back to rev 1 |
|
6 unmatched files in other: |
|
7 1a |
|
8 all copies found (* = to merge, ! = divergent): |
|
9 1a -> 1 |
|
10 checking for directory renames |
|
11 resolving manifests |
|
12 overwrite None partial False |
|
13 ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a |
|
14 1: other deleted -> r |
|
15 1a: remote created -> g |
|
16 updating: 1 1/2 files (50.00%) |
|
17 removing 1 |
|
18 updating: 1a 2/2 files (100.00%) |
|
19 getting 1a |
|
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
21 (branch merge, don't forget to commit) |
|
22 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
23 created new head |
|
24 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
25 searching for copies back to rev 1 |
|
26 unmatched files in local: |
|
27 1a |
|
28 all copies found (* = to merge, ! = divergent): |
|
29 1a -> 1 * |
|
30 checking for directory renames |
|
31 resolving manifests |
|
32 overwrite None partial False |
|
33 ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96 |
|
34 1a: local copied/moved to 1 -> m |
|
35 preserving 1a for resolve of 1a |
|
36 updating: 1a 1/1 files (100.00%) |
|
37 picked tool 'internal:merge' for 1a (binary False symlink False) |
|
38 merging 1a and 1 to 1a |
|
39 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
|
40 premerge successful |
|
41 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
42 (branch merge, don't forget to commit) |
|
43 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
44 searching for copies back to rev 1 |
|
45 unmatched files in other: |
|
46 1a |
|
47 all copies found (* = to merge, ! = divergent): |
|
48 1a -> 1 * |
|
49 checking for directory renames |
|
50 resolving manifests |
|
51 overwrite None partial False |
|
52 ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8 |
|
53 1: remote moved to 1a -> m |
|
54 preserving 1 for resolve of 1a |
|
55 removing 1 |
|
56 updating: 1 1/1 files (100.00%) |
|
57 picked tool 'internal:merge' for 1a (binary False symlink False) |
|
58 merging 1 and 1a to 1a |
|
59 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d |
|
60 premerge successful |
|
61 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
62 (branch merge, don't forget to commit) |
|