This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8239

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

Authored by marmoute on Mar 5 2020, 1:14 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG902b559202a6: copies-tests: add a `h` to the root commit (for chain merge tests)
Summary

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

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Mar 5 2020, 1:14 PM
marmoute updated this revision to Diff 20546.Mar 6 2020, 5:21 AM
martinvonz added a subscriber: martinvonz.Mar 6 2020, 1:14 PM
martinvonz added inline comments.
tests/test-copies-chain-merge.t
27

also update the commit message

marmoute marked an inline comment as done.Mar 6 2020, 5:51 PM
marmoute added a commit: rHG902b559202a6: copies-tests: add a `h` to the root commit (for chain merge tests).Mar 6 2020, 7:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG902b559202a6: copies-tests: add a `h` to the root commit (for chain merge tests) (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-chain-merge.t (3 lines)

Diff 20529

tests/test-copies-chain-merge.t

> logtemplate={rev} {desc}]\n > logtemplate={rev} {desc}]\n
> EOF > EOF
$ hg init repo-chain $ hg init repo-chain
$ cd repo-chain $ cd repo-chain
Add some linear rename initialy Add some linear rename initialy
$ touch a b $ touch a b h
$ hg ci -Am 'i-0 initial commit: a b' $ hg ci -Am 'i-0 initial commit: a b'
martinvonzUnsubmitted
Done

also update the commit message

martinvonz: also update the commit message
adding a adding a
adding b adding b
adding h
$ hg mv a c $ hg mv a c
$ hg ci -Am 'i-1: a -move-> c' $ hg ci -Am 'i-1: a -move-> c'
$ hg mv c d $ hg mv c d
$ hg ci -Am 'i-2: c -move-> d' $ hg ci -Am 'i-2: c -move-> d'
$ hg log -G $ hg log -G
@ 2 i-2: c -move-> d] @ 2 i-2: c -move-> d]
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c]