equal
deleted
inserted
replaced
147 branchmerge: True, force: False, partial: False |
147 branchmerge: True, force: False, partial: False |
148 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
148 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
149 f1: versions differ -> m |
149 f1: versions differ -> m |
150 f2: remote unchanged -> k |
150 f2: remote unchanged -> k |
151 |
151 |
152 auction for merging merge bids |
152 auction for merging merge bids (2 ancestors) |
153 f1: picking 'get' action |
153 f1: picking 'get' action |
154 f2: picking 'keep' action |
154 f2: picking 'keep' action |
155 end of auction |
155 end of auction |
156 |
156 |
157 f1: remote is newer -> g |
157 f1: remote is newer -> g |
190 branchmerge: True, force: False, partial: False |
190 branchmerge: True, force: False, partial: False |
191 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 |
191 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 |
192 f1: versions differ -> m |
192 f1: versions differ -> m |
193 f2: remote is newer -> g |
193 f2: remote is newer -> g |
194 |
194 |
195 auction for merging merge bids |
195 auction for merging merge bids (2 ancestors) |
196 f1: picking 'keep' action |
196 f1: picking 'keep' action |
197 f2: picking 'get' action |
197 f2: picking 'get' action |
198 end of auction |
198 end of auction |
199 |
199 |
200 f2: remote is newer -> g |
200 f2: remote is newer -> g |
228 resolving manifests |
228 resolving manifests |
229 |
229 |
230 calculating bids for ancestor 40663881a6dd |
230 calculating bids for ancestor 40663881a6dd |
231 resolving manifests |
231 resolving manifests |
232 |
232 |
233 auction for merging merge bids |
233 auction for merging merge bids (2 ancestors) |
234 f1: picking 'get' action |
234 f1: picking 'get' action |
235 f2: picking 'keep' action |
235 f2: picking 'keep' action |
236 end of auction |
236 end of auction |
237 |
237 |
238 getting f1 |
238 getting f1 |
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 f1: versions differ -> m |
257 f1: versions differ -> m |
258 f2: remote unchanged -> k |
258 f2: remote unchanged -> k |
259 |
259 |
260 auction for merging merge bids |
260 auction for merging merge bids (2 ancestors) |
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 |
341 resolving manifests |
341 resolving manifests |
342 |
342 |
343 calculating bids for ancestor b211bbc6eb3c |
343 calculating bids for ancestor b211bbc6eb3c |
344 resolving manifests |
344 resolving manifests |
345 |
345 |
346 auction for merging merge bids |
346 auction for merging merge bids (2 ancestors) |
347 x: multiple bids for merge action: |
347 x: multiple bids for merge action: |
348 versions differ -> m |
348 versions differ -> m |
349 versions differ -> m |
349 versions differ -> m |
350 x: ambiguous merge - picked m action |
350 x: ambiguous merge - picked m action |
351 end of auction |
351 end of auction |
428 ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 |
428 ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 |
429 d1/a: other deleted -> r |
429 d1/a: other deleted -> r |
430 d1/b: other deleted -> r |
430 d1/b: other deleted -> r |
431 d2/b: remote created -> g |
431 d2/b: remote created -> g |
432 |
432 |
433 auction for merging merge bids |
433 auction for merging merge bids (2 ancestors) |
434 d1/a: consensus for r |
434 d1/a: consensus for r |
435 d1/b: consensus for r |
435 d1/b: consensus for r |
436 d2/b: consensus for g |
436 d2/b: consensus for g |
437 end of auction |
437 end of auction |
438 |
438 |