380 branchmerge: True, force: False, partial: False |
380 branchmerge: True, force: False, partial: False |
381 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
381 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
382 preserving rev for resolve of rev |
382 preserving rev for resolve of rev |
383 c: remote created -> g |
383 c: remote created -> g |
384 getting c |
384 getting c |
385 updating: c 1/3 files (33.33%) |
385 updating: c 1/2 files (50.00%) |
386 rev: versions differ -> m |
386 rev: versions differ -> m |
387 updating: rev 2/3 files (66.67%) |
387 updating: rev 2/2 files (100.00%) |
388 picked tool 'python ../merge' for rev (binary False symlink False) |
388 picked tool 'python ../merge' for rev (binary False symlink False) |
389 merging rev |
389 merging rev |
390 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
390 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
391 a: divergent renames -> dr |
|
392 updating: a 3/3 files (100.00%) |
|
393 note: possible conflict - a was renamed multiple times to: |
391 note: possible conflict - a was renamed multiple times to: |
394 b |
392 b |
395 c |
393 c |
396 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
394 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
397 (branch merge, don't forget to commit) |
395 (branch merge, don't forget to commit) |