[Bug 4741] bzr shelve is confusing to me

[Jan Hudec]

On Thu, Nov 24, 2005 at 21:05:24 +0100, Matthieu Moy wrote:
> Brad Bollenbach <brad.bollenbach at gmail.com> writes:
> 
> > A common use case for undo/redo, IME, is waking up in the morning,
> > undo'ing changes I've made on a branch, synching down the latest
> > version of HEAD, and then redo'ing my changes back onto the branch to
> > make sure I'm synched up and the conflict pain is kept to a minimum.
> 
> With tla/baz, this is what "update" does. Unfortunately, if you get
> important conflicts while redoing your changes, you don't have an easy
> way to restore them.

If shelves were actually special revisions, you would have...

> [...]
> > +1 to unifying the commands. This syntax seems reasonable to my naive
> > eyes, but calling it "undo"/"redo" would be a little more human, IMHO
> 
> I believe this would be more Arch-ish, but not necessarily more human.
> "undo" usually means "undo the last thing I've done". I believe
> "revert" is the correct wording to say "revert the changes I've done
> since last commit".

Well, undo is really ambiguous, as in context of version control system it
can mean 'undo the *editing* I've done on the tree' or 'undo the last version
control command' equally well.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051124/43216415/attachment.pgp