Author: svn-role
Date: Sun Feb 11 04:00:15 2018
New Revision: 1823809
URL: http://svn.apache.org/viewvc?rev=1823809&view=rev
Log:
Merge r1823327 from trunk:
* r1823327
Performance: Make the 'info' command fast on old repository revisions.
Justification:
Performance was bad.
Votes:
+1: julianfoad, brane, stsp
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_client/info.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 11 04:00:15 2018
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822996,1823202-1823203
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820044,1820046-1820047,1820518,1820718,1820778,1821183,1821224,1821621,1821678,1822401,1822996,1823202-1823203,1823327
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1823809&r1=1823808&r2=1823809&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sun Feb 11 04:00:15 2018
@@ -21,13 +21,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1823327
- Performance: Make the 'info' command fast on old repository revisions.
- Justification:
- Performance was bad.
- Votes:
- +1: julianfoad, brane, stsp
-
* r1820627
davautocheck.sh: Support a --lldb option alongside --gdb.
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_client/info.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_client/info.c?rev=1823809&r1=1823808&r2=1823809&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_client/info.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_client/info.c Sun Feb 11
04:00:15 2018
@@ -253,17 +253,17 @@ same_resource_in_head(svn_boolean_t *sam
apr_pool_t *pool)
{
svn_error_t *err;
- svn_opt_revision_t start_rev, peg_rev;
+ svn_opt_revision_t operative_rev, peg_rev;
const char *head_url;
- start_rev.kind = svn_opt_revision_head;
- peg_rev.kind = svn_opt_revision_number;
- peg_rev.value.number = rev;
+ peg_rev.kind = svn_opt_revision_head;
+ operative_rev.kind = svn_opt_revision_number;
+ operative_rev.value.number = rev;
err = svn_client__repos_locations(&head_url, NULL, NULL, NULL,
ra_session,
url, &peg_rev,
- &start_rev, NULL,
+ &operative_rev, NULL,
ctx, pool);
if (err &&
((err->apr_err == SVN_ERR_CLIENT_UNRELATED_RESOURCES) ||
