(fwd) bzr shelve feedback

[Matthieu Moy]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> Your bug report basically translates as "bzr unshelve isn't baz undo",
> and my answer to that is "Correct.  It's not."  Had you asked "What's
> the equivalent of baz undo?" on the list, you would have gotten a
> helpful answer.  Probably along the lines of "Revert, except that
> there's no redo command".

That's the key point. "bzr revert" is what brad is looking for.

> Complain if you like, but it's baz and tla that use the term incorrectly.

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.

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

> It's not the equivalent.  There is no exact equivalent.  Shelve is a
> fine-grained tool for separating text changes, and has an 'unshelve'
> equivalent.  Revert is a non-interactive command that reverses all
> changes, like permissions, renames and symlink changes, but does not
> provide an inverse operation.

Actually, it would be nice if "revert" had an "unrevert" (or probably
a better name) dual. I think it would make sense to unify the two
commands. Stg like:

bzr revert --interactive  => bzr shelve
bzr unrevert              => bzr unshelve

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).

-- 
Matthieu