Show More
@@ -275,7 +275,7 b' 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 | |
@@ -291,9 +291,9 b' Merge:' | |||||
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 | | | | |
@@ -688,14 +688,14 b' Summary of all created cases' | |||||
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 | |
@@ -1108,9 +1108,9 b' Merge:' | |||||
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 | | | |
General Comments 0
You need to be logged in to leave comments.
Login now