# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1141889269 -3600
# Node ID 42c76ec7a8d4ad18f03af0d52b7d84268e2278bc
# Parent  6a3d5a56f19c1d88f199050fd7c755466453e698
Reordered options for remove, fixed synopsis for rename.


diff -r 6a3d5a56f19c -r 42c76ec7a8d4 mercurial/commands.py
--- a/mercurial/commands.py	Wed Mar 08 18:48:40 2006 -0800
+++ b/mercurial/commands.py	Thu Mar 09 08:27:49 2006 +0100
@@ -2563,9 +2563,9 @@
     "recover": (recover, [], _('hg recover')),
     "^remove|rm":
         (remove,
-         [('I', 'include', [], _('include names matching the given patterns')),
-          ('X', 'exclude', [], _('exclude names matching the given patterns')),
-          ('f', 'force', None, _('remove file even if modified'))],
+         [('f', 'force', None, _('remove file even if modified')),
+          ('I', 'include', [], _('include names matching the given patterns')),
+          ('X', 'exclude', [], _('exclude names matching the given patterns'))],
          _('hg remove [OPTION]... FILE...')),
     "rename|mv":
         (rename,
@@ -2574,7 +2574,7 @@
            _('forcibly copy over an existing managed file')),
           ('I', 'include', [], _('include names matching the given patterns')),
           ('X', 'exclude', [], _('exclude names matching the given patterns'))],
-         _('hg rename [OPTION]... [SOURCE]... DEST')),
+         _('hg rename [OPTION]... SOURCE... DEST')),
     "^revert":
         (revert,
          [('r', 'rev', '', _('revision to revert to')),