facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

commands.resolve: print out warning when only driver-resolved files remain

Browse Source 
'hg resolve --all' will be the canonical way to run the 'conclude' step of the
merge driver.
This commit is contained in:
Siddharth Agarwal 2015-10-15 01:09:58 -07:00
parent fe759d6960
commit e78d354b3c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mercurial/commands.py
View File

@ -5665,8 +5665,13 @@ def resolve(ui, repo, *pats, **opts):
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