|
From: | Aaron Bentley |
Subject: | Re: [Gnu-arch-users] Mixing star-merge and selective replay |
Date: | Thu, 15 Apr 2004 15:57:12 -0400 |
User-agent: | Mozilla Thunderbird 0.5 (X11/20040309) |
Julian T. J. Midgley wrote:
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.
tla sync-tree proj--foo--0.1--patch-20 will add just the patchlog, so star-merge and replay --skip-present will never apply the patch. The effect is as if you replayed proj--foo--0.1--patch-20, then manually reversed all its changes.
Aaron -- Aaron Bentley Director of Technology Panometrics, Inc.
[Prev in Thread] | Current Thread | [Next in Thread] |