equal
deleted
inserted
replaced
2744 |
2744 |
2745 By default, update will refuse to run if doing so would require |
2745 By default, update will refuse to run if doing so would require |
2746 merging or discarding local changes. |
2746 merging or discarding local changes. |
2747 """ |
2747 """ |
2748 node = _lookup(repo, node, branch) |
2748 node = _lookup(repo, node, branch) |
2749 if merge: |
2749 if clean: |
2750 ui.warn(_('(the -m/--merge option is deprecated; ' |
|
2751 'use the merge command instead)\n')) |
|
2752 return hg.merge(repo, node, force=force) |
|
2753 elif clean: |
|
2754 return hg.clean(repo, node) |
2750 return hg.clean(repo, node) |
2755 else: |
2751 else: |
2756 return hg.update(repo, node) |
2752 return hg.update(repo, node) |
2757 |
2753 |
2758 def _lookup(repo, node, branch=None): |
2754 def _lookup(repo, node, branch=None): |