Author: stsp
Date: Thu Jun 2 15:00:48 2011
New Revision: 1130592
URL: http://svn.apache.org/viewvc?rev=1130592&view=rev
Log:
* subversion/libsvn_subr/opt.c
(svn_opt_parse_path): Explicitly mention in the error message that a
*peg* revision failed to parse.
* subversion/tests/cmdline/basic_tests.py
(basic_peg_revision): Adjust expected output.
Modified:
subversion/trunk/subversion/libsvn_subr/opt.c
subversion/trunk/subversion/tests/cmdline/basic_tests.py
Modified: subversion/trunk/subversion/libsvn_subr/opt.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/opt.c?rev=1130592&r1=1130591&r2=1130592&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/opt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/opt.c Thu Jun 2 15:00:48 2011
@@ -794,7 +794,7 @@ svn_opt_parse_path(svn_opt_revision_t *r
}
return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
- _("Syntax error parsing revision '%s'"),
+ _("Syntax error parsing peg revision '%s'"),
&peg_rev[1]);
}
rev->kind = start_revision.kind;
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1130592&r1=1130591&r2=1130592&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Thu Jun 2
15:00:48 2011
@@ -1722,9 +1722,9 @@ def basic_peg_revision(sbox):
# Without the trailing "@", expect failure.
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, None, ".*Syntax error parsing revision 'abc'", 'cat', wc_file)
+ None, None, ".*Syntax error parsing peg revision 'abc'", 'cat', wc_file)
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, None, ".*Syntax error parsing revision 'abc'", 'cat', url)
+ None, None, ".*Syntax error parsing peg revision 'abc'", 'cat', url)
# With the trailing "@", expect success.
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
