revert/shelf/undo/redo

[Aaron Bentley]

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

Matthieu Moy wrote:
> One nice thing with "baz undo" is that it stores a changeset, not a
> snapshot. This means you can
> 
> $ baz undo
> $ <do something else>
> $ baz redo

With a snapshot, you can do that too.  The difference is that redo works
by doing a merge with the snapshot as OTHER and the snapshot's parent as
BASE.

That way, you get the changes that the snapshot introduced, but you
don't get conflicts if <do something else> intoduced some of the same
changes.

> You can also
> 
> $ cd /first/project
> $ baz undo
> $ cd /another/project
> $ baz redo /first/project/,,undo-1

Okay, that might take fancier footwork to pull off, because
/another/project may not have the snapshot base.  Though it would work
if you had centralized storage.

> There are probably cases where a full snapshot is better, but I think
> being able to use changeset is a real advantage.

Merging is usually as good as or better than applying a changeset.  As
good as for exact patching, better for inexact patching.  We have no
plans to do inexact patching with changesets.

 Another option is to
> store a snapshot and the revision id of the revision against which the
> "undo" was performed.

Right.

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

iD8DBQFDVj8I0F+nu1YWqI0RAna2AJ9KCl5FSOt+f8rziyFwsqtqS1yQqwCfVnM3
HxjF3GgV1G/LAY1AzKaFFwc=
=WUc/
-----END PGP SIGNATURE-----