254 

   254 

   255 def _update(repo, node): return update(repo, node)

   255 def _update(repo, node): return update(repo, node)

   256 

   256 

   257 def update(repo, node):

   257 def update(repo, node):

   258     """update the working directory to node, merging linear changes"""

   258     """update the working directory to node, merging linear changes"""

   260     stats = _merge.update(repo, node, False, False, None)

   259     stats = _merge.update(repo, node, False, False, None)

   261     _showstats(repo, stats)

   260     _showstats(repo, stats)

   262     if stats[3]:

   261     if stats[3]:

   263         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))

   262         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))

   264     return stats[3] > 0

   263     return stats[3] > 0

   272 def merge(repo, node, force=None, remind=True):

   271 def merge(repo, node, force=None, remind=True):

   273     """branch merge with node, resolving changes"""

   272     """branch merge with node, resolving changes"""

   274     stats = _merge.update(repo, node, True, force, False)

   273     stats = _merge.update(repo, node, True, force, False)

   275     _showstats(repo, stats)

   274     _showstats(repo, stats)

   276     if stats[3]:

   275     if stats[3]:

   278         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))

   276         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))

   279     elif remind:

   277     elif remind:

   280         repo.ui.status(_("(branch merge, don't forget to commit)\n"))

   278         repo.ui.status(_("(branch merge, don't forget to commit)\n"))

   281     return stats[3] > 0

   279     return stats[3] > 0

   282 

   280