Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 2825:1ea086bc2086

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2824:ca06d35af65e 2825:1ea086bc2086
220 return _merge.update(repo, node, branchmerge=True, forcemerge=force, 220 return _merge.update(repo, node, branchmerge=True, forcemerge=force,
221 remind=remind, wlock=wlock) 221 remind=remind, wlock=wlock)
222 222
223 def revert(repo, node, choose): 223 def revert(repo, node, choose):
224 """revert changes to revision in node without updating dirstate""" 224 """revert changes to revision in node without updating dirstate"""
225 return _merge.update(repo, node, force=True, choose=choose, 225 return _merge.update(repo, node, force=True, partial=choose,
226 moddirstate=False, show_stats=False) 226 show_stats=False)
227 227
228 def verify(repo): 228 def verify(repo):
229 """verify the consistency of a repository""" 229 """verify the consistency of a repository"""
230 return _verify.verify(repo) 230 return _verify.verify(repo)