This is an archive of the discontinued Mercurial Phabricator instance.

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.

done locally. pull update the diff when done

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

			Path	Packages
M			tests/test-copies-chain-merge.t (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	20543		Mar 6 2020, 5:20 AM	★	★
Diff 2	20587		Mar 6 2020, 6:51 PM	★	★
Diff 3	20598	rHG68e14fecd82ab6bfb3283f1a56e14974816ecc76	Mar 6 2020, 5:02 AM	★	★

Commit	Parents	Author	Summary	Date
9b65d1c08679	62165f6c5a1a	Pierre-Yves David		Mar 6 2020, 5:02 AM

Status	Author	Revision
Closed	marmoute	D8258 copies-tests: remove spurious `]` in the template
Closed	marmoute	D8244 copies: fix the changeset based algorithm regarding merge
Abandoned	marmoute	D8243 copies: stop recording buggy file merge when new file overwrite an old one
Closed	marmoute	D8242 copies-tests: add a case where with merge with an overwritten files
Closed	marmoute	D8241 copies-tests: add a case where a file is deleted/added but with a merge
Closed	marmoute	D8240 copies-tests: add a test with a rename overwriting another file
Closed	marmoute	D8239 copies-tests: add a `h` to the root commit (for chain merge tests)
Closed	marmoute	D8257 copies-tests: remove the final summary
Closed	marmoute	D8238 copies-tests: clarify the description of the EA/AE cases
Closed	marmoute	D8237 copies-tests: update the analysis of the BD/DB cases
Closed	marmoute	D8247 copies-tests: swap two branch description

Diff 20587

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]

This is an archive of the discontinued Mercurial Phabricator instance.

copies-tests: swap two branch descriptionClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 20587

tests/test-copies-chain-merge.t

copies-tests: swap two branch description
ClosedPublic

Revision Contents
Changeset List