This will make its role clearer.
Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
This will make its role clearer.
Automatic diff as part of commit; lint not applicable. |
Automatic diff as part of commit; unit tests not applicable. |
Path | Packages | |||
---|---|---|---|---|
M | tests/test-copies-chain-merge.t (14 lines) |
merging with the side having a delete | merging with the side having a delete | ||||
------------------------------------- | ------------------------------------- | ||||
case summary: | case summary: | ||||
- one with change to an unrelated file | - one with change to an unrelated file | ||||
- one deleting the change | - one deleting the change | ||||
and recreate an unrelated file after the merge | and recreate an unrelated file after the merge | ||||
$ case_desc="simple merge" | $ case_desc="simple merge - C side: delete a file with copies history , B side: unrelated update" | ||||
$ hg up 'desc("b-1")' | $ hg up 'desc("b-1")' | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg merge 'desc("c-1")' | $ hg merge 'desc("c-1")' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
$ hg ci -m "mBCm-0 $case_desc - one way" | $ hg ci -m "mBCm-0 $case_desc - one way" | ||||
$ echo bar > d | $ echo bar > d | ||||
$ hg add d | $ hg add d | ||||
$ hg ci -m 'mBCm-1 re-add d' | $ hg ci -m 'mBCm-1 re-add d' | ||||
$ hg up 'desc("c-1")' | $ hg up 'desc("c-1")' | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg merge 'desc("b-1")' | $ hg merge 'desc("b-1")' | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
$ hg ci -m "mCBm-0 $case_desc - the other way" | $ hg ci -m "mCBm-0 $case_desc - the other way" | ||||
created new head | created new head | ||||
$ echo bar > d | $ echo bar > d | ||||
$ hg add d | $ hg add d | ||||
$ hg ci -m 'mCBm-1 re-add d' | $ hg ci -m 'mCBm-1 re-add d' | ||||
$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' | $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' | ||||
@ 16 mCBm-1 re-add d | @ 16 mCBm-1 re-add d | ||||
| | | | ||||
o 15 mCBm-0 simple merge - the other way | o 15 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way | ||||
|\ | |\ | ||||
| | o 14 mBCm-1 re-add d | | | o 14 mBCm-1 re-add d | ||||
| | | | | | | | ||||
+---o 13 mBCm-0 simple merge - one way | +---o 13 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way | ||||
| |/ | | |/ | ||||
| o 6 c-1 delete d | | o 6 c-1 delete d | ||||
| | | | | | ||||
o | 5 b-1: b update | o | 5 b-1: b update | ||||
|/ | |/ | ||||
o 2 i-2: c -move-> d | o 2 i-2: c -move-> d | ||||
| | | | ||||
o 1 i-1: a -move-> c | o 1 i-1: a -move-> c | ||||
h-1: b -(move)-> d | h-1: b -(move)-> d | ||||
i-0 initial commit: a b h | i-0 initial commit: a b h | ||||
i-1: a -move-> c | i-1: a -move-> c | ||||
i-2: c -move-> d | i-2: c -move-> d | ||||
mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way | mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way | ||||
mAEm-0 simple merge - one way | mAEm-0 simple merge - one way | ||||
mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way | mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way | ||||
mBC-revert-m-0 | mBC-revert-m-0 | ||||
mBCm-0 simple merge - one way | mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way | ||||
mBCm-1 re-add d | mBCm-1 re-add d | ||||
mBDm-0 simple merge - one way | mBDm-0 simple merge - one way | ||||
mBFm-0 simple merge - one way | mBFm-0 simple merge - one way | ||||
mCB-revert-m-0 | mCB-revert-m-0 | ||||
mCBm-0 simple merge - the other way | mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way | ||||
mCBm-1 re-add d | mCBm-1 re-add d | ||||
mCGm-0 | mCGm-0 | ||||
mCH-delete-before-conflict-m-0 | mCH-delete-before-conflict-m-0 | ||||
mDBm-0 simple merge - the other way | mDBm-0 simple merge - the other way | ||||
mDGm-0 simple merge - one way | mDGm-0 simple merge - one way | ||||
mEAm-0 simple merge - the other way | mEAm-0 simple merge - the other way | ||||
mFBm-0 simple merge - the other way | mFBm-0 simple merge - the other way | ||||
mFGm-0 simple merge - one way | mFGm-0 simple merge - one way | ||||
case summary: | case summary: | ||||
- one with change to an unrelated file | - one with change to an unrelated file | ||||
- one deleting the change | - one deleting the change | ||||
and recreate an unrelated file after the merge | and recreate an unrelated file after the merge | ||||
$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' | $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' | ||||
o 16 mCBm-1 re-add d | o 16 mCBm-1 re-add d | ||||
| | | | ||||
o 15 mCBm-0 simple merge - the other way | o 15 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way | ||||
|\ | |\ | ||||
| | o 14 mBCm-1 re-add d | | | o 14 mBCm-1 re-add d | ||||
| | | | | | | | ||||
+---o 13 mBCm-0 simple merge - one way | +---o 13 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way | ||||
| |/ | | |/ | ||||
| o 6 c-1 delete d | | o 6 c-1 delete d | ||||
| | | | | | ||||
o | 5 b-1: b update | o | 5 b-1: b update | ||||
|/ | |/ | ||||
o 2 i-2: c -move-> d | o 2 i-2: c -move-> d | ||||
| | | | ||||
o 1 i-1: a -move-> c | o 1 i-1: a -move-> c |