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

localrepo.commit: abort if merge driver's conclude step hasn't been run yet

Browse Source 
This case also requires 'hg resolve --all' to be run before continuing.
This commit is contained in:
Siddharth Agarwal 2015-10-15 01:02:32 -07:00
parent f4dc777bce
commit dedaa4b3f5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/localrepo.py
View File

@ -1564,7 +1564,7 @@ class localrepository(object):
if unresolved:
raise error.Abort(_('unresolved merge conflicts '
'(see "hg help resolve")'))
if driverresolved:
if driverresolved or ms.mdstate() != 's':
raise error.Abort(_('driver-resolved merge conflicts'),
hint=_('run "hg resolve --all" to resolve'))