# HG changeset patch # User Matt Mackall # Date 1161816003 18000 # Node ID b0dc459cd06ca8d35419db762d77dcc24106d8b2 # Parent 5c57a5a17963c5603a66909ca92234da597370ee Remove some more deprecated options from help syntax summaries diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -3014,7 +3014,7 @@ table = { ('b', 'base', '', _('base path (DEPRECATED)')), ('f', 'force', None, _('skip check for outstanding uncommitted changes'))], - _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')), + _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')), "incoming|in": (incoming, [('M', 'no-merges', None, _('do not show merges')), ('f', 'force', None, @@ -3195,7 +3195,7 @@ table = { ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), ('C', 'clean', None, _('overwrite locally modified files')), ('f', 'force', None, _('force a merge with outstanding changes'))], - _('hg update [-m] [-C] [-f] [REV]')), + _('hg update [-C] [-f] [REV]')), "verify": (verify, [], _('hg verify')), "version": (show_version, [], _('hg version')), }