650 |
650 |
651 returns stats (see pydoc mercurial.merge.applyupdates)""" |
651 returns stats (see pydoc mercurial.merge.applyupdates)""" |
652 return mergemod.update(repo, node, False, overwrite, |
652 return mergemod.update(repo, node, False, overwrite, |
653 labels=['working copy', 'destination']) |
653 labels=['working copy', 'destination']) |
654 |
654 |
655 def update(repo, node): |
655 def update(repo, node, quietempty=False): |
656 """update the working directory to node, merging linear changes""" |
656 """update the working directory to node, merging linear changes""" |
657 stats = updaterepo(repo, node, False) |
657 stats = updaterepo(repo, node, False) |
658 _showstats(repo, stats) |
658 _showstats(repo, stats, quietempty) |
659 if stats[3]: |
659 if stats[3]: |
660 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) |
660 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) |
661 return stats[3] > 0 |
661 return stats[3] > 0 |
662 |
662 |
663 # naming conflict in clone() |
663 # naming conflict in clone() |