# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1444896598 25200
# Node ID 3d1978cc949eac523b083f1c7a29770cfe7c8583
# Parent  5b00ec4c05cbd23a66c2aedff8d33cfe750096d8
commands.resolve: print out warning when only driver-resolved files remain

'hg resolve --all' will be the canonical way to run the 'conclude' step of the
merge driver.

diff -r 5b00ec4c05cb -r 3d1978cc949e mercurial/commands.py
--- a/mercurial/commands.py	Thu Oct 15 01:06:29 2015 -0700
+++ b/mercurial/commands.py	Thu Oct 15 01:09:58 2015 -0700
@@ -5665,8 +5665,13 @@
         wlock.release()
 
     # Nudge users into finishing an unfinished operation
-    if not list(ms.unresolved()):
+    unresolvedf = list(ms.unresolved())
+    driverresolvedf = list(ms.driverresolved())
+    if not unresolvedf and not driverresolvedf:
         ui.status(_('(no more unresolved files)\n'))
+    elif not unresolvedf:
+        ui.status(_('(no more unresolved files -- '
+                    'run "hg resolve --all" to conclude)\n'))
 
     return ret