(fwd) bzr shelve feedback

James Blackwell jblack at merconline.com
Wed Nov 30 03:06:03 GMT 2005


> Martin Pool wrote:
> >     1. Why is it called bzr shelve? I'm human, I'm very familiar with
> >     the idea of "undo/redo". "shelve", though it may align well to some
> >     dictionarily precise definition, does not fit the goal my brain
> >     formulates: I want to undo the changes I've made. Or I want to redo
> >     what I undid. Period.
  
> > This takes too much effort. If I
> >     wanted to shelve just one of the changed files, I would have taken
> >     advantage of the fact that I can do that by specifying filenames.
> 
> Since it's not prompting per file, this doesn't follow.  You may not
> want to revert all the hunks, even if you selected just one file.
> Anyhow, you can just press 'd' to accept the default for all hunks.

I can see where shelving with hunks is useful and wouldn't want that to go
away. All the same, I do a pretty good job of not making unrelated changes
between commit. Thusly, most of the time I'd just want to shelve changes
on an all/none basis with the opportunity to be more specific when I want.
Can there be a --hunk option?

For that matter, how about a --hunk to revert? That would be COOL!

> 
> >     4. "Shelve these changes, or restart? [yrsiq?] (y)"
> > 
> >     This question reads a bit to me like "Are you happy with these
> >     changes or do you want to erase you entire hard drive? [Yn]"
> 
> This is a prompt to accept the current hunk selections

On Thu, Nov 24, 2005 at 09:19:38AM -0500, Aaron Bentley wrote:
> Your options at that point are
>   ? - show help
>   y - proceed to shelve selected changes.
>   r - restart the hunk selection loop.
>   s - show status of hunks.
>   i - invert the current selection of all hunks.
>   q - quit
> 
> I would say it's most important for the user to know that they can
> 1. continue
> 2. re-select their hunks
I suggest the following: 

y - yes, mark this hunk for shelving
n - do not mark this hunk for shelving

i - information on hunks marked for shelve
r - reverse selection of things to shelve

f - finished marking. Shelve selections now
q - abandon choices and quit


> >     I'm pretty confident that "y" is associated with "yes", but I find
> >     the wording of this question ambiguous. "Shelve these changes?
> >     [yrsiq?] (y)" would be an improvement, IMHO.
> 
> 
> Aaron
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.1 (GNU/Linux)
> Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
> 
> iD8DBQFDhcv60F+nu1YWqI0RArNCAJ0dUd38/GnPTiZTO+UDAS3MEJDmTwCeJvHw
> C2h+On8VX6HSgOQuHoKdnlc=
> =NkeG
> -----END PGP SIGNATURE-----
-------------- 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/20051129/dece109b/attachment.pgp 


More information about the bazaar mailing list