[PATCH] Limit merge to the current named branch

Adrian Buehlmann adrian at cadifra.com
Fri Jun 6 13:22:00 CDT 2008

On 06.06.2008 01:40, Petersen, Allen wrote:
> # HG changeset patch
> # User Allen Petersen <allen.petersen at hstx.com> # Date 1212634241 -43200
> # Node ID 4cde10836cf097dae7c5397a68ad77a6ba3c72bd
> # Parent  d6caebe9c293094e578eb9f5494cc7d711f34293
> Limit merge to the current named branch.
> Adding a feature to limit the scope of a merge to the current named
> branch.  This new behavior is activated only if the
> 'single-branch-merge' option is set to True in the [ui] section of the
> hgrc. The behavior can also be overridden with an '-a' option on the
> command line.

On second thought, the idea of this patch seems not to be that bad.
Dirkjan showed some interest on IRC on this.

I'm just not sure if that -a option is really needed though, as
I think "hg merge -r other-branch" and "hg merge -r id" should
always work.

Other than that:
* The patch has line-wrapping issues (and is thus unusable). Please resend.
* Did you run the testsuite? (see ContributingChanges on the wiki
  for a checklist). A few new tests would probably be needed, too.

(as an unrelated side note, my merge -n patch - which also wants to
patch hg merge - has no comments received yet so far)

More information about the Mercurial-devel mailing list