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

[Stefan Monnier]

> 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".

You should be able to do the following, at least:

branch-2:   merge up to patch-19
branch-2:   commit
branch-1:   star-merge branch-2
branch-2:   add the patch-20 log without the corresponding source changes
branch-2:   commit

Now a star-merge in branch-1 should not try to undo patch-20 and you can
then move forward and forget about patch-20.


        Stefan