Author: svn-role
Date: Fri Apr 17 04:00:16 2015
New Revision: 1674201
URL: http://svn.apache.org/r1674201
Log:
Merge r1674015 from trunk:
* r1674015
Let 'svnbench null-blame' accept a revision range.
Justification:
Necessary to be able to benchmark 'prospective blame', since that
requires running the command with a reverse revision range. It would
be interesting to test whether a server / backend can deliver the
file revs faster in reverse.
Votes:
+1: jcorvel, rhuijben, danielsh
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/svnbench/svnbench.c
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 04:00:16 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,1667471,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673228,1673282,1673445,1673691,1673785,1673803
+/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,1667471,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673228,1673282,1673445,1673691,1673785,1673803,1674015
Modified: subversion/branches/1.9.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1674201&r1=1674200&r2=1674201&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Fri Apr 17 04:00:16 2015
@@ -131,16 +131,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1674015
- Let 'svnbench null-blame' accept a revision range.
- Justification:
- Necessary to be able to benchmark 'prospective blame', since that
- requires running the command with a reverse revision range. It would
- be interesting to test whether a server / backend can deliver the
- file revs faster in reverse.
- Votes:
- +1: jcorvel, rhuijben, danielsh
-
* r1664593, r1664594, r1664596, r1667715
On Windows allow reading configuration from system services
Justification:
@@ -190,4 +180,3 @@ Approved changes:
doc: Update svn_ra_get_dir2()'s docstring.
Votes:
+1: danielsh
-
Modified: subversion/branches/1.9.x/subversion/svnbench/svnbench.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/svnbench/svnbench.c?rev=1674201&r1=1674200&r2=1674201&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/svnbench/svnbench.c (original)
+++ subversion/branches/1.9.x/subversion/svnbench/svnbench.c Fri Apr 17
04:00:16 2015
@@ -857,7 +857,8 @@ sub_main(int *exit_code, int argc, const
/* Only a few commands can accept a revision range; the rest can take at
most one revision number. */
- if (subcommand->cmd_func != svn_cl__null_log)
+ if (subcommand->cmd_func != svn_cl__null_blame
+ && subcommand->cmd_func != svn_cl__null_log)
{
if (opt_state.end_revision.kind != svn_opt_revision_unspecified)
{
