Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 27278:42aa0e570eaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Dec 2015 18:06:13 -0600
parents 07ae7e8c8ac9 f97bb61b51e6
children a18328aad48c
comparison
equal deleted inserted replaced
27277:07ae7e8c8ac9 27278:42aa0e570eaa
1567 return None 1567 return None
1568 1568
1569 if merge and cctx.deleted(): 1569 if merge and cctx.deleted():
1570 raise error.Abort(_("cannot commit merge with missing files")) 1570 raise error.Abort(_("cannot commit merge with missing files"))
1571 1571
1572 unresolved, driverresolved = False, False
1573 ms = mergemod.mergestate.read(self) 1572 ms = mergemod.mergestate.read(self)
1574 for f in status.modified: 1573
1575 if f in ms: 1574 if list(ms.unresolved()):
1576 if ms[f] == 'u':
1577 unresolved = True
1578 elif ms[f] == 'd':
1579 driverresolved = True
1580
1581 if unresolved:
1582 raise error.Abort(_('unresolved merge conflicts ' 1575 raise error.Abort(_('unresolved merge conflicts '
1583 '(see "hg help resolve")')) 1576 '(see "hg help resolve")'))
1584 if driverresolved or ms.mdstate() != 's': 1577 if ms.mdstate() != 's' or list(ms.driverresolved()):
1585 raise error.Abort(_('driver-resolved merge conflicts'), 1578 raise error.Abort(_('driver-resolved merge conflicts'),
1586 hint=_('run "hg resolve --all" to resolve')) 1579 hint=_('run "hg resolve --all" to resolve'))
1587 1580
1588 if editor: 1581 if editor:
1589 cctx._text = editor(self, cctx, subs) 1582 cctx._text = editor(self, cctx, subs)