Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/hg.py @ 2825:1ea086bc2086
Merge: combine choose and moddirstate to partial
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 Aug 2006 09:11:16 -0500 |
parents | ca06d35af65e |
children | 3aeab7bb5adc |
line wrap: on
line diff
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -222,8 +222,8 @@ def merge(repo, node, force=None, remind def revert(repo, node, choose): """revert changes to revision in node without updating dirstate""" - return _merge.update(repo, node, force=True, choose=choose, - moddirstate=False, show_stats=False) + return _merge.update(repo, node, force=True, partial=choose, + show_stats=False) def verify(repo): """verify the consistency of a repository"""