Submitter | timeless@mozdev.org |
---|---|
Date | Dec. 14, 2015, 11:37 p.m. |
Message ID | <9a88fb698973eee02eed.1450136246@waste.org> |
Download | mbox | patch |
Permalink | /patch/12042/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -642,10 +642,10 @@ return mergemod.update(repo, node, False, overwrite, None, labels=['working copy', 'destination']) -def update(repo, node): +def update(repo, node, quietempty=False): """update the working directory to node, merging linear changes""" stats = updaterepo(repo, node, False) - _showstats(repo, stats) + _showstats(repo, stats, quietempty) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) return stats[3] > 0