equal
deleted
inserted
replaced
33 checking for directory renames |
33 checking for directory renames |
34 resolving manifests |
34 resolving manifests |
35 branchmerge: True, force: False, partial: False |
35 branchmerge: True, force: False, partial: False |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
36 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
37 1: other deleted -> r |
37 1: other deleted -> r |
38 1a: remote created -> g |
|
39 2: keep -> k |
|
40 removing 1 |
38 removing 1 |
41 updating: 1 1/2 files (50.00%) |
39 updating: 1 1/2 files (50.00%) |
|
40 1a: remote created -> g |
42 getting 1a |
41 getting 1a |
43 updating: 1a 2/2 files (100.00%) |
42 updating: 1a 2/2 files (100.00%) |
|
43 2: keep -> k |
44 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
44 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
45 (branch merge, don't forget to commit) |
45 (branch merge, don't forget to commit) |
46 |
46 |
47 $ hg ci -m merge1 # 3 |
47 $ hg ci -m merge1 # 3 |
48 |
48 |
64 src: '1' -> dst: '1a' * |
64 src: '1' -> dst: '1a' * |
65 checking for directory renames |
65 checking for directory renames |
66 resolving manifests |
66 resolving manifests |
67 branchmerge: True, force: False, partial: False |
67 branchmerge: True, force: False, partial: False |
68 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
68 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
|
69 preserving 1a for resolve of 1a |
69 1a: local copied/moved from 1 -> m |
70 1a: local copied/moved from 1 -> m |
70 preserving 1a for resolve of 1a |
|
71 updating: 1a 1/1 files (100.00%) |
71 updating: 1a 1/1 files (100.00%) |
72 picked tool 'internal:merge' for 1a (binary False symlink False) |
72 picked tool 'internal:merge' for 1a (binary False symlink False) |
73 merging 1a and 1 to 1a |
73 merging 1a and 1 to 1a |
74 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
74 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
75 premerge successful |
75 premerge successful |
87 src: '1' -> dst: '1a' * |
87 src: '1' -> dst: '1a' * |
88 checking for directory renames |
88 checking for directory renames |
89 resolving manifests |
89 resolving manifests |
90 branchmerge: True, force: False, partial: False |
90 branchmerge: True, force: False, partial: False |
91 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
91 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
|
92 preserving 1 for resolve of 1a |
|
93 removing 1 |
92 1a: remote moved from 1 -> m |
94 1a: remote moved from 1 -> m |
93 preserving 1 for resolve of 1a |
|
94 removing 1 |
|
95 updating: 1a 1/1 files (100.00%) |
95 updating: 1a 1/1 files (100.00%) |
96 picked tool 'internal:merge' for 1a (binary False symlink False) |
96 picked tool 'internal:merge' for 1a (binary False symlink False) |
97 merging 1 and 1a to 1a |
97 merging 1 and 1a to 1a |
98 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d |
98 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d |
99 premerge successful |
99 premerge successful |