mercurial/hg.py
changeset 21537 1ab30e9ba0fc
parent 21051 1004d3cd65fd
child 21800 219af1521a6a
equal deleted inserted replaced
21536:92a6b16c9186 21537:1ab30e9ba0fc
   481     """Update the working directory to node.
   481     """Update the working directory to node.
   482 
   482 
   483     When overwrite is set, changes are clobbered, merged else
   483     When overwrite is set, changes are clobbered, merged else
   484 
   484 
   485     returns stats (see pydoc mercurial.merge.applyupdates)"""
   485     returns stats (see pydoc mercurial.merge.applyupdates)"""
   486     return mergemod.update(repo, node, False, overwrite, None)
   486     return mergemod.update(repo, node, False, overwrite, None,
       
   487                            labels=['working copy', 'destination'])
   487 
   488 
   488 def update(repo, node):
   489 def update(repo, node):
   489     """update the working directory to node, merging linear changes"""
   490     """update the working directory to node, merging linear changes"""
   490     stats = updaterepo(repo, node, False)
   491     stats = updaterepo(repo, node, False)
   491     _showstats(repo, stats)
   492     _showstats(repo, stats)