History editing (Was: Will re-basing support be added into Bazaar core?)

[Robert Collins]

On Tue, 2009-04-21 at 12:25 +0900, Stephen J. Turnbull wrote:
> Robert Collins writes:
> 
>  > bzr revision-info
>  > bzr pull trunk -overwrite
>  > bzr merge . -r REVID
>  > bzr revert --forget-merges
>  > commit and send
> 
> Yikes!  Even git-thinkers will be hard put to figure that out for
> themselves!
> 
> I'm rapidly coming around to the view that bzr is capable of doing
> pretty much anything git can, but that y'all are deliberately hiding
> that fact and imposing unnecessary performance costs (like making a
> full heavyweight branch instead of doing the above) on users.

Well, this is why I say that we need to do the same sort of analysis on
the ui surrounding multiple branches, heads, working areas, collections
of branches and the like, that we did for the development6 format.

There's a clear performance cost related to moving history around, and
its currently the default way that people have to interact with bzr -
but its not the best.

colocated branches, bzr make-working-area plugins, even my proposal to
alter 'bzr branch' are attempts to address the surface issues, but it
goes a tad deeper than that.

I will say that I don't think git has it right, but have to acknowledge
that it does better than bzr's default for dealing with multiple heads.

-Rob
-------------- 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/20090421/3de24a05/attachment.pgp