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

Aaron Bentley aaron.bentley at utoronto.ca
Thu Dec 13 12:45:40 GMT 2007


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

Ian Clatworthy wrote:
> Here's the last bit of doc I'd like to see added for 1.0, time
> permitting and subject to review. I think we ought to be explaining in
> the User Guide how to do these things in Bazaar, given competitive
> system make a big deal of these features.

Rebasing is usually a bad idea.  We should not be encouraging it.
That's why I haven't added "rebase" to bzrtools.  Any discussion of
"rebase" should begin with "Why you shouldn't", which is

1. it breaks your ability to play well with others
2. and why are you using a dvcs if you don't want to play well with others?

I appreciate that there are circumstances where rebase makes sense, and
I'm not proposing we say nothing.  But I think that other communities'
casual use of it is a terrible, terrible idea.

Rather than "advanced merging", how about "pseudo-merging"?  Or
"history-losing operations"?

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.

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

iD8DBQFHYSl00F+nu1YWqI0RAtygAJ4gB+qqGWs59UtUewXmxBW8UM+tHACfWGMi
mNax7ypf35FQ2CsWYz2ogOg=
=H96a
-----END PGP SIGNATURE-----



More information about the bazaar mailing list