Managing multiple maintenance branches

[Russel Winder]

On Wed, 2009-04-08 at 22:03 +0900, Stephen J. Turnbull wrote:
> Russel Winder writes:
> 
>  > Is there a document or documents somewhere providing idioms and guidance
>  > as to how best to manage multiple maintenance versions with Bazaar?
>  > merging changes from one maintenance branch to another is really rather
>  > easy with Git since all the branches are in one repository and gtik make
>  > cherry picking very easy. 
> 
> Doesn't "bzr merge --revision=this..that" and/or "bzr merge --change=that"
> DTRT?  (I'm not sure what "bzr merge --change" does, but it's listed as an
> option.)  Don't forget to "bzr commit" after merging.

Probably.  Unfortunately, last time I tried using revision ranges I got
into a terrible tiz as it is not entirely clear whether the range is
inclusive or exclusive at either or both ends -- and doubt leads to
fear. (Fear leads to anger. Anger leads to hate. Hate leads to
suffering.)  "bzr help revisionspec" doesn't help that much especially
when read alongside "bzr help merge".  I am sure these documentation say
everything very clearly but I managed to not interpret it correctly and
got a right mess.

I am not sure what the ordering is of options in the "bzr help merge"
output, but it certainly isn't alphabetic, nor even lexical.

I shall go try again and see if I can be competent.

Thanks.

-- 
Russel.
============================================================
Dr Russel Winder                 Partner

Concertant LLP          t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,     f: +44 8700 516 084    voip:  sip:russel.winder at ekiga.net
London SW11 1EN, UK.    m: +44 7770 465 077    xmpp: russel at russel.org.uk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090408/034fae0c/attachment.pgp