mercurial/hg.py

40365:4f37af86d5d5

    """Update the working directory to node.

    When overwrite is set, changes are clobbered, merged else

    returns stats (see pydoc mercurial.merge.applyupdates)"""
    return mergemod.update(repo, node, False, overwrite,
                           labels=['working copy', 'destination'],
                           updatecheck=updatecheck)

def update(repo, node, quietempty=False, updatecheck=None):
    """update the working directory to node"""

def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None,
          abort=False):
    """Branch merge with node, resolving changes. Return true if any
    unresolved conflicts."""
    if not abort:
        stats = mergemod.update(repo, node, True, force, mergeforce=mergeforce,
                                labels=labels)
    else:
        ms = mergemod.mergestate.read(repo)
        if ms.active():
            # there were conflicts
            node = ms.localctx.hex()

40366:b14fdf1fb615

    """Update the working directory to node.

    When overwrite is set, changes are clobbered, merged else

    returns stats (see pydoc mercurial.merge.applyupdates)"""
    return mergemod.update(repo, node, branchmerge=False, force=overwrite,
                           labels=['working copy', 'destination'],
                           updatecheck=updatecheck)

def update(repo, node, quietempty=False, updatecheck=None):
    """update the working directory to node"""

def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None,
          abort=False):
    """Branch merge with node, resolving changes. Return true if any
    unresolved conflicts."""
    if not abort:
        stats = mergemod.update(repo, node, branchmerge=True, force=force,
                                mergeforce=mergeforce, labels=labels)
    else:
        ms = mergemod.mergestate.read(repo)
        if ms.active():
            # there were conflicts
            node = ms.localctx.hex()