79 alternatively, use --config merge.preferancestor=40663881a6dd |
79 alternatively, use --config merge.preferancestor=40663881a6dd |
80 searching for copies back to rev 3 |
80 searching for copies back to rev 3 |
81 resolving manifests |
81 resolving manifests |
82 branchmerge: True, force: False, partial: False |
82 branchmerge: True, force: False, partial: False |
83 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
83 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
84 f1: remote is newer -> g |
84 preserving f2 for resolve of f2 |
85 f2: versions differ -> m |
85 f1: remote is newer -> g |
86 preserving f2 for resolve of f2 |
|
87 getting f1 |
86 getting f1 |
88 updating: f1 1/2 files (50.00%) |
87 updating: f1 1/2 files (50.00%) |
|
88 f2: versions differ -> m |
89 updating: f2 2/2 files (100.00%) |
89 updating: f2 2/2 files (100.00%) |
90 picked tool 'internal:dump' for f2 (binary False symlink False) |
90 picked tool 'internal:dump' for f2 (binary False symlink False) |
91 merging f2 |
91 merging f2 |
92 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c |
92 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c |
93 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
93 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
141 calculating bids for ancestor 40663881a6dd |
141 calculating bids for ancestor 40663881a6dd |
142 searching for copies back to rev 3 |
142 searching for copies back to rev 3 |
143 resolving manifests |
143 resolving manifests |
144 branchmerge: True, force: False, partial: False |
144 branchmerge: True, force: False, partial: False |
145 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
145 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
|
146 f2: keep -> k |
146 f1: versions differ -> m |
147 f1: versions differ -> m |
147 f2: keep -> k |
|
148 |
148 |
149 auction for merging merge bids |
149 auction for merging merge bids |
150 f1: picking 'get' action |
150 f1: picking 'get' action |
151 f2: picking 'keep' action |
151 f2: picking 'keep' action |
152 end of auction |
152 end of auction |
153 |
153 |
154 f1: remote is newer -> g |
154 f1: remote is newer -> g |
155 f2: keep -> k |
|
156 getting f1 |
155 getting f1 |
157 updating: f1 1/1 files (100.00%) |
156 updating: f1 1/1 files (100.00%) |
|
157 f2: keep -> k |
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 (branch merge, don't forget to commit) |
159 (branch merge, don't forget to commit) |
160 |
160 |
161 $ head * |
161 $ head * |
162 ==> f1 <== |
162 ==> f1 <== |
186 calculating bids for ancestor 40663881a6dd |
186 calculating bids for ancestor 40663881a6dd |
187 searching for copies back to rev 3 |
187 searching for copies back to rev 3 |
188 resolving manifests |
188 resolving manifests |
189 branchmerge: True, force: False, partial: False |
189 branchmerge: True, force: False, partial: False |
190 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 |
190 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 |
|
191 f2: remote is newer -> g |
191 f1: versions differ -> m |
192 f1: versions differ -> m |
192 f2: remote is newer -> g |
|
193 |
193 |
194 auction for merging merge bids |
194 auction for merging merge bids |
195 f1: picking 'keep' action |
195 f1: picking 'keep' action |
196 f2: picking 'get' action |
196 f2: picking 'get' action |
197 end of auction |
197 end of auction |
198 |
198 |
199 f2: remote is newer -> g |
199 f2: remote is newer -> g |
200 f1: keep -> k |
|
201 getting f2 |
200 getting f2 |
202 updating: f2 1/1 files (100.00%) |
201 updating: f2 1/1 files (100.00%) |
|
202 f1: keep -> k |
203 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
203 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
204 (branch merge, don't forget to commit) |
204 (branch merge, don't forget to commit) |
205 |
205 |
206 $ head * |
206 $ head * |
207 ==> f1 <== |
207 ==> f1 <== |
252 calculating bids for ancestor 40663881a6dd |
252 calculating bids for ancestor 40663881a6dd |
253 searching for copies back to rev 3 |
253 searching for copies back to rev 3 |
254 resolving manifests |
254 resolving manifests |
255 branchmerge: True, force: False, partial: False |
255 branchmerge: True, force: False, partial: False |
256 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
256 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
|
257 f2: keep -> k |
257 f1: versions differ -> m |
258 f1: versions differ -> m |
258 f2: keep -> k |
|
259 |
259 |
260 auction for merging merge bids |
260 auction for merging merge bids |
261 f1: picking 'get' action |
261 f1: picking 'get' action |
262 f2: picking 'keep' action |
262 f2: picking 'keep' action |
263 end of auction |
263 end of auction |
264 |
264 |
265 f1: remote is newer -> g |
265 f1: remote is newer -> g |
266 f2: keep -> k |
|
267 getting f1 |
266 getting f1 |
268 updating: f1 1/1 files (100.00%) |
267 updating: f1 1/1 files (100.00%) |
|
268 f2: keep -> k |
269 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
269 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
270 (branch merge, don't forget to commit) |
270 (branch merge, don't forget to commit) |
271 |
271 |
272 $ cd .. |
272 $ cd .. |
273 |
273 |