Author: svn-role
Date: Wed Apr 15 04:01:43 2015
New Revision: 1673641
URL: http://svn.apache.org/r1673641
Log:
Merge the r1671164 group from trunk:
* r1671164, r1672578, r1673228
Enable passing '-r' to 'svn status'
Justification:
Allows checking what changes when updating to some specific revision
vs only to HEAD.
Notes:
We supported this feature in the libsvn_client api since <= 1.0.
Votes:
+1: philip, rhuijben, stefan2 (for 1.9.0 only)
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/svn/status-cmd.c
subversion/branches/1.9.x/subversion/svn/svn.c
subversion/branches/1.9.x/tools/client-side/bash_completion
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 04:01:43 2015
@@ -90,4 +90,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667233,1667235,1667301,1667941,1667976,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669746,1669749,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671388,1672311,1672372,1672404,1672511-1672512,1672728,1673282,1673445
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667233,1667235,1667301,1667941,1667976,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669746,1669749,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673228,1673282,1673445
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1673641&r1=1673640&r2=1673641&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Apr 15 04:01:43 2015
@@ -235,16 +235,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1671164, r1672578, r1673228
- Enable passing '-r' to 'svn status'
- Justification:
- Allows checking what changes when updating to some specific revision
- vs only to HEAD.
- Notes:
- We supported this feature in the libsvn_client api since <= 1.0.
- Votes:
- +1: philip, rhuijben, stefan2 (for 1.9.0 only)
-
* r1668320
ra_serf: resolve minor memory leak against very old servers
Justification:
Modified: subversion/branches/1.9.x/subversion/svn/status-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/svn/status-cmd.c?rev=1673641&r1=1673640&r2=1673641&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/svn/status-cmd.c (original)
+++ subversion/branches/1.9.x/subversion/svn/status-cmd.c Wed Apr 15 04:01:43
2015
@@ -288,8 +288,15 @@ svn_cl__status(apr_getopt_t *os,
SVN_ERR(svn_cl__check_targets_are_local_paths(targets));
- /* We want our -u statuses to be against HEAD. */
- rev.kind = svn_opt_revision_head;
+ /* 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;
sb.had_print_error = FALSE;
Modified: subversion/branches/1.9.x/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/svn/svn.c?rev=1673641&r1=1673640&r2=1673641&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/svn/svn.c (original)
+++ subversion/branches/1.9.x/subversion/svn/svn.c Wed Apr 15 04:01:43 2015
@@ -1638,8 +1638,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
" ! C wc/qaz.c\n"
" > local missing, incoming edit upon update\n"
" D wc/qax.c\n"),
- { 'u', 'v', 'N', opt_depth, 'q', opt_no_ignore, opt_incremental, opt_xml,
- opt_ignore_externals, opt_changelist},
+ { 'u', 'v', 'N', opt_depth, 'r', 'q', opt_no_ignore, opt_incremental,
+ opt_xml, opt_ignore_externals, opt_changelist},
{{'q', N_("don't print unversioned items")}} },
{ "switch", svn_cl__switch, {"sw"}, N_
Modified: subversion/branches/1.9.x/tools/client-side/bash_completion
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/tools/client-side/bash_completion?rev=1673641&r1=1673640&r2=1673641&view=diff
==============================================================================
--- subversion/branches/1.9.x/tools/client-side/bash_completion (original)
+++ subversion/branches/1.9.x/tools/client-side/bash_completion Wed Apr 15
04:01:43 2015
@@ -938,7 +938,7 @@ _svn()
status|stat|st)
cmdOpts="-u --show-updates -v --verbose $nOpts $qOpts $pOpts \
--no-ignore --ignore-externals --incremental --xml \
- $cOpts"
+ $rOpts $cOpts"
;;
switch|sw)
cmdOpts="--relocate $rOpts $nOpts $qOpts $pOpts --diff3-cmd \
