# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1144093139 -7200
# Node ID b343e7d454b4593aa7367f4c26eb109d660655cf
# Parent  968f036f93a40b0e9579ae32760095b4851126e1
Don't allow --style and --template for hg update and hg merge.

The only way that changesets will be shown with these command is in an error
message when trying to update to an ambiguous branch name.


diff -r 968f036f93a4 -r b343e7d454b4 mercurial/commands.py
--- a/mercurial/commands.py	Mon Apr 03 21:01:33 2006 +0200
+++ b/mercurial/commands.py	Mon Apr 03 21:38:59 2006 +0200
@@ -2991,12 +2991,10 @@
          _('hg log [OPTION]... [FILE]')),
     "manifest": (manifest, [], _('hg manifest [REV]')),
     "merge":
-    (merge,
-     [('b', 'branch', '', _('merge with head of a specific branch')),
-      ('', 'style', '', _('display using template map file')),
-      ('f', 'force', None, _('force a merge with outstanding changes')),
-      ('', 'template', '', _('display with template'))],
-     _('hg merge [-b TAG] [-f] [REV]')),
+        (merge,
+         [('b', 'branch', '', _('merge with head of a specific branch')),
+          ('f', 'force', None, _('force a merge with outstanding changes'))],
+         _('hg merge [-b TAG] [-f] [REV]')),
     "outgoing|out": (outgoing,
          [('M', 'no-merges', None, _('do not show merges')),
           ('f', 'force', None,
@@ -3122,11 +3120,9 @@
     "^update|up|checkout|co":
         (update,
          [('b', 'branch', '', _('checkout the head of a specific branch')),
-          ('', 'style', '', _('display using template map file')),
           ('m', 'merge', None, _('allow merging of branches')),
           ('C', 'clean', None, _('overwrite locally modified files')),
-          ('f', 'force', None, _('force a merge with outstanding changes')),
-          ('', 'template', '', _('display with template'))],
+          ('f', 'force', None, _('force a merge with outstanding changes'))],
          _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
     "verify": (verify, [], _('hg verify')),
     "version": (show_version, [], _('hg version')),