# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1138575876 -46800
# Node ID 3a56574f329a368d645853e0f9e09472aee62349
# Parent  4338e33c973b1dbbcbff7c47ba6c557918da1461# Parent  2d8dc84c9323296bcfaa22451d0ded5bd811d616
Merge with crew




diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2092,7 +2092,7 @@ def tag(ui, repo, name, rev_=None, **opt
         raise util.Abort(_("the name 'tip' is reserved"))
     if rev_ is not None:
         ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
-                  "please use 'hg tag [-r REV] NAME instead\n"))
+                  "please use 'hg tag [-r REV] NAME' instead\n"))
         if opts['rev']:
             raise util.Abort(_("use only one form to specify the revision"))
     if opts['rev']:
diff --git a/tests/test-tag.out b/tests/test-tag.out
--- a/tests/test-tag.out
+++ b/tests/test-tag.out
@@ -18,10 +18,10 @@ summary:     test
 
 abort: working copy of .hgtags is changed (please commit .hgtags manually)
 failed
-use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME instead
+use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
 abort: use only one form to specify the revision
 failed
-use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME instead
+use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead
 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah
 acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0
 863197ef03781c4fc00276d83eb66c4cb9cd91df bleah1