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

[James Westby]

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

So you would prefer that this was one command? (at least up to the
commit and send part)

I think that would be possible, but making every operation that someone
may want to do a single command, or and option to and existing command
is probably not going to lead to a good UI. Emphasise the common
operations in the UI, and make the uncommon ones possible.

In this case, I don't think "merge --squash" would be bad, but I'm
not going to implement it myself.

Thanks,

James