Re: [Gnu-arch-users] Re: Mixing star-merge and selective replay

[Aaron Bentley]

Julian T. J. Midgley wrote:
> In article <address@hidden>,
> Stefan Monnier  <address@hidden> wrote:
>
> > > So it turns out that there isn't a solution to the original problem -
> > > you can't mix selective replays (the effect of which is to omit
> > > certain patches) and star-merge.
> >
> > Well, of course you can.  The problem you're having has to do with using
> > star-merge between two branches *in both directions*.  And if you think
> > about it, it doesn't have to do with star-merge as much as with the notion
> > of "propagate all changes from either branch to the other".

> The problem (which is not a problem with star-merge itself) is that
> star merge /calculates/ a patch to apply, rather than just picking
> missing patches:

You're both right. The nature of star-merge is that it copies all 
changes.  If you don't want that, you don't want star-merge.

Aaron

--
Aaron Bentley
Director of Technology
Panometrics, Inc.