Patchwork D8239: copies-tests: add a `h` to the root commit (for chain merge tests)

login
register
mail settings
Submitter phabricator
Date March 6, 2020, 11:51 p.m.
Message ID <f8b02b9fffedbb1a9efc0fb92b384d56@localhost.localdomain>
Download mbox | patch
Permalink /patch/45593/
State Not Applicable
Headers show

Comments

phabricator - March 6, 2020, 11:51 p.m.
marmoute added a comment.
marmoute updated this revision to Diff 20591.


  series update after Martin feedback

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8239?vs=20546&id=20591

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8239/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8239

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

CHANGE DETAILS




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

Patch

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
@@ -23,10 +23,11 @@ 
 
 Add some linear rename initialy
 
-  $ touch a b
-  $ hg ci -Am 'i-0 initial commit: a b'
+  $ touch a b h
+  $ hg ci -Am 'i-0 initial commit: a b h'
   adding a
   adding b
+  adding h
   $ hg mv a c
   $ hg ci -Am 'i-1: a -move-> c'
   $ hg mv c d
@@ -36,7 +37,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 And having another branch with renames on the other side
@@ -54,7 +55,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 Have a branching with nothing on one side
@@ -71,7 +72,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 
@@ -107,7 +108,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 Create a branch that delete a file previous renamed
@@ -124,7 +125,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 Merge:
@@ -168,7 +169,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 Create a branch that delete a file previous renamed and recreate it
@@ -190,7 +191,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 Merge:
@@ -232,7 +233,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 Having another branch renaming a different file to the same filename as another
@@ -253,7 +254,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 Merge:
@@ -290,7 +291,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 Note:
@@ -459,7 +460,7 @@ 
   |
   o  1 i-1: a -move-> c]
   |
-  o  0 i-0 initial commit: a b]
+  o  0 i-0 initial commit: a b h]
   
 
 This `hg log` output is correct