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

[Julian T. J. Midgley]

Suppose you have two branches - proj--foo and proj--bar.  Simultaneous
development occurs on both branches, and merges will occur in either
direction between them at various points in the project.

Is there a way to avoid taking a particular patch from one
branch to the other, whilst still permitting the branches to be synced
with one another using star-merge?

Suppose, for example, that proj--foo--0.1--patch-20 relates to
something that will never be required on proj--bar.

In proj--bar, I could naively replay (and commit) just
proj--foo--0.1--patch-21 (and later patches, as required).  But if I
then star-merge from proj--bar back into proj-foo, patch-20 will be
removed from proj-foo.

Is there any solution to this problem (or at the very least, the
special case of it in which none of the later patches on the foo
branch are dependent on patch-20)?

Julian





-- 
Julian T. J. Midgley                       http://www.xenoclast.org/
Cambridge, England.
PGP: BCC7863F FP: 52D9 1750 5721 7E58 C9E1  A7D5 3027 2F2E BCC7 863F