You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/06/12 14:27:05 UTC
svn commit: r1492172 - /subversion/trunk/subversion/svn/mergeinfo-cmd.c
Author: stsp
Date: Wed Jun 12 12:27:05 2013
New Revision: 1492172
URL: http://svn.apache.org/r1492172
Log:
* subversion/svn/mergeinfo-cmd.c
(svn_cl__mergeinfo): Error out if --log option is given but --show-revs is
not given, as already done for other options, such as --depth.
Modified:
subversion/trunk/subversion/svn/mergeinfo-cmd.c
Modified: subversion/trunk/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1492172&r1=1492171&r2=1492172&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Wed Jun 12 12:27:05 2013
@@ -439,6 +439,11 @@ svn_cl__mergeinfo(apr_getopt_t *os,
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("Depth specification options valid only "
"with --show-revs option"));
+ if (opt_state->mergeinfo_log)
+ return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("--log option valid only with "
+ "--show-revs option"));
+
SVN_ERR(mergeinfo_summary(source, &src_peg_revision,
target, &tgt_peg_revision,