Mercurial > hg
comparison mercurial/hg.py @ 2810:ca06d35af65e
Rename merge.allow -> merge.branchmerge
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 07 Aug 2006 23:53:04 -0500 |
| parents | 1c6beafbae97 |
| children | 1ea086bc2086 |
comparison
equal
deleted
inserted
replaced
| 2809:1c6beafbae97 | 2810:ca06d35af65e |
|---|---|
| 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, allow=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, choose=choose, |