This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12150

merge: fix documented order of `labels` argument
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Download Raw Diff

Tags

None

Subscribers

mercurial-patches

Details

Reviewers

Group Reviewers

Commits

rHGaf9f2c64302e: merge: fix documented order of `labels` argument

Diff Detail

Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 8 2022, 4:26 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 8 2022, 4:26 PM

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

martinvonz added a child revision: D12151: simplemerge: remove now-unused arguments.Feb 8 2022, 4:26 PM

martinvonz removed a parent revision: D12149: filemerge: when not keeping premerge, don't write markers to context.Feb 10 2022, 9:54 PM

martinvonz removed a child revision: D12151: simplemerge: remove now-unused arguments.

martinvonz added a parent revision: D12149: filemerge: when not keeping premerge, don't write markers to context.Feb 10 2022, 9:55 PM

martinvonz added a child revision: D12151: simplemerge: remove now-unused arguments.

Alphare accepted this revision.Feb 14 2022, 5:50 AM

This revision is now accepted and ready to land.Feb 14 2022, 5:50 AM

martinvonz added a commit: rHGaf9f2c64302e: merge: fix documented order of `labels` argument.Feb 15 2022, 7:56 AM

Closed by commit rHGaf9f2c64302e: merge: fix documented order of `labels` argument (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/merge.py (2 lines)

Diff 32194

mercurial/merge.py

	branchmerge = whether to merge between branches			branchmerge = whether to merge between branches
	force = whether to force branch merging or file overwriting			force = whether to force branch merging or file overwriting
	matcher = a matcher to filter file lists (dirstate not updated)			matcher = a matcher to filter file lists (dirstate not updated)
	mergeancestor = whether it is merging with an ancestor. If true,			mergeancestor = whether it is merging with an ancestor. If true,
	we should accept the incoming changes for any prompts that occur.			we should accept the incoming changes for any prompts that occur.
	If false, merging with an ancestor (fast-forward) is only allowed			If false, merging with an ancestor (fast-forward) is only allowed
	between different named branches. This flag is used by rebase extension			between different named branches. This flag is used by rebase extension
	as a temporary fix and should be avoided in general.			as a temporary fix and should be avoided in general.
	labels = labels to use for base, local and other			labels = labels to use for local, other, and base
	mergeforce = whether the merge was run with 'merge --force' (deprecated): if			mergeforce = whether the merge was run with 'merge --force' (deprecated): if
	this is True, then 'force' should be True as well.			this is True, then 'force' should be True as well.

	The table below shows all the behaviors of the update command given the			The table below shows all the behaviors of the update command given the
	-c/--check and -C/--clean or no options, whether the working directory is			-c/--check and -C/--clean or no options, whether the working directory is
	dirty, whether a revision is specified, and the relationship of the parent			dirty, whether a revision is specified, and the relationship of the parent
	rev to the target rev (linear or not). Match from top first. The -n			rev to the target rev (linear or not). Match from top first. The -n
	option doesn't exist on the command line, but represents the			option doesn't exist on the command line, but represents the