Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/hg.py @ 2826:3aeab7bb5adc
Refactor update locking slightly
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 Aug 2006 09:19:20 -0500 |
parents | 1ea086bc2086 |
children | 4870f795f681 |
line wrap: on
line diff
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -220,10 +220,10 @@ def merge(repo, node, force=None, remind return _merge.update(repo, node, branchmerge=True, forcemerge=force, remind=remind, wlock=wlock) -def revert(repo, node, choose): +def revert(repo, node, choose, wlock): """revert changes to revision in node without updating dirstate""" return _merge.update(repo, node, force=True, partial=choose, - show_stats=False) + show_stats=False, wlock=wlock) def verify(repo): """verify the consistency of a repository"""