##// END OF EJS Templates
update: add quietempty flag to _showstats...
timeless -
r27404:1cf3543c default
parent child Browse files
Show More
@@ -652,10 +652,10 b' def updaterepo(repo, node, overwrite):'
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
General Comments 0
You need to be logged in to leave comments. Login now