Mercurial > hg-stable

changeset 46581:979838adc46b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-copies: improve description of the B+C case This will make its role clearer. Differential Revision: https://phab.mercurial-scm.org/D10038
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 16 Feb 2021 05:29:04 +0100
parents e20977208924
children 9a58f9eed303
files tests/test-copies-chain-merge.t
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-copies-chain-merge.t	Tue Feb 16 05:26:46 2021 +0100
+++ b/tests/test-copies-chain-merge.t	Tue Feb 16 05:29:04 2021 +0100
@@ -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,11 +251,11 @@
   $ 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
   | | |
-  +---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,12 +686,12 @@
   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
-  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,11 +1034,11 @@
   $ 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
   | | |
-  +---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
   | |