hg resolve

[Leslie P. Polzer]

Are there other people who are annoyed by "hg resolve"?

First issue: the output "abort: unresolved merge conflicts
(see hg resolve)" is quite unspecific. Should I just type
"hg resolve", look up its help, then what?

How about something like this instead:

  abort: unresolved merge conflicts.
  Use "hg resolve -l" to list the conflicting files
  followed by "hg resolve -m FILE..." to mark them as
  resolved after fixing the conflicts.

Second issue, related: resolve without any arguments will
just overwrite a fixed conflict, discarding any changes
made.

It should warn/ask the user interactively whether they
really want to do that. Alternative: no default behaviour
at all and a new switch that will restore the original
conflicts.

  Leslie

-- 
LinkedIn Profile: http://www.linkedin.com/in/polzer
Xing Profile: https://www.xing.com/profile/LeslieP_Polzer
Blog: http://blog.viridian-project.de/