svn commit: r1708954 - /subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Oct 16 10:43:11 2015
New Revision: 1708954

URL: http://svn.apache.org/viewvc?rev=1708954&view=rev
Log:
On the 'move-tracking-2' branch: Tweak, completing r1708952.

* subversion/libsvn_repos/ra_loader.c
  (svn_branch_get_mutable_state): Use svn_branch_revision_root_get_branches()
    instead of direct access.

Modified:
    subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c

Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c?rev=1708954&r1=1708953&r2=1708954&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c Fri Oct 16 10:43:11 2015
@@ -770,6 +770,7 @@ svn_branch_get_mutable_state(svn_branch_
                              apr_pool_t *scratch_pool)
 {
   svn_branch_revision_root_t *txn;
+  apr_array_header_t *branches;
   int i;
 
   SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(base_revision));
@@ -785,9 +786,10 @@ svn_branch_get_mutable_state(svn_branch_
   txn->base_rev = base_revision;
   txn->rev = SVN_INVALID_REVNUM;
 
-  for (i = 0; i < txn->branches->nelts; i++)
+  branches = svn_branch_revision_root_get_branches(txn, scratch_pool);
+  for (i = 0; i < branches->nelts; i++)
     {
-      svn_branch_state_t *b = APR_ARRAY_IDX(txn->branches, i, void *);
+      svn_branch_state_t *b = APR_ARRAY_IDX(branches, i, void *);
 
       b->predecessor
         = svn_branch_rev_bid_create(base_revision,