Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 2829:4870f795f681

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: combine force and forcemerge arguments
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Aug 2006 10:56:48 -0500
parents 3aeab7bb5adc
children 49988d9f0758
comparison
equal deleted inserted replaced
2828:0f787997e3c2 2829:4870f795f681
215 return _merge.update(repo, node, force=True, wlock=wlock, 215 return _merge.update(repo, node, force=True, wlock=wlock,
216 show_stats=show_stats) 216 show_stats=show_stats)
217 217
218 def merge(repo, node, force=None, remind=True, wlock=None): 218 def merge(repo, node, force=None, remind=True, wlock=None):
219 """branch merge with node, resolving changes""" 219 """branch merge with node, resolving changes"""
220 return _merge.update(repo, node, branchmerge=True, forcemerge=force, 220 return _merge.update(repo, node, branchmerge=True, force=force,
221 remind=remind, wlock=wlock) 221 remind=remind, wlock=wlock)
222 222
223 def revert(repo, node, choose, wlock): 223 def revert(repo, node, choose, wlock):
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, partial=choose, 225 return _merge.update(repo, node, force=True, partial=choose,