This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	SimonSapin	D9686 copies-rust: send PyBytes values back be dropped ino the parent thread
Closed	SimonSapin	D9685 copies-rust: introduce PyBytesWithData to reduce GIL requirement
Closed	SimonSapin	D9684 copies-rust: move CPU-heavy Rust processing into a child thread
Closed	SimonSapin	D9683 copies-rust: split up combine_changeset_copies function into a struct
Closed	SimonSapin	D9682 copies-rust: extract generic map merge logic from merge_copies_dict
Closed	marmoute	D9656 copies-rust: use imrs::OrdSet instead of imrs::HashSet
Closed	marmoute	D9655 copies-rust: use simpler overwrite when value on both side are identical
Closed	marmoute	D9654 copies-rust: make more use of the new comparison property
Closed	marmoute	D9653 copies-rust: implement PartialEqual manually
Closed	marmoute	D9652 copies-rust: record "overwritten" information from both side on delete
Closed	marmoute	D9651 copies-rust: refactor the "deletion" case
Closed	marmoute	D9650 copies-rust: process copy information of both parent at the same time
Closed	marmoute	D9649 copies-rust: yield both p1 and p2 copies in `ChangedFiles.actions()`
Closed	marmoute	D9648 copies-rust: extract the processing of a single copy information
Closed	marmoute	D9647 copies-rust: use matching to select the final copies information
Closed	marmoute	D9646 copies-rust: get the parents' copies earlier
Closed	marmoute	D9645 copies-rust: remove the ancestor Oracle logic
Closed	marmoute	D9644 copies-rust: track "overwrites" directly within CopySource
Closed	marmoute	D9643 copies-rust: add methods to build and update CopySource
Closed	marmoute	D9657 copies-rust: fix reverted argument when merging tiny minor or major
Closed	marmoute	D9642 copies-rust: rename TimeStampedPathCopy to CopySource
Closed	marmoute	D9641 copies-rust: rename TimeStampedPathCopies to InternalPathCopies
Closed	marmoute	D9613 copies: detect case when a merge decision overwrite previous data
Closed	marmoute	D9612 copies: rearrange all value comparison conditional
Closed	marmoute	D10059 test-copies: introduce merge chains test for the P/Q merges
Closed	marmoute	D10058 test-copies: add a case involving the `b` and a new `r` branch
Closed	marmoute	D10057 test-copies: introduce case combining the `p` and `q` branch
Closed	marmoute	D10056 test-copies: add a `q` branch similar to the `e` but on the new files
Closed	marmoute	D10055 test-copies: add a `p` branch similar to the `a` but on the new files
Closed	marmoute	D10054 test-copies: move the new files in the `i` branch
Closed	marmoute	D10053 test-copies: add 3 new files with their own content
Closed	marmoute	D10052 test-copies: introduce merge chaing test for the A/E + change tests
Closed	marmoute	D10051 test-copies: add a "change during merge" variant to the A+E test
Closed	marmoute	D10050 test-copies: filter out the linkrev part of `debugindex`
Closed	marmoute	D10049 test-copies: use "case-id" instead of revision number when listing sidedata
Closed	marmoute	D10048 test-copies: remove revision number from log
Closed	marmoute	D9611 test-copies: add test chaining multiple merge
Closed	marmoute	D9610 test-copies: add test chaining multiple merges
Closed	marmoute	D9609 test-copies: add test chaining multiple merges
Closed	marmoute	D10047 test-copies: add subcase titles for various "conflicting" information variant
Closed	marmoute	D10046 test-copies: improve description of the B+F case
Closed	marmoute	D10045 test-copies: improve description of the C+H case
Closed	marmoute	D10044 test-copies: improve description of the B+C "revert/restore" case
Closed	marmoute	D10043 test-copies: improve description of the G+C case
Closed	marmoute	D10042 test-copies: improve description of the G+F case
Closed	marmoute	D10041 test-copies: improve description of the D+G case
Closed	marmoute	D10040 test-copies: improve description of the A+E case
Closed	marmoute	D10039 test-copies: improve description of the B+D case
Closed	marmoute	D10038 test-copies: improve description of the B+C case
Closed	marmoute	D10037 test-copies: improve description of the A+B case
Closed	marmoute	D10036 test-copies: use intermediate variable some commit descriptions
Closed	marmoute	D10035 test-copies: don't use empty file for "same content" cases
Closed	marmoute	D9591 copies: rename value/other variable to minor/major for clarity
Closed	marmoute	D9590 copies: extract value comparison in the python copy tracing
Closed	marmoute	D9607 hghave: add some official category for known-bad and missing-good output
Closed	marmoute	D9608 copies: stop attempt to avoid extra dict copies around branching
Closed	marmoute	D9592 copies: deal with the "same revision" special case earlier
Closed	marmoute	D9589 copies-tests: update to null in test-copies-chain-merge.t
Closed	marmoute	D9588 copies-tests: add a summary of all cases created in test-copies-chain-merge.t
Closed	marmoute	D9587 test-copies: reinstall initial identical (empty) files for chained copied
Closed	marmoute	D9586 copies: explain the "arbitrary" copy source pick in case of conflict
Closed	marmoute	D9585 copies: properly match result during changeset centric copy tracing
Closed	marmoute	D9584 copies: avoid early return in _combine_changeset_copies
Closed	marmoute	D9499 copies-rust: record overwrite when merging
Closed	marmoute	D9498 copies-rust: make the comparison aware of the revision being current merged
Closed	marmoute	D9497 copies-rust: start recording overwrite as they happens
Closed	marmoute	D9496 copies-rust: rename Oracle.is_ancestor to Oracle.is_overwrite
Closed	marmoute	D9495 copies-rust: use the `entry` API for copy information too
Closed	marmoute	D9494 copies-rust: use the entry API to overwrite deleted entry
Closed	marmoute	D9493 copies-rust: tokenize all paths into integer
Closed	marmoute	D9492 copies-rust: pre-introduce a PathToken type and use it where applicable
Closed	marmoute	D9491 copies-rust: add smarter approach for merging small mapping with large mapping
Closed	marmoute	D9426 copies-rust: hide most of the comparison details inside a closure
Closed	marmoute	D9425 copies-rust: move the mapping merging into a else clause
Closed	marmoute	D9424 copies-rust: extract conflicting value comparison in its own function
Closed	marmoute	D9423 copies: no longer cache the ChangedFiles during copy tracing
Closed	marmoute	D9422 copies: iterate over children directly (instead of parents)
Closed	marmoute	D9581 copies: document the current algorithm step

Diff 25823

tests/test-copies-chain-merge.t

	Merge:			Merge:
	- one removing a file (d)			- one removing a file (d)
	- one updating that file			- one updating that file
	- the merge keep the modified version of the file (canceling the delete)			- the merge keep the modified version of the file (canceling the delete)

	In this case, the file keep on living after the merge. So we should not drop its			In this case, the file keep on living after the merge. So we should not drop its
	copy tracing chain.			copy tracing chain.

				$ case_desc="merge updated/deleted - revive the file (updated content)"

	$ hg up 'desc("c-1")'			$ hg up 'desc("c-1")'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved			1 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg merge 'desc("g-1")'			$ hg merge 'desc("g-1")'
	file 'd' was deleted in local [working copy] but was modified in other [merge rev].			file 'd' was deleted in local [working copy] but was modified in other [merge rev].
	You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.			You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg resolve -t :other d			$ hg resolve -t :other d
	(no more unresolved files)			(no more unresolved files)
	$ hg ci -m "mCGm-0"			$ hg ci -m "mCGm-0 $case_desc - one way"
	created new head			created new head

	$ hg up 'desc("g-1")'			$ hg up 'desc("g-1")'
	0 files updated, 0 files merged, 0 files removed, 0 files unresolved			0 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("c-1")'			$ hg merge 'desc("c-1")'
	file 'd' was deleted in other [merge rev] but was modified in local [working copy].			file 'd' was deleted in other [merge rev] but was modified in local [working copy].
	You can use (c)hanged version, (d)elete, or leave (u)nresolved.			You can use (c)hanged version, (d)elete, or leave (u)nresolved.
	What do you want to do? u			What do you want to do? u
	0 files updated, 0 files merged, 0 files removed, 1 files unresolved			0 files updated, 0 files merged, 0 files removed, 1 files unresolved
	use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon			use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
	[1]			[1]
	$ hg resolve -t :local d			$ hg resolve -t :local d
	(no more unresolved files)			(no more unresolved files)
	$ hg ci -m "mGCm-0"			$ hg ci -m "mGCm-0 $case_desc - the other way"
	created new head			created new head

	$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'			$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
	@ 31 mGCm-0			@ 31 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
	\|\			\|\
	+---o 30 mCGm-0			+---o 30 mCGm-0 merge updated/deleted - revive the file (updated content) - one way
	\| \|/			\| \|/
	\| o 25 g-1: update d			\| o 25 g-1: update d
	\| \|			\| \|
	o \| 6 c-1 delete d			o \| 6 c-1 delete d
	\|/			\|/
	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
	mBC-revert-m-0			mBC-revert-m-0
	mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way			mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
	mBCm-1 re-add d			mBCm-1 re-add d
	mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way			mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
	mBFm-0 simple merge - one way			mBFm-0 simple merge - one way
	mCB-revert-m-0			mCB-revert-m-0
	mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way			mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
	mCBm-1 re-add d			mCBm-1 re-add d
	mCGm-0			mCGm-0 merge updated/deleted - revive the file (updated content) - one way
	mCH-delete-before-conflict-m-0			mCH-delete-before-conflict-m-0
	mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way			mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
	mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way			mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
	mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way			mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
	mFBm-0 simple merge - the other way			mFBm-0 simple merge - the other way
	mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way			mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
	mGCm-0			mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
	mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way			mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
	mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way			mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
	mHC-delete-before-conflict-m-0			mHC-delete-before-conflict-m-0


	Test that sidedata computations during upgrades are correct			Test that sidedata computations during upgrades are correct
	===========================================================			===========================================================

	- one removing a file (d)			- one removing a file (d)
	- one updating that file			- one updating that file
	- the merge keep the modified version of the file (canceling the delete)			- the merge keep the modified version of the file (canceling the delete)

	In this case, the file keep on living after the merge. So we should not drop its			In this case, the file keep on living after the merge. So we should not drop its
	copy tracing chain.			copy tracing chain.

	$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'			$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
	o 31 mGCm-0			o 31 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
	\|\			\|\
	+---o 30 mCGm-0			+---o 30 mCGm-0 merge updated/deleted - revive the file (updated content) - one way
	\| \|/			\| \|/
	\| o 25 g-1: update d			\| o 25 g-1: update d
	\| \|			\| \|
	o \| 6 c-1 delete d			o \| 6 c-1 delete d
	\|/			\|/
	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

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25716		Feb 22 2021, 9:34 AM	★	★
Diff 2	25823	rHGa347c672faf2c63a484f525768ab2fe2d91b8c63	Feb 15 2021, 11:54 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

test-copies: improve description of the G+C caseClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 25823

tests/test-copies-chain-merge.t

test-copies: improve description of the G+C case
ClosedPublic

Revision Contents
Changeset List