Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: expand -c and -C in update error message
authorMartin Geisler <mg@lazybytes.net>
Thu, 17 Sep 2009 21:50:12 +0200
changeset 9451 3e673c988c85
parent 9450 e78967d3dd6f
child 9456 c564dbb2a6d5
child 9465 661bc51f09b7
child 9503 a23ee0208f77
commands: expand -c and -C in update error message
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Sep 17 21:34:05 2009 +0200
+++ b/mercurial/commands.py	Thu Sep 17 21:50:12 2009 +0200
@@ -3041,7 +3041,7 @@
         rev = node
 
     if check and clean:
-        raise util.Abort(_("cannot specify both -c and -C"))
+        raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
 
     if check:
         # we could use dirty() but we can ignore merge and branch trivia
Mercurial