view hglib/merge.py @ 107:5fe53db61aa4 0.4

tests: fix tests that use integer bookmarks Integer bookmarks are now not allowed (since they alias with revision numbers), so a hglib test was failing.
author Durham Goode <durham@fb.com>
date Fri, 08 Feb 2013 03:51:42 -0800
parents ebcc5d7dd528
children fe74d5599539
line wrap: on
line source

class handlers(object):
    """
    These can be used as the cb argument to hgclient.merge() to control the
    behaviour when Mercurial prompts what to do with regard to a specific file,
    e.g. when one parent modified a file and the other removed it.
    """

    @staticmethod
    def abort(size, output):
        """
        Abort the merge if a prompt appears.
        """
        return ''

    """
    This corresponds to Mercurial's -y/--noninteractive global option, which
    picks the first choice on all prompts.
    """
    noninteractive = 'yes'