D6676: unshelve: add help text on --interactive in verbose mode

mharbison72 (Matt Harbison) phabricator at mercurial-scm.org
Tue Jul 23 12:50:09 EDT 2019


mharbison72 added inline comments.

INLINE COMMENTS

> commands.py:6214
> +
> +       Selected changes can be unshelved with ``--interactive`` flag. The repo
> +       is updated with the requested changes by the user and the stored shelve

s/repo/working directory/

> commands.py:6215-6218
> +       is updated with the requested changes by the user and the stored shelve
> +       is modified with the remaining changes. Note that the user will get into
> +       conflicts whenever the whole shelve has conflicts with the repo
> +       regardless of the changes they have requested.

"Shelve" is an action, so "stored shelve" and "whole shelve" read awkwardly.  Maybe stick to the phrase "shelved change" from above?

Minor bikeshedding, but it might also be better to say something like "The working directory is updated with the selected changes, and only the unselected changes remain shelved", rather than saying the shelved store is modified with remaining changes (since they were already there).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6676/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6676

To: navaneeth.suresh, #hg-reviewers
Cc: mharbison72, mercurial-devel


More information about the Mercurial-devel mailing list