273 |
273 |
274 Merge: |
274 Merge: |
275 - one with change to an unrelated file |
275 - one with change to an unrelated file |
276 - one deleting and recreating the change |
276 - one deleting and recreating the change |
277 |
277 |
278 $ case_desc="simple merge" |
278 $ case_desc="simple merge - B side: unrelated update, D side: delete and recreate a file (with different content)" |
279 |
279 |
280 $ hg up 'desc("b-1")' |
280 $ hg up 'desc("b-1")' |
281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
282 $ hg merge 'desc("d-2")' |
282 $ hg merge 'desc("d-2")' |
283 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
283 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
290 (branch merge, don't forget to commit) |
290 (branch merge, don't forget to commit) |
291 $ hg ci -m "mDBm-0 $case_desc - the other way" |
291 $ hg ci -m "mDBm-0 $case_desc - the other way" |
292 created new head |
292 created new head |
293 $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
293 $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
294 @ 18 mDBm-0 simple merge - the other way |
294 @ 18 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way |
295 |\ |
295 |\ |
296 +---o 17 mBDm-0 simple merge - one way |
296 +---o 17 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way |
297 | |/ |
297 | |/ |
298 | o 8 d-2 re-add d |
298 | o 8 d-2 re-add d |
299 | | |
299 | | |
300 | o 7 d-1 delete d |
300 | o 7 d-1 delete d |
301 | | |
301 | | |
686 mAEm-0 simple merge - one way |
686 mAEm-0 simple merge - one way |
687 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way |
687 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way |
688 mBC-revert-m-0 |
688 mBC-revert-m-0 |
689 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
689 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
690 mBCm-1 re-add d |
690 mBCm-1 re-add d |
691 mBDm-0 simple merge - one way |
691 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way |
692 mBFm-0 simple merge - one way |
692 mBFm-0 simple merge - one way |
693 mCB-revert-m-0 |
693 mCB-revert-m-0 |
694 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
694 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
695 mCBm-1 re-add d |
695 mCBm-1 re-add d |
696 mCGm-0 |
696 mCGm-0 |
697 mCH-delete-before-conflict-m-0 |
697 mCH-delete-before-conflict-m-0 |
698 mDBm-0 simple merge - the other way |
698 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way |
699 mDGm-0 simple merge - one way |
699 mDGm-0 simple merge - one way |
700 mEAm-0 simple merge - the other way |
700 mEAm-0 simple merge - the other way |
701 mFBm-0 simple merge - the other way |
701 mFBm-0 simple merge - the other way |
702 mFGm-0 simple merge - one way |
702 mFGm-0 simple merge - one way |
703 mGCm-0 |
703 mGCm-0 |
1106 Merge: |
1106 Merge: |
1107 - one with change to an unrelated file |
1107 - one with change to an unrelated file |
1108 - one deleting and recreating the change |
1108 - one deleting and recreating the change |
1109 |
1109 |
1110 $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
1110 $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' |
1111 o 18 mDBm-0 simple merge - the other way |
1111 o 18 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way |
1112 |\ |
1112 |\ |
1113 +---o 17 mBDm-0 simple merge - one way |
1113 +---o 17 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way |
1114 | |/ |
1114 | |/ |
1115 | o 8 d-2 re-add d |
1115 | o 8 d-2 re-add d |
1116 | | |
1116 | | |
1117 | o 7 d-1 delete d |
1117 | o 7 d-1 delete d |
1118 | | |
1118 | | |