--- a/mercurial/dispatch.py Fri Jan 06 11:43:17 2012 +0100
+++ b/mercurial/dispatch.py Fri Jan 06 16:16:58 2012 +0100
@@ -583,7 +583,7 @@
raise util.Abort(_("option --cwd may not be abbreviated!"))
if options["repository"]:
raise util.Abort(_(
- "Option -R has to be separated from other options (e.g. not -qR) "
+ "option -R has to be separated from other options (e.g. not -qR) "
"and --repository may only be abbreviated as --repo!"))
if options["encoding"]:
--- a/tests/test-globalopts.t Fri Jan 06 11:43:17 2012 +0100
+++ b/tests/test-globalopts.t Fri Jan 06 16:16:58 2012 +0100
@@ -136,16 +136,16 @@
abort: option --cwd may not be abbreviated!
[255]
$ hg --rep a tip
- abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
+ abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
[255]
$ hg --repositor a tip
- abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
+ abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
[255]
$ hg -qR a tip
- abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
+ abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
[255]
$ hg -qRa tip
- abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
+ abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
[255]
Testing --cwd: