mercurial/hg.py

2811:1ea086bc2086

def merge(repo, node, force=None, remind=True, wlock=None):
    """branch merge with node, resolving changes"""
    return _merge.update(repo, node, branchmerge=True, forcemerge=force,
                         remind=remind, wlock=wlock)

def revert(repo, node, choose):
    """revert changes to revision in node without updating dirstate"""
    return _merge.update(repo, node, force=True, partial=choose,
                         show_stats=False)

def verify(repo):
    """verify the consistency of a repository"""
    return _verify.verify(repo)

2812:3aeab7bb5adc

def merge(repo, node, force=None, remind=True, wlock=None):
    """branch merge with node, resolving changes"""
    return _merge.update(repo, node, branchmerge=True, forcemerge=force,
                         remind=remind, wlock=wlock)

def revert(repo, node, choose, wlock):
    """revert changes to revision in node without updating dirstate"""
    return _merge.update(repo, node, force=True, partial=choose,
                         show_stats=False, wlock=wlock)

def verify(repo):
    """verify the consistency of a repository"""
    return _verify.verify(repo)