svn commit: r1672578 - /subversion/trunk/subversion/svn/status-cmd.c

[rh...@apache.org]

Author: rhuijben
Date: Fri Apr 10 07:58:19 2015
New Revision: 1672578

URL: http://svn.apache.org/r1672578
Log:
Following up on r1671164, make passing '-r' to 'svn status' without also
passing '-u' produce a proper error.

* subversion/svn/status-cmd.c
  (svn_cl__status): Check for explicit revision in no update mode.

Suggested by: brane

Modified:
    subversion/trunk/subversion/svn/status-cmd.c

Modified: subversion/trunk/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status-cmd.c?rev=1672578&r1=1672577&r2=1672578&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status-cmd.c (original)
+++ subversion/trunk/subversion/svn/status-cmd.c Fri Apr 10 07:58:19 2015
@@ -291,6 +291,10 @@ svn_cl__status(apr_getopt_t *os,
   /* We want our -u statuses to be against HEAD by default. */
   if (opt_state->start_revision.kind == svn_opt_revision_unspecified)
     rev.kind = svn_opt_revision_head;
+  else if (! opt_state->update)
+    return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+                        _("--revision (-r) option valid only with "
+                          "--show-updates (-u) option"));
   else
     rev = opt_state->start_revision;