equal
deleted
inserted
replaced
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) |