This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10036

test-copies: use intermediate variable some commit descriptions
ClosedPublic

Authored by marmoute on Feb 22 2021, 9:33 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHGc9f502721783: test-copies: use intermediate variable some commit descriptions
rHG1ee1a117ae2a: test-copies: use intermediate variable some commit descriptions

Summary

Right now, everything mostly says "simple merge", we want to use something a bit
more descriptive. Before doing any changes, we do most of the churn. This helps
the next sets of changesets to be clearer.

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Feb 22 2021, 9:33 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 22 2021, 9:33 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D10037: test-copies: improve description of the A+B case.Feb 22 2021, 9:33 AM

Alphare accepted this revision.Feb 22 2021, 10:30 AM

marmoute added a commit: rHG1ee1a117ae2a: test-copies: use intermediate variable some commit descriptions.Feb 24 2021, 10:54 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG1ee1a117ae2a: test-copies: use intermediate variable some commit descriptions (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

marmoute added a commit: rHGc9f502721783: test-copies: use intermediate variable some commit descriptions.Feb 24 2021, 12:10 PM

Revision Contents
Changeset List

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

Commit	Parents	Author	Summary	Date
ef4aa6ebe758	8bcc8aea2316	Pierre-Yves David		Feb 15 2021, 11:19 PM

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 25709

tests/test-copies-chain-merge.t

	information.			information.

	merging with unrelated change does not interfere with the renames			merging with unrelated change does not interfere with the renames
	---------------------------------------------------------------			---------------------------------------------------------------

	- rename on one side			- rename on one side
	- unrelated change on the other side			- unrelated change on the other side

				$ case_desc="simple merge"

	$ hg up 'desc("b-1")'			$ hg up 'desc("b-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("a-2")'			$ hg merge 'desc("a-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
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mBAm-0 simple merge - one way'			$ hg ci -m "mBAm-0 $case_desc - one way"
	$ hg up 'desc("a-2")'			$ hg up 'desc("a-2")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("b-1")'			$ hg merge 'desc("b-1")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mABm-0 simple merge - the other way'			$ hg ci -m "mABm-0 $case_desc - the other way"
	created new head			created new head
	$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'			$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
	@ 12 mABm-0 simple merge - the other way			@ 12 mABm-0 simple merge - the other way
	\|\			\|\
	+---o 11 mBAm-0 simple merge - one way			+---o 11 mBAm-0 simple merge - one way
	\| \|/			\| \|/
	\| o 5 b-1: b update			\| o 5 b-1: b update
	\| \|			\| \|
	merging with the side having a delete			merging with the side having a delete
	-------------------------------------			-------------------------------------

	case summary:			case summary:
	- one with change to an unrelated file			- one with change to an unrelated file
	- one deleting the change			- one deleting the change
	and recreate an unrelated file after the merge			and recreate an unrelated file after the merge

				$ case_desc="simple merge"

	$ hg up 'desc("b-1")'			$ hg up 'desc("b-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("c-1")'			$ hg merge 'desc("c-1")'
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved			0 files updated, 0 files merged, 1 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mBCm-0 simple merge - one way'			$ hg ci -m "mBCm-0 $case_desc - one way"
	$ echo bar > d			$ echo bar > d
	$ hg add d			$ hg add d
	$ hg ci -m 'mBCm-1 re-add d'			$ hg ci -m 'mBCm-1 re-add d'
	$ 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("b-1")'			$ hg merge 'desc("b-1")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mCBm-0 simple merge - the other way'			$ hg ci -m "mCBm-0 $case_desc - the other way"
	created new head			created new head
	$ echo bar > d			$ echo bar > d
	$ hg add d			$ hg add d
	$ hg ci -m 'mCBm-1 re-add d'			$ hg ci -m 'mCBm-1 re-add d'
	$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'			$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
	@ 16 mCBm-1 re-add d			@ 16 mCBm-1 re-add d
	\|			\|
	o 15 mCBm-0 simple merge - the other way			o 15 mCBm-0 simple merge - the other way

	Comparing with a merge re-adding the file afterward			Comparing with a merge re-adding the file afterward
	---------------------------------------------------			---------------------------------------------------

	Merge:			Merge:
	- one with change to an unrelated file			- one with change to an unrelated file
	- one deleting and recreating the change			- one deleting and recreating the change

				$ case_desc="simple merge"

	$ hg up 'desc("b-1")'			$ hg up 'desc("b-1")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("d-2")'			$ hg merge 'desc("d-2")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mBDm-0 simple merge - one way'			$ hg ci -m "mBDm-0 $case_desc - one way"
	$ hg up 'desc("d-2")'			$ hg up 'desc("d-2")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("b-1")'			$ hg merge 'desc("b-1")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mDBm-0 simple merge - the other way'			$ hg ci -m "mDBm-0 $case_desc - the other way"
	created new head			created new head
	$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'			$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
	@ 18 mDBm-0 simple merge - the other way			@ 18 mDBm-0 simple merge - the other way
	\|\			\|\
	+---o 17 mBDm-0 simple merge - one way			+---o 17 mBDm-0 simple merge - one way
	\| \|/			\| \|/
	\| o 8 d-2 re-add d			\| o 8 d-2 re-add d
	\| \|			\| \|


	Comparing with a merge with colliding rename			Comparing with a merge with colliding rename
	--------------------------------------------			--------------------------------------------

	- the "e-" branch renaming b to f (through 'g')			- the "e-" branch renaming b to f (through 'g')
	- the "a-" branch renaming d to f (through e)			- the "a-" branch renaming d to f (through e)

				$ case_desc="simple merge"

	$ hg up 'desc("a-2")'			$ hg up 'desc("a-2")'
	2 files updated, 0 files merged, 1 files removed, 0 files unresolved			2 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg merge 'desc("e-2")'			$ hg merge 'desc("e-2")'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)			1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)			0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mAEm-0 simple merge - one way'			$ hg ci -m "mAEm-0 $case_desc - one way"
	$ hg up 'desc("e-2")'			$ hg up 'desc("e-2")'
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)			2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
	$ hg merge 'desc("a-2")'			$ hg merge 'desc("a-2")'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)			1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)			0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mEAm-0 simple merge - the other way'			$ hg ci -m "mEAm-0 $case_desc - the other way"
	created new head			created new head
	$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'			$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
	@ 20 mEAm-0 simple merge - the other way			@ 20 mEAm-0 simple merge - the other way
	\|\			\|\
	+---o 19 mAEm-0 simple merge - one way			+---o 19 mAEm-0 simple merge - one way
	\| \|/			\| \|/
	\| o 10 e-2 g -move-> f			\| o 10 e-2 g -move-> f
	\| \|			\| \|
	o 0 i-0 initial commit: a b h			o 0 i-0 initial commit: a b h



	Merge:			Merge:
	- one with change to an unrelated file (b)			- one with change to an unrelated file (b)
	- one overwriting a file (d) with a rename (from h to i to d)			- one overwriting a file (d) with a rename (from h to i to d)

				$ case_desc="simple merge"

	$ hg up 'desc("i-2")'			$ hg up 'desc("i-2")'
	2 files updated, 0 files merged, 1 files removed, 0 files unresolved			2 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ hg mv h i			$ hg mv h i
	$ hg commit -m "f-1: rename h -> i"			$ hg commit -m "f-1: rename h -> i"
	created new head			created new head
	$ hg mv --force i d			$ hg mv --force i d
	$ hg commit -m "f-2: rename i -> d"			$ hg commit -m "f-2: rename i -> d"
	$ hg debugindex d			$ hg debugindex d
	rev linkrev nodeid p1 p2			rev linkrev nodeid p1 p2
	0 2 319179230cc8 000000000000 000000000000 (no-changeset !)			0 2 319179230cc8 000000000000 000000000000 (no-changeset !)
	0 2 56647659eff0 000000000000 000000000000 (changeset !)			0 2 56647659eff0 000000000000 000000000000 (changeset !)
	1 8 b004912a8510 000000000000 000000000000			1 8 b004912a8510 000000000000 000000000000
	2 22 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)			2 22 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)
	$ hg up 'desc("b-1")'			$ hg up 'desc("b-1")'
	3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)			3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)			2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
	$ hg merge 'desc("f-2")'			$ hg merge 'desc("f-2")'
	1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)			1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)			0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mBFm-0 simple merge - one way'			$ hg ci -m "mBFm-0 $case_desc - one way"
	$ hg up 'desc("f-2")'			$ hg up 'desc("f-2")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("b-1")'			$ hg merge 'desc("b-1")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mFBm-0 simple merge - the other way'			$ hg ci -m "mFBm-0 $case_desc - the other way"
	created new head			created new head
	$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'			$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
	@ 24 mFBm-0 simple merge - the other way			@ 24 mFBm-0 simple merge - the other way
	\|\			\|\
	+---o 23 mBFm-0 simple merge - one way			+---o 23 mBFm-0 simple merge - one way
	\| \|/			\| \|/
	\| o 22 f-2: rename i -> d			\| o 22 f-2: rename i -> d
	\| \|			\| \|

	Merge:			Merge:
	- one with change to a file			- one with change to a file
	- one deleting and recreating the file			- one deleting and recreating the file

	Unlike in the 'BD/DB' cases, an actual merge happened here. So we should			Unlike in the 'BD/DB' cases, an actual merge happened here. So we should
	consider history and rename on both branch of the merge.			consider history and rename on both branch of the merge.

				$ case_desc="simple merge"

	$ hg up 'desc("i-2")'			$ hg up 'desc("i-2")'
	3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)			3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)			2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
	$ echo "some update" >> d			$ echo "some update" >> d
	$ hg commit -m "g-1: update d"			$ hg commit -m "g-1: update d"
	created new head			created new head
	$ hg up 'desc("d-2")'			$ hg up 'desc("d-2")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("g-1")' --tool :union			$ hg merge 'desc("g-1")' --tool :union
	merging d			merging d
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mDGm-0 simple merge - one way'			$ hg ci -m "mDGm-0 $case_desc - one way"
	$ hg up 'desc("g-1")'			$ hg up 'desc("g-1")'
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	$ hg merge 'desc("d-2")' --tool :union			$ hg merge 'desc("d-2")' --tool :union
	merging d			merging d
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved			1 files updated, 0 files merged, 0 files removed, 0 files unresolved
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mGDm-0 simple merge - the other way'			$ hg ci -m "mGDm-0 $case_desc - the other way"
	created new head			created new head
	$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'			$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
	@ 27 mGDm-0 simple merge - the other way			@ 27 mGDm-0 simple merge - the other way
	\|\			\|\
	+---o 26 mDGm-0 simple merge - one way			+---o 26 mDGm-0 simple merge - one way
	\| \|/			\| \|/
	\| o 25 g-1: update d			\| o 25 g-1: update d
	\| \|			\| \|
	history are relevant.			history are relevant.

	Note:			Note:
	\| In this case, the merge get conflicting information since on one side we have			\| In this case, the merge get conflicting information since on one side we have
	\| "a -> c -> d". and one the other one we have "h -> i -> d".			\| "a -> c -> d". and one the other one we have "h -> i -> d".
	\|			\|
	\| The current code arbitrarily pick one side			\| The current code arbitrarily pick one side

				$ case_desc="simple merge"

	$ hg up 'desc("f-2")'			$ hg up 'desc("f-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
	$ hg merge 'desc("g-1")' --tool :union			$ hg merge 'desc("g-1")' --tool :union
	merging d (no-changeset !)			merging d (no-changeset !)
	0 files updated, 1 files merged, 0 files removed, 0 files unresolved (no-changeset !)			0 files updated, 1 files merged, 0 files removed, 0 files unresolved (no-changeset !)
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mFGm-0 simple merge - one way'			$ hg ci -m "mFGm-0 $case_desc - one way"
	created new head			created new head
	$ hg up 'desc("g-1")'			$ hg up 'desc("g-1")'
	2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)			2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
	1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)			1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
	$ hg merge 'desc("f-2")' --tool :union			$ hg merge 'desc("f-2")' --tool :union
	merging d (no-changeset !)			merging d (no-changeset !)
	0 files updated, 1 files merged, 1 files removed, 0 files unresolved (no-changeset !)			0 files updated, 1 files merged, 1 files removed, 0 files unresolved (no-changeset !)
	0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)			0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
	(branch merge, don't forget to commit)			(branch merge, don't forget to commit)
	$ hg ci -m 'mGFm-0 simple merge - the other way'			$ hg ci -m "mGFm-0 $case_desc - the other way"
	created new head			created new head
	$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'			$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
	@ 29 mGFm-0 simple merge - the other way			@ 29 mGFm-0 simple merge - the other way
	\|\			\|\
	+---o 28 mFGm-0 simple merge - one way			+---o 28 mFGm-0 simple merge - one way
	\| \|/			\| \|/
	\| o 25 g-1: update d			\| o 25 g-1: update d
	\| \|			\| \|

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25709		Feb 22 2021, 9:33 AM	★	★
Diff 2	25815	rHG1ee1a117ae2a0a9eb6ad1028d85b765e1de44231	Feb 15 2021, 11:19 PM	★	★