421 unmatched files in local: |
421 unmatched files in local: |
422 d1/a |
422 d1/a |
423 d1/b |
423 d1/b |
424 unmatched files in other: |
424 unmatched files in other: |
425 d2/b |
425 d2/b |
426 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
|
427 src: 'd1/b' -> dst: 'd2/b' |
|
428 checking for directory renames |
|
429 discovered dir src: 'd1/' -> dst: 'd2/' |
|
430 pending file src: 'd1/a' -> dst: 'd2/a' |
|
431 pending file src: 'd1/b' -> dst: 'd2/b' |
|
432 resolving manifests |
426 resolving manifests |
433 branchmerge: True, force: False, partial: False |
427 branchmerge: True, force: False, partial: False |
434 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
428 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
435 d2/a: remote directory rename - move from d1/a -> dm |
429 d2/b: remote created -> g |
436 d2/b: remote directory rename, both created -> m |
|
437 |
430 |
438 calculating bids for ancestor 154e6000f54e |
431 calculating bids for ancestor 154e6000f54e |
439 searching for copies back to rev 3 |
432 searching for copies back to rev 3 |
440 unmatched files in other: |
433 unmatched files in other: |
441 d2/b |
434 d2/b |
451 d2/b: remote created -> g |
444 d2/b: remote created -> g |
452 |
445 |
453 auction for merging merge bids |
446 auction for merging merge bids |
454 d1/a: consensus for r |
447 d1/a: consensus for r |
455 d1/b: consensus for r |
448 d1/b: consensus for r |
456 d2/a: consensus for dm |
449 d2/b: consensus for g |
457 d2/b: picking 'get' action |
|
458 end of auction |
450 end of auction |
459 |
451 |
460 d1/a: other deleted -> r |
452 d1/a: other deleted -> r |
461 removing d1/a |
453 removing d1/a |
462 d1/b: other deleted -> r |
454 d1/b: other deleted -> r |