Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-copies: add subcase titles for various "conflicting" information variant
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 18 Feb 2021 13:49:55 +0100
changeset 46543 f01696d45d1e
parent 46542 f8888f5c8c50
child 46544 fbc466484fc3
test-copies: add subcase titles for various "conflicting" information variant This make the transitions between case clearer. Differential Revision: https://phab.mercurial-scm.org/D10047
tests/test-copies-chain-merge.t file | annotate | diff | comparison | revisions 
--- a/tests/test-copies-chain-merge.t	Thu Feb 18 12:45:16 2021 +0100
+++ b/tests/test-copies-chain-merge.t	Thu Feb 18 13:49:55 2021 +0100
@@ -312,6 +312,9 @@
 Comparing with a merge with colliding rename
 --------------------------------------------
 
+Subcase: new copy information on both side
+``````````````````````````````````````````
+
 - the "e-" branch renaming b to f (through 'g')
 - the "a-" branch renaming d to f (through e)
 
@@ -353,6 +356,8 @@
   o  0 i-0 initial commit: a b h
   
 
+Subcase: existing copy information overwritten on one branch
+````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to an unrelated file (b)
@@ -407,6 +412,9 @@
   
 
 
+Subcase: reset of the copy history on one side
+``````````````````````````````````````````````
+
 Merge:
 - one with change to a file
 - one deleting and recreating the file
@@ -455,6 +463,8 @@
   o  0 i-0 initial commit: a b h
   
 
+Subcase: merging a change to a file with a "copy overwrite" to that file from another branch
+````````````````````````````````````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to a file (d)
@@ -1190,6 +1200,9 @@
 Comparing with a merge with colliding rename
 --------------------------------------------
 
+Subcase: new copy information on both side
+``````````````````````````````````````````
+
 - the "e-" branch renaming b to f (through 'g')
 - the "a-" branch renaming d to f (through e)
 
@@ -1304,6 +1317,9 @@
   R b
 
 
+Subcase: existing copy information overwritten on one branch
+````````````````````````````````````````````````````````````
+
 Note:
 | In this case, one of the merge wrongly record a merge while there is none.
 | This lead to bad copy tracing information to be dug up.
@@ -1397,6 +1413,8 @@
   ~
 #endif
 
+Subcase: reset of the copy history on one side
+``````````````````````````````````````````````
 
 Merge:
 - one with change to a file
@@ -1502,6 +1520,8 @@
   ~
 #endif
 
+Subcase: merging a change to a file with a "copy overwrite" to that file from another branch
+````````````````````````````````````````````````````````````````````````````````````````````
 
 Merge:
 - one with change to a file (d)
mercurial