Patchwork D10039: test-copies: improve description of the B+D case

login
register
mail settings
Submitter phabricator
Date Feb. 22, 2021, 2:34 p.m.
Message ID <differential-rev-PHID-DREV-iyrcvb6fkgvzioabte2n-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48354/
State Superseded
Headers show

Comments

phabricator - Feb. 22, 2021, 2:34 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This will make its role clearer.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10039

AFFECTED FILES
  tests/test-copies-chain-merge.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t
--- a/tests/test-copies-chain-merge.t
+++ b/tests/test-copies-chain-merge.t
@@ -275,7 +275,7 @@ 
 - one with change to an unrelated file
 - one deleting and recreating the change
 
-  $ case_desc="simple merge"
+  $ case_desc="simple merge - B side: unrelated update, D side: delete and recreate a file (with different content)"
 
   $ hg up 'desc("b-1")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -291,9 +291,9 @@ 
   $ hg ci -m "mDBm-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
-  @    18 mDBm-0 simple merge - the other way
+  @    18 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
   |\
-  +---o  17 mBDm-0 simple merge - one way
+  +---o  17 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
   | |/
   | o  8 d-2 re-add d
   | |
@@ -688,14 +688,14 @@ 
   mBC-revert-m-0
   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
+  mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
   mBFm-0 simple merge - one way
   mCB-revert-m-0
   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
-  mDBm-0 simple merge - the other way
+  mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
   mDGm-0 simple merge - one way
   mEAm-0 simple merge - the other way
   mFBm-0 simple merge - the other way
@@ -1108,9 +1108,9 @@ 
 - one deleting and recreating the change
 
   $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
-  o    18 mDBm-0 simple merge - the other way
+  o    18 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
   |\
-  +---o  17 mBDm-0 simple merge - one way
+  +---o  17 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
   | |/
   | o  8 d-2 re-add d
   | |