Mercurial > hg-stable

changeset 26770:3d1978cc949e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 01:09:58 -0700
parents 5b00ec4c05cb
children a723f900d212
files mercurial/commands.py
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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