"bzr update -r REVNO" wanted

Aaron Bentley aaron.bentley at utoronto.ca
Sun Jun 25 15:38:34 BST 2006


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

Robert Widhopf-Fenk wrote:
>> 'revert -r' will update the tree contents, but 'status'
>> and 'diff' will indicate changes relative to the last
>> revision, not to the revision you reverted to.
> 
> But, it is kind of different from what I want as it will
> revert all those changes in my local tree where "update -r"
> will give me a clean tree where I can do a bugfix,
> branch/shelve it and merge/update to head and unshelve it.

> What exactly is the use case for "revert -r"?

I generally use it to go back to old revisions to see how they behaved,
e.g. whether they exhibited a given bug, and then revert to the latest
revision before fixing it.  You can also do "revert -r -2; commit" as a
form of "uncommit" that prevents the changes from being reapplied later.

> For a moment I thought I could do a "revert -ra..b" to
> revert all changes from the revisions a to b, but it seems
> that it is only possible to revert changes from REVNO..HEAD.
> 
> To revert a..b I probably have to do
> 
>   bzr diff -ra..b | patch -R
> 
> which does not handle renames.

To do this, you can do "bzr merge . -r b..a"

> Nevertheless, it would be nice to have a bzr command to
> revert some older revisions not starting at head.

We haven't done any work on commands that make performing cherrypicks,
easy,  because the complementary functionality, recording cherrypicks
and doing merges when cherrypicks have happened, isn't complete.  We
don't want to lead people down the garden path and have them think bzr
will behave intelligently in the presence of cherrypicks.  You can do
them via "merge .", but it's the same effect as though you'd edited the
files manually.

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

iD8DBQFEnp/q0F+nu1YWqI0RAh3oAKCJ0ItRvaReWk7F5HOjyUq0kGiljwCfX4/q
HvOrJSYpncuJEexIJf1hZY4=
=YXBW
-----END PGP SIGNATURE-----




More information about the bazaar mailing list