Mercurial > hg

changeset 46533:e20977208924

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-copies: improve description of the A+B case This will make its role clearer. Differential Revision: https://phab.mercurial-scm.org/D10037
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 16 Feb 2021 05:26:46 +0100
parents c9f502721783
children 979838adc46b
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:19:23 2021 +0100
+++ b/tests/test-copies-chain-merge.t	Tue Feb 16 05:26:46 2021 +0100
@@ -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
   | |