D10037: test-copies: improve description of the A+B case

[marmoute (Pierre-Yves David)]

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/D10037

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

CHANGE DETAILS

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
@@ -185,7 +185,7 @@
 - rename on one side
 - unrelated change on the other side
 
-  $ case_desc="simple merge"
+  $ case_desc="simple merge - A side: multiple renames, B side: unrelated update"
 
   $ hg up 'desc("b-1")'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -201,9 +201,9 @@
   $ hg ci -m "mABm-0 $case_desc - the other way"
   created new head
   $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
-  @    12 mABm-0 simple merge - the other way
+  @    12 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
   |\
-  +---o  11 mBAm-0 simple merge - one way
+  +---o  11 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
   | |/
   | o  5 b-1: b update
   | |
@@ -682,9 +682,9 @@
   i-0 initial commit: a b h
   i-1: a -move-> c
   i-2: c -move-> d
-  mABm-0 simple merge - the other way
+  mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
   mAEm-0 simple merge - one way
-  mBAm-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-1 re-add d
@@ -973,9 +973,9 @@
 - unrelated change on the other side
 
   $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
-  o    12 mABm-0 simple merge - the other way
+  o    12 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
   |\
-  +---o  11 mBAm-0 simple merge - one way
+  +---o  11 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
   | |/
   | o  5 b-1: b update
   | |



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