[PATCH] transplant: permit merge changesets via --force/-f

[Brendan Cully]

On Friday, 30 March 2012 at 11:36, Steven Stallion wrote:
> On Fri, Mar 30, 2012 at 11:22 AM, Matt Mackall <mpm at selenic.com> wrote:
> >> Hey All,
> >>
> >> Any movement on this? Should I consider Pierre-Yves comments a rejection?
> >
> > I've poked the transplant maintainer to chime in. I'm about +0 on this
> > idea.
> 
> Understandable. All I can say in my defense is we've maintained a
> variant of this patch for the last couple of years and it would nice
> to avoid re-patching on every update.

Hi,

Two comments:

1. A minor point, but I'd rather not burn -f on this option. I could
imagine having other things be forced. Maybe --transplant-merges or
something.

2. More seriously, this seems to require either special care or luck
to work, since as far as I can tell it just applies the diff between
the merge and its first parent, where there's nothing to ensure that
the branch you're transplanting onto is similar to the first parent
instead of the second. It seems like there ought to be some kind of
control over which parent is used, but I don't know exactly what it
should look like. Have you thought about this problem?