[issue2030] help for resolve command is confusing and possibly incomplete

[Greg Ward]

New submission from Greg Ward <greg-hg at gerg.ca>:

The help for "resolve" is confusing and unclear  I think this is possibly
because "resolve" itself is confusing and unclear.  Given that the UI is
unlikely to change, we need to improve the help.  

My understanding of "resolve" is imperfect; nevertheless, here is a rough
stab at what the help should possibly look like:

"""
miscellaneous grab-bag of post-merge actions

  This command jumbles together numerous actions that you might want to
  do while performing a merge, i.e. after "hg merge" but before "hg 
  commit".  It's mainly necessary when doing non-interactive
  merges, and less relevant when you complete your merge inside a GUI
  merge tool launched by Mercurial.

  The available actions are:
    1) status-like list of files that were merged with conflicts (U)
       and without (R): "hg resolve -l"
    2) record that you have resolved conflicts in certain files:
       "hg resolve -m file ..." (or -a for all merged files)
    3) forget that you have resolved conflicts in certain files:
       "hg resolve -u file ..." (or -a for all merged files)
    4) discard your current attempt(s) at resolving conflicts and
       restart the merge from scratch: "hg resolve file..."
       (or -a for all merged files)

  Note that Mercurial will not let you commit files that merged
  with conflicts.  You must use "hg resolve -m ..." before you
  can commit after a conflicting merge.
"""

----------
messages: 11644
nosy: gward
priority: bug
status: unread
title: help for resolve command is confusing and possibly incomplete

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2030>
____________________________________________________