[Bug 4214] New: Display advice after resolving all unresolved files

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4214

          Priority: normal
            Bug ID: 4214
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: Display advice after resolving all unresolved files
          Severity: feature
    Classification: Unclassified
                OS: All
          Reporter: gregory.szorc at gmail.com
          Hardware: All
            Status: UNCONFIRMED
           Version: unspecified
         Component: Mercurial
           Product: Mercurial

I have a suggestion for improving the usability of interrupted operations that
involve resolve.

I think that after performing the operations requested by `hg resolve -m` that
Mercurial should look for pending operations and tell you how to complete them.

Today, we see something like this:

$ hg evolve -a
move:[202619] Bug 990111 - Add-on provider for historical experiments
atop:[202621] Bug 989137 - Part 11: Add a testing-only JSM for common
AddonManager operations
merging browser/experiments/test/xpcshell/head.js
warning: conflicts during merge.
merging browser/experiments/test/xpcshell/head.js incomplete! (edit conflicts,
then use 'hg resolve --mark')
merging browser/experiments/test/xpcshell/test_api.js
warning: conflicts during merge.
merging browser/experiments/test/xpcshell/test_api.js incomplete! (edit
conflicts, then use 'hg resolve --mark')
evolve failed!
fix conflict and run "hg evolve --continue"
abort: unresolved merge conflicts (see hg help resolve)
~/src/firefox (gps/telex/addonmanager)$ hg resolve -m
browser/experiments/test/xpcshell/head.js
~/src/firefox (gps/telex/addonmanager)$ hg resolve -m
browser/experiments/test/xpcshell/test_api.js

I would like those final lines to be something like:

abort: unresolved merge conflicts (see hg help resolve)
~/src/firefox (gps/telex/addonmanager)$ hg resolve -m
browser/experiments/test/xpcshell/head.js
~/src/firefox (gps/telex/addonmanager)$ hg resolve -m
browser/experiments/test/xpcshell/test_api.js
All merge conflicts have been resolved.
Run the following to continue the previous operation: hg evolve --continue


Aside from the wording (which can be bikeshedded on the patch), is this a
feature worth implementing?

-- 
You are receiving this mail because:
You are on the CC list for the bug.