changeset 1665:3a56574f329a 0.8

Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 30 Jan 2006 12:04:36 +1300
parents 4338e33c973b (current diff) 2d8dc84c9323 (diff)
children 0fc1b588976f
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Jan 30 12:02:12 2006 +1300
+++ b/mercurial/commands.py	Mon Jan 30 12:04:36 2006 +1300
@@ -2092,7 +2092,7 @@
         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']:
--- a/tests/test-tag.out	Mon Jan 30 12:02:12 2006 +1300
+++ b/tests/test-tag.out	Mon Jan 30 12:04:36 2006 +1300
@@ -18,10 +18,10 @@
 
 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