equal
deleted
inserted
replaced
225 case summary: |
225 case summary: |
226 - one with change to an unrelated file |
226 - one with change to an unrelated file |
227 - one deleting the change |
227 - one deleting the change |
228 and recreate an unrelated file after the merge |
228 and recreate an unrelated file after the merge |
229 |
229 |
230 $ case_desc="simple merge" |
230 $ case_desc="simple merge - C side: delete a file with copies history , B side: unrelated update" |
231 |
231 |
232 $ hg up 'desc("b-1")' |
232 $ hg up 'desc("b-1")' |
233 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
233 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
234 $ hg merge 'desc("c-1")' |
234 $ hg merge 'desc("c-1")' |
235 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
235 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
249 $ hg add d |
249 $ hg add d |
250 $ hg ci -m 'mCBm-1 re-add d' |
250 $ hg ci -m 'mCBm-1 re-add d' |
251 $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' |
251 $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' |
252 @ 16 mCBm-1 re-add d |
252 @ 16 mCBm-1 re-add d |
253 | |
253 | |
254 o 15 mCBm-0 simple merge - the other way |
254 o 15 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
255 |\ |
255 |\ |
256 | | o 14 mBCm-1 re-add d |
256 | | o 14 mBCm-1 re-add d |
257 | | | |
257 | | | |
258 +---o 13 mBCm-0 simple merge - one way |
258 +---o 13 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
259 | |/ |
259 | |/ |
260 | o 6 c-1 delete d |
260 | o 6 c-1 delete d |
261 | | |
261 | | |
262 o | 5 b-1: b update |
262 o | 5 b-1: b update |
263 |/ |
263 |/ |
684 i-2: c -move-> d |
684 i-2: c -move-> d |
685 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way |
685 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way |
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 - 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 - 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 - 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 - the other way |
699 mDGm-0 simple merge - one way |
699 mDGm-0 simple merge - one way |
1032 and recreate an unrelated file after the merge |
1032 and recreate an unrelated file after the merge |
1033 |
1033 |
1034 $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' |
1034 $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' |
1035 o 16 mCBm-1 re-add d |
1035 o 16 mCBm-1 re-add d |
1036 | |
1036 | |
1037 o 15 mCBm-0 simple merge - the other way |
1037 o 15 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
1038 |\ |
1038 |\ |
1039 | | o 14 mBCm-1 re-add d |
1039 | | o 14 mBCm-1 re-add d |
1040 | | | |
1040 | | | |
1041 +---o 13 mBCm-0 simple merge - one way |
1041 +---o 13 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
1042 | |/ |
1042 | |/ |
1043 | o 6 c-1 delete d |
1043 | o 6 c-1 delete d |
1044 | | |
1044 | | |
1045 o | 5 b-1: b update |
1045 o | 5 b-1: b update |
1046 |/ |
1046 |/ |