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