Mercurial > hg > mercurial-crew-with-dirclash
changeset 3524:ba94e80e5540
Remove update -m, deprecated for 0.9.1
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 25 Oct 2006 18:29:54 -0500 |
parents | 2fb30a9d2b3b |
children | c136c28a425a |
files | mercurial/commands.py |
diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2746,11 +2746,7 @@ def update(ui, repo, node=None, merge=Fa merging or discarding local changes. """ node = _lookup(repo, node, branch) - if merge: - ui.warn(_('(the -m/--merge option is deprecated; ' - 'use the merge command instead)\n')) - return hg.merge(repo, node, force=force) - elif clean: + if clean: return hg.clean(repo, node) else: return hg.update(repo, node)