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

test-copies: improve description of the G+F case

This will make its role clearer.

Differential Revision: https://phab.mercurial-scm.org/D10042
parent 4b3c8e7cf47b
No related branches found
No related tags found
No related merge requests found
......@@ -469,7 +469,7 @@
|
| The current code arbitrarily pick one side
$ case_desc="simple merge"
$ case_desc="merge - G side: content change, F side: copy overwrite, no content change"
$ hg up 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
......@@ -491,5 +491,5 @@
$ hg ci -m "mGFm-0 $case_desc - the other way"
created new head
$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
@ 29 mGFm-0 simple merge - the other way
@ 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
|\
......@@ -495,5 +495,5 @@
|\
+---o 28 mFGm-0 simple merge - one way
+---o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
| |/
| o 25 g-1: update d
| |
......@@ -699,6 +699,6 @@
mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
mFBm-0 simple merge - the other way
mFGm-0 simple merge - one way
mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
mGCm-0
mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
......@@ -703,6 +703,6 @@
mGCm-0
mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
mGFm-0 simple merge - the other way
mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
mHC-delete-before-conflict-m-0
......@@ -1441,7 +1441,7 @@
#if no-changeset
$ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way
o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
|\
| o 25 g-1: update d
| |
......@@ -1470,7 +1470,7 @@
#if no-changeset
$ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way
o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
|\
| o 25 g-1: update d
| |
......@@ -1506,5 +1506,5 @@
$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
o 29 mGFm-0 simple merge - the other way
o 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
|\
......@@ -1510,5 +1510,5 @@
|\
+---o 28 mFGm-0 simple merge - one way
+---o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
| |/
| o 25 g-1: update d
| |
......@@ -1584,7 +1584,7 @@
#if no-changeset
$ hg log -Gfr 'desc("mFGm-0")' d
o 28 mFGm-0 simple merge - one way
o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
|\
| o 25 g-1: update d
| |
......@@ -1610,7 +1610,7 @@
#if no-changeset
$ hg log -Gfr 'desc("mGFm-0")' d
o 29 mGFm-0 simple merge - the other way
o 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
|\
| o 25 g-1: update d
| |
......
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