equal
deleted
inserted
replaced
87 branchmerge: True, force: False, partial: False |
87 branchmerge: True, force: False, partial: False |
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
89 preserving a for resolve of b |
89 preserving a for resolve of b |
90 preserving rev for resolve of rev |
90 preserving rev for resolve of rev |
91 starting 4 threads for background file closing (?) |
91 starting 4 threads for background file closing (?) |
92 a: remote unchanged -> k |
|
93 b: remote copied from a -> m (premerge) |
92 b: remote copied from a -> m (premerge) |
94 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
93 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
95 merging a and b to b |
94 merging a and b to b |
96 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
95 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
97 premerge successful |
96 premerge successful |
650 branchmerge: True, force: False, partial: False |
649 branchmerge: True, force: False, partial: False |
651 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
650 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
652 preserving b for resolve of b |
651 preserving b for resolve of b |
653 preserving rev for resolve of rev |
652 preserving rev for resolve of rev |
654 starting 4 threads for background file closing (?) |
653 starting 4 threads for background file closing (?) |
655 a: remote unchanged -> k |
|
656 b: both created -> m (premerge) |
654 b: both created -> m (premerge) |
657 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
655 picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
658 merging b |
656 merging b |
659 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
657 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
660 rev: versions differ -> m (premerge) |
658 rev: versions differ -> m (premerge) |