view mercurial/mergeutil.py @ 41574:b436059c1cca

py3: use pycompat.bytestr() on extra values because it can be int

One such example is {'close': 1} which marks a branch as closed.

This makes test-convert-mtn.t pass on Python 3.

Differential Revision: https://phab.mercurial-scm.org/D5864

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

from .i18n import _

from . import (
    error,
)

def checkunresolved(ms):
    if list(ms.unresolved()):
        raise error.Abort(_("unresolved merge conflicts "
                            "(see 'hg help resolve')"))
    if ms.mdstate() != 's' or list(ms.driverresolved()):
        raise error.Abort(_('driver-resolved merge conflicts'),
                          hint=_('run "hg resolve --all" to resolve'))