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

[Neil Stevens]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thursday April 15, 2004 12:31 pm, Julian T. J. Midgley wrote:
> 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)?

replay up to patch-21, replay patch-20 in reverse, then sync-tree back to 
21.

- -- 
Neil Stevens - address@hidden

"It's snowing, it's snowing! God, I hate this weather."
    They Might Be Giants, __New York City__
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFAfumZf7mnligQOmERArCQAKCZfIT/9z/vb8AEmbYZmY6nHwE07wCfZp2l
cUXBbGvbquEuWXCCFWu0Q+o=
=14cY
-----END PGP SIGNATURE-----