44 unmatched files in other: |
44 unmatched files in other: |
45 b |
45 b |
46 resolving manifests |
46 resolving manifests |
47 branchmerge: False, force: False, partial: False |
47 branchmerge: False, force: False, partial: False |
48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
48 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
49 preserving a for resolve of a |
49 b: remote created -> g |
50 b: remote created -> g |
50 a: versions differ -> m |
|
51 preserving a for resolve of a |
|
52 getting b |
51 getting b |
53 updating: b 1/2 files (50.00%) |
52 updating: b 1/2 files (50.00%) |
|
53 a: versions differ -> m |
54 updating: a 2/2 files (100.00%) |
54 updating: a 2/2 files (100.00%) |
55 picked tool 'true' for a (binary False symlink False) |
55 picked tool 'true' for a (binary False symlink False) |
56 merging a |
56 merging a |
57 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
57 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
65 |
65 |
66 $ hg --debug up 0 |
66 $ hg --debug up 0 |
67 resolving manifests |
67 resolving manifests |
68 branchmerge: False, force: False, partial: False |
68 branchmerge: False, force: False, partial: False |
69 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
69 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
|
70 preserving a for resolve of a |
70 b: other deleted -> r |
71 b: other deleted -> r |
71 a: versions differ -> m |
|
72 preserving a for resolve of a |
|
73 removing b |
72 removing b |
74 updating: b 1/2 files (50.00%) |
73 updating: b 1/2 files (50.00%) |
|
74 a: versions differ -> m |
75 updating: a 2/2 files (100.00%) |
75 updating: a 2/2 files (100.00%) |
76 picked tool 'true' for a (binary False symlink False) |
76 picked tool 'true' for a (binary False symlink False) |
77 merging a |
77 merging a |
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
79 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
79 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
98 unmatched files in other: |
98 unmatched files in other: |
99 b |
99 b |
100 resolving manifests |
100 resolving manifests |
101 branchmerge: False, force: False, partial: False |
101 branchmerge: False, force: False, partial: False |
102 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
102 ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
103 preserving a for resolve of a |
103 b: remote created -> g |
104 b: remote created -> g |
104 a: versions differ -> m |
|
105 preserving a for resolve of a |
|
106 getting b |
105 getting b |
107 updating: b 1/2 files (50.00%) |
106 updating: b 1/2 files (50.00%) |
|
107 a: versions differ -> m |
108 updating: a 2/2 files (100.00%) |
108 updating: a 2/2 files (100.00%) |
109 picked tool 'true' for a (binary False symlink False) |
109 picked tool 'true' for a (binary False symlink False) |
110 merging a |
110 merging a |
111 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
111 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
112 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
112 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
179 unmatched files new in both: |
179 unmatched files new in both: |
180 b |
180 b |
181 resolving manifests |
181 resolving manifests |
182 branchmerge: True, force: True, partial: False |
182 branchmerge: True, force: True, partial: False |
183 ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 |
183 ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 |
184 a: versions differ -> m |
184 preserving a for resolve of a |
185 preserving a for resolve of a |
185 preserving b for resolve of b |
|
186 a: versions differ -> m |
|
187 updating: a 1/2 files (50.00%) |
|
188 picked tool 'true' for a (binary False symlink False) |
|
189 merging a |
|
190 my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a |
186 b: versions differ -> m |
191 b: versions differ -> m |
187 preserving b for resolve of b |
|
188 updating: a 1/2 files (50.00%) |
|
189 picked tool 'true' for a (binary False symlink False) |
|
190 merging a |
|
191 my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a |
|
192 updating: b 2/2 files (100.00%) |
192 updating: b 2/2 files (100.00%) |
193 picked tool 'true' for b (binary False symlink False) |
193 picked tool 'true' for b (binary False symlink False) |
194 merging b |
194 merging b |
195 my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000 |
195 my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000 |
196 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
196 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |