diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t index dad5f5d2e0abef0aaa536bbb8bc0744540df4118_dGVzdHMvdGVzdC1jb3BpZXMtY2hhaW4tbWVyZ2UudA==..89c6bd2e8f27a53ecb93795b143796b567bcff2a_dGVzdHMvdGVzdC1jb3BpZXMtY2hhaW4tbWVyZ2UudA== 100644 --- a/tests/test-copies-chain-merge.t +++ b/tests/test-copies-chain-merge.t @@ -227,7 +227,7 @@ - one deleting the change 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")' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -251,7 +251,7 @@ $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' @ 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 | | | @@ -255,7 +255,7 @@ |\ | | 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 | | @@ -686,8 +686,8 @@ mAEm-0 simple merge - one way mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way 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 mBDm-0 simple merge - one way mBFm-0 simple merge - one way mCB-revert-m-0 @@ -690,8 +690,8 @@ mBCm-1 re-add d mBDm-0 simple merge - one way mBFm-0 simple merge - one way 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 mCGm-0 mCH-delete-before-conflict-m-0 @@ -1034,7 +1034,7 @@ $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' 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 | | | @@ -1038,7 +1038,7 @@ |\ | | 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 | |