Skip to content
Snippets Groups Projects
Commit 29156d71 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

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

This will make its role clearer.

Differential Revision: https://phab.mercurial-scm.org/D10037
parent b3264f8a
No related branches found
No related tags found
No related merge requests found
......@@ -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,5 +201,5 @@
$ 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
|\
......@@ -205,5 +205,5 @@
|\
+---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,5 +682,5 @@
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
......@@ -686,5 +686,5 @@
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,5 +973,5 @@
- 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
|\
......@@ -977,5 +977,5 @@
|\
+---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
| |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment