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

[Robert Collins]

On Wed, 2009-04-22 at 14:47 +0900, Stephen J. Turnbull wrote:
> 
>  > >  > bzr revision-info
> 
> The main thing is, can't we tag the right revision here, cheaply,
> without ever mentioning an explicit revid?  Schlepping around revids
> sucks, even in git or hg where you can usually abbreviate to 5 or 6
> random hex digits.  In bzr where the first 60 characters or so are
> generally going to refer to you and not the revision, this is
> unbearable.
> 
>  > >  > bzr pull trunk -overwrite
>  > >  > bzr merge . -r REVID
>  > >  > bzr revert --forget-merges
> 
> Minor point, "--forget-merges"?  That's not one that I would think of.

Yah, that name isn't that satisfactory. In fact you could use tags:

bzr tag -r my-merge
bzr pull trunk --overewrite
bzr merge . -r tag:my-merge
bzr revert --forget-merges

-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/20090422/c5e59d22/attachment.pgp