409 src: 'a' -> dst: 'c' ! |
409 src: 'a' -> dst: 'c' ! |
410 checking for directory renames |
410 checking for directory renames |
411 resolving manifests |
411 resolving manifests |
412 branchmerge: True, force: False, partial: False |
412 branchmerge: True, force: False, partial: False |
413 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
413 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
414 preserving rev for resolve of rev |
|
415 c: remote created -> g |
|
416 getting c |
|
417 rev: versions differ -> m (premerge) |
|
418 picked tool 'python ../merge' for rev (binary False symlink False) |
|
419 merging rev |
|
420 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
421 rev: versions differ -> m (merge) |
|
422 picked tool 'python ../merge' for rev (binary False symlink False) |
|
423 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
424 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
|
425 merge tool returned: 0 |
|
426 note: possible conflict - a was renamed multiple times to: |
414 note: possible conflict - a was renamed multiple times to: |
427 b |
415 b |
428 c |
416 c |
|
417 preserving rev for resolve of rev |
|
418 c: remote created -> g |
|
419 getting c |
|
420 rev: versions differ -> m (premerge) |
|
421 picked tool 'python ../merge' for rev (binary False symlink False) |
|
422 merging rev |
|
423 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
424 rev: versions differ -> m (merge) |
|
425 picked tool 'python ../merge' for rev (binary False symlink False) |
|
426 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
427 launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
|
428 merge tool returned: 0 |
429 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
429 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
430 (branch merge, don't forget to commit) |
430 (branch merge, don't forget to commit) |
431 -------------- |
431 -------------- |
432 M c |
432 M c |
433 C b |
433 C b |