This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8247

copies-tests: swap two branch description
ClosedPublic

Authored by marmoute on Mar 6 2020, 5:20 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG68e14fecd82a: copies-tests: swap two branch description
Summary

They were swapped and now match their intended block.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Mar 6 2020, 5:20 AM
martinvonz added a subscriber: martinvonz.Mar 6 2020, 11:05 AM
martinvonz added inline comments.
tests/test-copies-chain-merge.t
42

nit: lower-case "having" :P

marmoute added inline comments.Mar 6 2020, 11:07 AM
tests/test-copies-chain-merge.t
42

can you fix this inflight?

martinvonz added inline comments.Mar 6 2020, 11:15 AM
tests/test-copies-chain-merge.t
42

Unless I have other comments on the series, sure. I'm not done reviewing yet.

marmoute added inline comments.Mar 6 2020, 11:20 AM
tests/test-copies-chain-merge.t
42

This is the first patch of the series, so I don't expect anything to block it ;-)

martinvonz added inline comments.Mar 6 2020, 11:26 AM
tests/test-copies-chain-merge.t
42

Sure, but if I have comments on other patches in the series, it seems fair that you address this one as well instead of leaving that to the reviewer.

marmoute marked 2 inline comments as done.Mar 6 2020, 5:38 PM

done locally. pull update the diff when done

marmoute retitled this revision from test-copies: swap two branch description to copies-tests: swap two branch description.Mar 6 2020, 6:51 PM
marmoute updated this revision to Diff 20587.

series update after Martin feedback

marmoute added a commit: rHG68e14fecd82a: copies-tests: swap two branch description.Mar 6 2020, 7:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG68e14fecd82a: copies-tests: swap two branch description (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 (4 lines)

Diff 20598

tests/test-copies-chain-merge.t

$ 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]
| |
o 0 i-0 initial commit: a b] o 0 i-0 initial commit: a b]
Have a branching with nothing on one side And having another branch with renames on the other side
martinvonzUnsubmitted
Not Done

nit: lower-case "having" :P

martinvonz: nit: lower-case "having" :P
marmouteAuthorUnsubmitted
Done

can you fix this inflight?

marmoute: can you fix this inflight?
martinvonzUnsubmitted
Done

Unless I have other comments on the series, sure. I'm not done reviewing yet.

martinvonz: Unless I have other comments on the series, sure. I'm not done reviewing yet.
marmouteAuthorUnsubmitted
Done

This is the first patch of the series, so I don't expect anything to block it ;-)

marmoute: This is the first patch of the series, so I don't expect anything to block it ;-)
martinvonzUnsubmitted
Done

Sure, but if I have comments on other patches in the series, it seems fair that you address this one as well instead of leaving that to the reviewer.

martinvonz: Sure, but if I have comments on other patches in the series, it seems fair that you address…
$ hg mv d e $ hg mv d e
$ hg ci -Am 'a-1: d -move-> e' $ hg ci -Am 'a-1: d -move-> e'
$ hg mv e f $ hg mv e f
$ hg ci -Am 'a-2: e -move-> f' $ hg ci -Am 'a-2: e -move-> f'
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ 4 a-2: e -move-> f] @ 4 a-2: e -move-> f]
| |
o 3 a-1: d -move-> e] o 3 a-1: d -move-> e]
| |
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d]
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c]
| |
o 0 i-0 initial commit: a b] o 0 i-0 initial commit: a b]
And Having another branch with renames on the other side Have a branching with nothing on one side
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo foo > b $ echo foo > b
$ hg ci -m 'b-1: b update' $ hg ci -m 'b-1: b update'
created new head created new head
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ 5 b-1: b update] @ 5 b-1: b update]