--- a/mercurial/commands.py	Tue Dec 05 16:39:54 2006 -0600
+++ b/mercurial/commands.py	Wed Dec 06 12:45:27 2006 -0600
@@ -2215,7 +2215,7 @@
     necessary.  The file '.hg/localtags' is used for local tags (not
     shared among repositories).
     """
-    if name in ['tip', '.']:
+    if name in ['tip', '.', 'null']:
         raise util.Abort(_("the name '%s' is reserved") % name)
     if rev_ is not None:
         ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
@@ -2275,8 +2275,7 @@
     modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
     return postincoming(ui, repo, modheads, opts['update'])
 
-def update(ui, repo, node=None, merge=False, clean=False, force=None,
-           branch=None):
+def update(ui, repo, node=None, clean=False, branch=None):
     """update or merge working directory
 
     Update the working directory to the specified revision.
@@ -2721,10 +2720,8 @@
         (update,
          [('b', 'branch', '',
            _('checkout the head of a specific branch (DEPRECATED)')),
-          ('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 [-C] [-f] [REV]')),
+          ('C', 'clean', None, _('overwrite locally modified files'))],
+         _('hg update [-C] [REV]')),
     "verify": (verify, [], _('hg verify')),
     "version": (version_, [], _('hg version')),
 }