(fwd) bzr shelve feedback

[Aaron Bentley]

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

Matthieu Moy wrote:
> Aaron Bentley <aaron.bentley at utoronto.ca> writes:
> Since "bzr" is "Bazaar 2", it would make sense to have an undo command
> that would either be an alias for "revert" or a command printing eg
> "There is no undo command in bzr. See \"revert\"." and exiting.

I'd prefer the second one, just so that we have the option of a real
undo later.

> That's a stupid detail but that would reduce the migration effort.

A "Bzr for Baz users" document would probably be useful, too.

> Actually, it would be nice if "revert" had an "unrevert" (or probably
> a better name) dual.

Oh, certainly.  And that might also allow us to get rid of those backup
files that revert leaves behind.

> I think it would make sense to unify the two
> commands. Stg like:
> 
> bzr revert --interactive  => bzr shelve
> bzr unrevert              => bzr unshelve

Yeah, could be.

> I suppose the best way to do this is to store the diff with the
> last-commited revision (let's call it A) in a changeset (for revert),
> and to do a 3-way merge (working copy, A, A+changeset) (for unrevert).

Actually, Robert has pointed out that we don't actually need changesets
to do this, just a way to store tree snapshots.

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

iD8DBQFDhgyB0F+nu1YWqI0RArAfAJ4o0NfgeZ7BK3jhV6s6bqfQ4SXr/QCeNimO
Qu6uzXgnXAjQyrb+NXSucnI=
=lfoX
-----END PGP SIGNATURE-----