Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorSiddharth Agarwal <sid0@fb.com>
Thu, 15 Oct 2015 01:09:58 -0700
changeset 26770 3d1978cc949e
parent 26769 5b00ec4c05cb
child 26771 a723f900d212
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.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial