Best way to cherrypick revisions?

[Andrew Cowie]

On Mon, 2009-06-01 at 10:32 +0200, Geoff Bache wrote:

> Is there any easy way to do this?

If you just do a merge but during the merge revert the stuff that's not
relevant to mainline, you'll indeed preserve history while only applying
the delta you care about.

Just be damn careful should you ever merge mainline back to that working
branch - in that case, you'll need to revert the removals that mainline
will try to do to your branch.

[Granted this is an extreme case and not really what we would do if bzr
actually did cherrypicking the way we're all looking forward to it doing
someday, but nevertheless this is a classic example of why it is so
important to review merges and why Bazaar exposes this explicitly]

AfC
Sydney

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090602/f955af08/attachment.pgp