[MERGE][1.0?] cherrypicking/rebasing section for User Guide

Aaron Bentley aaron.bentley at utoronto.ca
Thu Dec 13 21:36:53 GMT 2007


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

Ian Clatworthy wrote:
> Aaron Bentley wrote:
> My impression is that people like [rebase] for cleaning private branches
> before sharing them. Once shared though, the cat has bolted, right?

Right.  Rather like uncommit, only I think this effect of rebase is less
obvious.

There is an exception, which is the use of rebase to upgrade bzr-svn
branches to new versions of bzr-svn.  Since this operation is
deterministic, two people doing it independently should be able to
interoperate afterwards.

>> Also, performance was not a reason for not supporting cherry-picking as
>> far as I know.  I believe it's just that no one has gotten around to it.
> 
> Ah. It always seemed like it would imply O(history) operations. I'll
> remove that note altogether.

Cool.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHYaX10F+nu1YWqI0RAnZlAKCBX32uV6V/uAJNEqU3DpB91p/JMQCdGAm1
fbZrbDszS9RnrGojWIPhsA4=
=+nPA
-----END PGP SIGNATURE-----



More information about the bazaar mailing list