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

login
register
mail settings
Submitter phabricator
Date March 5, 2020, 6:14 p.m.
Message ID <differential-rev-PHID-DREV-btdq34jyfvidyyjvc5h3-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45522/
State Superseded
Headers show

Comments

phabricator - March 5, 2020, 6:14 p.m.
marmoute created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This will be useful for incoming new test cases. We need a new file to rename
  around.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-devel
phabricator - March 6, 2020, 6:14 p.m.
martinvonz added inline comments.

INLINE COMMENTS

> test-copies-chain-merge.t:27
> +  $ touch a b h
>    $ hg ci -Am 'i-0 initial commit: a b'
>    adding a

also update the commit message

REPOSITORY
  rHG Mercurial

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

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

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
+  $ touch a b h
   $ hg ci -Am 'i-0 initial commit: a b'
   adding a
   adding b
+  adding h
   $ hg mv a c
   $ hg ci -Am 'i-1: a -move-> c'
   $ hg mv c d