You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/03/06 15:42:49 UTC
svn commit: r1664638 - in /subversion/branches/move-tracking-2/subversion:
include/private/svn_branch.h libsvn_delta/branch.c libsvn_delta/compat3e.c
libsvn_delta/editor3e.c libsvn_ra/ra_loader.c svnmover/svnmover.c
Author: julianfoad
Date: Fri Mar 6 14:42:48 2015
New Revision: 1664638
URL: http://svn.apache.org/r1664638
Log:
On the 'move-tracking-2' branch: Rename 'BID' (branch id) to 'BSID' (branch
sibling id) for clarity.
* subversion/include/private/svn_branch.h,
subversion/libsvn_delta/branch.c,
subversion/libsvn_delta/compat3e.c,
subversion/libsvn_delta/editor3e.c,
subversion/libsvn_ra/ra_loader.c,
subversion/svnmover/svnmover.c:
Rename everywhere.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h?rev=1664638&r1=1664637&r2=1664638&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h Fri Mar 6 14:42:48 2015
@@ -149,8 +149,8 @@ typedef struct svn_branch_family_t
/* The branch siblings in this family. */
apr_array_header_t *branch_siblings;
- /* The range of branch ids assigned within this family. */
- int first_bid, next_bid;
+ /* The range of branch sibling ids assigned within this family. */
+ int first_bsid, next_bsid;
/* The range of element ids assigned within this family. */
int first_eid, next_eid;
@@ -166,8 +166,8 @@ typedef struct svn_branch_family_t
svn_branch_family_t *
svn_branch_family_create(svn_branch_repos_t *repos,
int fid,
- int first_bid,
- int next_bid,
+ int first_bsid,
+ int next_bsid,
int first_eid,
int next_eid,
apr_pool_t *result_pool);
@@ -210,8 +210,8 @@ svn_branch_family_add_new_branch_sibling
/* A branch.
*
* A branch sibling object describes the characteristics of a branch
- * in a given family with a given BID. This sibling is common to each
- * branch that has this same family and BID: there can be one such instance
+ * in a given family with a given BSID. This sibling is common to each
+ * branch that has this same family and BSID: there can be one such instance
* within each branch of its outer families.
*
* Often, all branches in a family have the same root element. For example,
@@ -247,8 +247,8 @@ struct svn_branch_sibling_t
/* The family of which this branch is a member. */
svn_branch_family_t *family;
- /* The BID of this branch within its family. */
- int bid;
+ /* The BSID of this branch within its family. */
+ int bsid;
/* The EID, within the outer family, of the branch root element. */
/*int outer_family_eid_of_branch_root;*/
@@ -262,7 +262,7 @@ struct svn_branch_sibling_t
/* Create a new branch sibling object */
svn_branch_sibling_t *
svn_branch_sibling_create(svn_branch_family_t *family,
- int bid,
+ int bsid,
int root_eid,
apr_pool_t *result_pool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1664638&r1=1664637&r2=1664638&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Fri Mar 6 14:42:48 2015
@@ -37,8 +37,8 @@
#include "svn_private_config.h"
-#define FAMILY_HAS_BID(family, bid) \
- ((bid) >= (family)->first_bid && (bid) < (family)->next_bid)
+#define FAMILY_HAS_BSID(family, bsid) \
+ ((bsid) >= (family)->first_bsid && (bsid) < (family)->next_bsid)
#define FAMILY_HAS_ELEMENT(family, eid) \
((eid) >= (family)->first_eid && (eid) < (family)->next_eid)
@@ -126,8 +126,8 @@ assert_branch_family_invariants(const sv
svn_branch_family_t *
svn_branch_family_create(svn_branch_repos_t *repos,
int fid,
- int first_bid,
- int next_bid,
+ int first_bsid,
+ int next_bsid,
int first_eid,
int next_eid,
apr_pool_t *result_pool)
@@ -138,8 +138,8 @@ svn_branch_family_create(svn_branch_repo
f->repos = repos;
f->branch_siblings = svn_array_make(result_pool);
f->sub_families = svn_array_make(result_pool);
- f->first_bid = first_bid;
- f->next_bid = next_bid;
+ f->first_bsid = first_bsid;
+ f->next_bsid = next_bsid;
f->first_eid = first_eid;
f->next_eid = next_eid;
f->pool = result_pool;
@@ -168,15 +168,15 @@ svn_branch_family_add_new_subfamily(svn_
svn_branch_repos_t *repos = outer_family->repos;
int fid = repos->next_fid++;
#ifdef PRETTY_IDS
- int first_bid = fid * 10;
+ int first_bsid = fid * 10;
int first_eid = fid * 100;
#else
- int first_bid = 0;
+ int first_bsid = 0;
int first_eid = 0;
#endif
svn_branch_family_t *family
= svn_branch_family_create(repos, fid,
- first_bid, first_bid,
+ first_bsid, first_bsid,
first_eid, first_eid,
outer_family->pool);
@@ -189,16 +189,16 @@ svn_branch_family_add_new_subfamily(svn_
return family;
}
-/* Create a new branch sibling in FAMILY, with branch id BID and
+/* Create a new branch sibling in FAMILY, with branch sibling id BSID and
* root element ROOT_EID, and register it as a member of the family.
*/
static svn_branch_sibling_t *
family_create_branch_sibling(svn_branch_family_t *family,
- int bid,
+ int bsid,
int root_eid)
{
svn_branch_sibling_t *branch_sibling
- = svn_branch_sibling_create(family, bid, root_eid, family->pool);
+ = svn_branch_sibling_create(family, bsid, root_eid, family->pool);
/* The root EID must be an existing EID. */
SVN_ERR_ASSERT_NO_RETURN(root_eid >= family->first_eid
@@ -212,35 +212,35 @@ family_create_branch_sibling(svn_branch_
return branch_sibling;
}
-/* Return the branch sibling definition with branch id BID in FAMILY.
+/* Return the branch sibling definition with branch sibling id BSID in FAMILY.
*
* Return NULL if not found.
*/
static svn_branch_sibling_t *
family_find_branch_sibling(svn_branch_family_t *family,
- int bid)
+ int bsid)
{
SVN_ITER_T(svn_branch_sibling_t) *si;
for (SVN_ARRAY_ITER_NO_POOL(si, family->branch_siblings))
- if (si->val->bid == bid)
+ if (si->val->bsid == bsid)
return si->val;
return NULL;
}
/* Return an existing (if found) or new (otherwise) branch sibling
- * definition object with id BID and root-eid ROOT_EID in FAMILY.
+ * definition object with id BSID and root-eid ROOT_EID in FAMILY.
*/
static svn_branch_sibling_t *
family_find_or_create_branch_sibling(svn_branch_family_t *family,
- int bid,
+ int bsid,
int root_eid)
{
- svn_branch_sibling_t *sibling = family_find_branch_sibling(family, bid);
+ svn_branch_sibling_t *sibling = family_find_branch_sibling(family, bsid);
if (!sibling)
{
- sibling = family_create_branch_sibling(family, bid, root_eid);
+ sibling = family_create_branch_sibling(family, bsid, root_eid);
}
SVN_ERR_ASSERT_NO_RETURN(sibling->root_eid == root_eid);
@@ -251,9 +251,9 @@ svn_branch_sibling_t *
svn_branch_family_add_new_branch_sibling(svn_branch_family_t *family,
int root_eid)
{
- int bid = family->next_bid++;
+ int bsid = family->next_bsid++;
svn_branch_sibling_t *branch_sibling
- = family_create_branch_sibling(family, bid, root_eid);
+ = family_create_branch_sibling(family, bsid, root_eid);
assert_branch_family_invariants(family);
return branch_sibling;
@@ -288,23 +288,23 @@ assert_branch_sibling_invariants(const s
apr_pool_t *scratch_pool)
{
assert(sibling->family);
- assert(FAMILY_HAS_BID(sibling->family, sibling->bid));
+ assert(FAMILY_HAS_BSID(sibling->family, sibling->bsid));
assert(FAMILY_HAS_ELEMENT(sibling->family, sibling->root_eid));
}
svn_branch_sibling_t *
svn_branch_sibling_create(svn_branch_family_t *family,
- int bid,
+ int bsid,
int root_eid,
apr_pool_t *result_pool)
{
svn_branch_sibling_t *b = apr_pcalloc(result_pool, sizeof(*b));
- assert(FAMILY_HAS_BID(family, bid));
+ assert(FAMILY_HAS_BSID(family, bsid));
assert(FAMILY_HAS_ELEMENT(family, root_eid));
b->family = family;
- b->bid = bid;
+ b->bsid = bsid;
b->root_eid = root_eid;
assert_branch_sibling_invariants(b, result_pool);
return b;
@@ -941,7 +941,7 @@ svn_branch_revision_root_delete_branch_i
if (bi->val == branch)
{
SVN_DBG(("deleting branch-instance b%d e%d",
- bi->val->sibling_defn->bid, bi->val->sibling_defn->root_eid));
+ bi->val->sibling_defn->bsid, bi->val->sibling_defn->root_eid));
svn_sort__array_delete(rev_root->branch_instances, bi->i, 1);
break;
}
@@ -985,7 +985,7 @@ svn_branch_instance_parse(svn_branch_ins
svn_stringbuf_t *line;
svn_boolean_t eof;
int n;
- int fid, bid, root_eid;
+ int fid, bsid, root_eid;
svn_branch_sibling_t *branch_sibling;
svn_branch_instance_t *branch_instance;
char branch_root_path[100];
@@ -997,13 +997,13 @@ svn_branch_instance_parse(svn_branch_ins
SVN_ERR(svn_stream_readline(stream, &line, "\n", &eof, scratch_pool));
SVN_ERR_ASSERT(! eof);
n = sscanf(line->data, "f%db%d: root-eid %d at %s\n",
- &fid, &bid, &root_eid, branch_root_path);
+ &fid, &bsid, &root_eid, branch_root_path);
SVN_ERR_ASSERT(n == 4);
SVN_ERR_ASSERT(fid == family->fid);
branch_root_rrpath
= strcmp(branch_root_path, ".") == 0 ? "" : branch_root_path;
- branch_sibling = family_find_or_create_branch_sibling(family, bid, root_eid);
+ branch_sibling = family_find_or_create_branch_sibling(family, bsid, root_eid);
if (branch_root_rrpath[0])
{
svn_branch_find_nested_branch_element_by_rrpath(&outer_branch, &outer_eid,
@@ -1023,13 +1023,13 @@ svn_branch_instance_parse(svn_branch_ins
/* Read in the structure, leaving the content of each element as null */
for (eid = family->first_eid; eid < family->next_eid; eid++)
{
- int this_fid, this_bid, this_eid, this_parent_eid;
+ int this_fid, this_bsid, this_eid, this_parent_eid;
char this_name[20];
SVN_ERR(svn_stream_readline(stream, &line, "\n", &eof, scratch_pool));
SVN_ERR_ASSERT(! eof);
n = sscanf(line->data, "f%db%de%d: %d %20s\n",
- &this_fid, &this_bid, &this_eid,
+ &this_fid, &this_bsid, &this_eid,
&this_parent_eid, this_name);
SVN_ERR_ASSERT(n == 5);
if (strcmp(this_name, "(null)") != 0)
@@ -1089,32 +1089,32 @@ svn_branch_family_parse(svn_branch_famil
svn_stringbuf_t *line;
svn_boolean_t eof;
int n;
- int fid, first_bid, next_bid, first_eid, next_eid;
+ int fid, first_bsid, next_bsid, first_eid, next_eid;
svn_branch_family_t *family;
SVN_ERR(svn_stream_readline(stream, &line, "\n", &eof, scratch_pool));
SVN_ERR_ASSERT(!eof);
- n = sscanf(line->data, "f%d: bids %d %d eids %d %d "
+ n = sscanf(line->data, "f%d: bsids %d %d eids %d %d "
"parent-fid %d b-instances %d\n",
&fid,
- &first_bid, &next_bid, &first_eid, &next_eid,
+ &first_bsid, &next_bsid, &first_eid, &next_eid,
parent_fid, num_branch_instances);
SVN_ERR_ASSERT(n == 7);
family = repos_get_family_by_id(repos, fid);
if (family)
{
- SVN_ERR_ASSERT(first_bid == family->first_bid);
- SVN_ERR_ASSERT(next_bid >= family->next_bid);
+ SVN_ERR_ASSERT(first_bsid == family->first_bsid);
+ SVN_ERR_ASSERT(next_bsid >= family->next_bsid);
SVN_ERR_ASSERT(first_eid == family->first_eid);
SVN_ERR_ASSERT(next_eid >= family->next_eid);
- family->next_bid = next_bid;
+ family->next_bsid = next_bsid;
family->next_eid = next_eid;
}
else
{
family = svn_branch_family_create(repos, fid,
- first_bid, next_bid,
+ first_bsid, next_bsid,
first_eid, next_eid,
repos->pool);
@@ -1203,7 +1203,7 @@ svn_branch_instance_serialize(svn_stream
SVN_ERR(svn_stream_printf(stream, scratch_pool,
"f%db%d: root-eid %d at %s\n",
- family->fid, branch->sibling_defn->bid,
+ family->fid, branch->sibling_defn->bsid,
branch->sibling_defn->root_eid,
branch_root_rrpath[0] ? branch_root_rrpath : "."));
@@ -1233,7 +1233,7 @@ svn_branch_instance_serialize(svn_stream
}
SVN_ERR(svn_stream_printf(stream, scratch_pool,
"f%db%de%d: %d %s\n",
- family->fid, branch->sibling_defn->bid, eid,
+ family->fid, branch->sibling_defn->bsid, eid,
parent_eid, name));
}
return SVN_NO_ERROR;
@@ -1258,10 +1258,10 @@ svn_branch_family_serialize(svn_stream_t
SVN_ARRAY_PUSH(branch_instances) = bi->val;
SVN_ERR(svn_stream_printf(stream, scratch_pool,
- "f%d: bids %d %d eids %d %d "
+ "f%d: bsids %d %d eids %d %d "
"parent-fid %d b-instances %d\n",
family->fid,
- family->first_bid, family->next_bid,
+ family->first_bsid, family->next_bsid,
family->first_eid, family->next_eid,
parent_fid,
branch_instances->nelts));
@@ -1413,7 +1413,7 @@ svn_branch_branch_subtree_r(svn_branch_i
return svn_error_createf(SVN_ERR_BRANCHING, NULL,
_("cannot branch from b%d e%d: "
"does not exist"),
- from_branch->sibling_defn->bid, from_eid);
+ from_branch->sibling_defn->bsid, from_eid);
}
/* FROM_BRANCH must be an immediate child branch of TO_OUTER_BRANCH. */
@@ -1423,9 +1423,9 @@ svn_branch_branch_subtree_r(svn_branch_i
_("source and destination must be within same "
"outer branch; source is b%d inside b%d, "
"destination is in b%d"),
- from_branch->sibling_defn->bid,
- from_branch->outer_branch->sibling_defn->bid,
- to_outer_branch->sibling_defn->bid);
+ from_branch->sibling_defn->bsid,
+ from_branch->outer_branch->sibling_defn->bsid,
+ to_outer_branch->sibling_defn->bsid);
}
/* assign new eid to root node (outer branch) */
@@ -1553,9 +1553,9 @@ branch_branchify(svn_branch_instance_t *
svn_branch_el_rev_content_t *old_content;
SVN_DBG(("branchify(b%d e%d at ^/%s): new f%d b%d e%d",
- outer_branch->sibling_defn->bid, outer_eid,
+ outer_branch->sibling_defn->bsid, outer_eid,
svn_branch_get_rrpath_by_eid(outer_branch, outer_eid, scratch_pool),
- new_family->fid, new_branch_def->bid, new_branch_def->root_eid));
+ new_family->fid, new_branch_def->bsid, new_branch_def->root_eid));
/* create the new root element */
old_content = svn_branch_map_get(outer_branch, outer_eid);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c?rev=1664638&r1=1664637&r2=1664638&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Fri Mar 6 14:42:48 2015
@@ -881,7 +881,7 @@ editor3_add(void *baton,
eid = svn_branch_family_add_new_element(branch->sibling_defn->family);
SVN_DBG(("add(e%d): parent e%d, name '%s', kind %s",
- /*branch->sibling->bid,*/ eid, new_parent_eid,
+ /*branch->sibling->bsid,*/ eid, new_parent_eid,
new_name, svn_node_kind_to_word(new_content->kind)));
svn_branch_map_update(branch, eid, new_parent_eid, new_name, new_content);
@@ -901,7 +901,7 @@ editor3_instantiate(void *baton,
apr_pool_t *scratch_pool)
{
SVN_DBG(("add(e%d): parent e%d, name '%s', kind %s",
- /*branch->sibling->bid,*/ eid, new_parent_eid,
+ /*branch->sibling->bsid,*/ eid, new_parent_eid,
new_name, svn_node_kind_to_word(new_content->kind)));
svn_branch_map_update(branch, eid, new_parent_eid, new_name, new_content);
@@ -957,7 +957,7 @@ editor3_delete(void *baton,
apr_pool_t *scratch_pool)
{
SVN_DBG(("delete(b%d e%d)",
- branch->sibling_defn->bid, eid));
+ branch->sibling_defn->bsid, eid));
svn_branch_map_delete(branch, eid /* ### , since_rev? */);
@@ -976,7 +976,7 @@ editor3_alter(void *baton,
apr_pool_t *scratch_pool)
{
SVN_DBG(("alter(e%d): parent e%d, name '%s', kind %s",
- /*branch->sibling_defn->bid,*/ eid,
+ /*branch->sibling_defn->bsid,*/ eid,
new_parent_eid,
new_name ? new_name : "(same)",
new_content ? svn_node_kind_to_word(new_content->kind) : "(same)"));
@@ -1028,12 +1028,12 @@ convert_branch_to_paths(apr_hash_t *path
result_pool);
svn_hash_sets(paths, rrpath, ba);
/*SVN_DBG(("branch-to-path[%d]: b%d e%d -> %s",
- i, branch->sibling_defn->bid, eid, rrpath));*/
+ i, branch->sibling_defn->bsid, eid, rrpath));*/
}
else
{
SVN_DBG(("branch-to-path: b%d e%d -> <already present; not overwriting> (%s)",
- branch->sibling_defn->bid, eid, rrpath));
+ branch->sibling_defn->bsid, eid, rrpath));
}
}
}
@@ -1054,7 +1054,7 @@ convert_branch_to_paths_r(apr_hash_t *pa
SVN_ITER_T(svn_branch_instance_t) *bi;
/*SVN_DBG(("[%d] branch={b%de%d at '%s'}", idx,
- branch->sibling_defn->bid, branch->sibling_defn->root_eid, branch->branch_root_rrpath));*/
+ branch->sibling_defn->bsid, branch->sibling_defn->root_eid, branch->branch_root_rrpath));*/
convert_branch_to_paths(paths_union, branch,
result_pool, scratch_pool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c?rev=1664638&r1=1664637&r2=1664638&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c Fri Mar 6 14:42:48 2015
@@ -425,7 +425,7 @@ el_rev_str(const svn_branch_el_rev_id_t
apr_pool_t *result_pool)
{
return apr_psprintf(result_pool, "r%ldb%de%d",
- el_rev->rev, el_rev->branch->sibling_defn->bid, el_rev->eid);
+ el_rev->rev, el_rev->branch->sibling_defn->bsid, el_rev->eid);
}
/* Return a human-readable string representation of EID. */
@@ -687,8 +687,8 @@ svn_branch_subtree_differences(apr_hash_
int e;
/*SVN_DBG(("branch_element_differences(b%d r%ld, b%d r%ld, e%d)",
- left->branch->sibling->bid, left->rev,
- right->branch->sibling->bid, right->rev, right->eid));*/
+ left->branch->sibling->bsid, left->rev,
+ right->branch->sibling->bsid, right->rev, right->eid));*/
SVN_ERR_ASSERT(BRANCHES_IN_SAME_FAMILY(left->branch, right->branch));
SVN_ERR_ASSERT(BRANCH_FAMILY_HAS_ELEMENT(left->branch, left->eid));
SVN_ERR_ASSERT(BRANCH_FAMILY_HAS_ELEMENT(left->branch, right->eid));
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=1664638&r1=1664637&r2=1664638&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 Mar 6 14:42:48 2015
@@ -593,7 +593,7 @@ svn_error_t *svn_ra_rev_prop(svn_ra_sess
/* The default branching metadata for a new repository. */
static const char *default_repos_info
= "r0: fids 0 1 root-fid 0\n"
- "f0: bids 0 1 eids 0 1 parent-fid -1 b-instances 1\n"
+ "f0: bsids 0 1 eids 0 1 parent-fid -1 b-instances 1\n"
"f0b0: root-eid 0 at .\n"
"f0b0e0: -1 .\n";
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1664638&r1=1664637&r2=1664638&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Fri Mar 6 14:42:48 2015
@@ -422,9 +422,9 @@ family_list_branch_instances(svn_branch_
if (verbose)
{
- printf("family %d (BIDs %d:%d, EIDs %d:%d)\n",
+ printf("family %d (BSIDs %d:%d, EIDs %d:%d)\n",
family->fid,
- family->first_bid, family->next_bid,
+ family->first_bsid, family->next_bsid,
family->first_eid, family->next_eid);
}
else
@@ -440,9 +440,9 @@ family_list_branch_instances(svn_branch_
if (verbose)
{
- printf(" branch %s bid=%d root=e%d /%s\n",
+ printf(" branch %s bsid=%d root=e%d /%s\n",
svn_branch_instance_get_id(branch, bi->iterpool),
- branch->sibling_defn->bid, branch->sibling_defn->root_eid,
+ branch->sibling_defn->bsid, branch->sibling_defn->root_eid,
svn_branch_get_root_rrpath(branch, bi->iterpool));
SVN_ERR(list_branch_elements(branch, bi->iterpool));
}
@@ -680,13 +680,13 @@ branch_merge_subtree_r(svn_editor3_t *ed
SVN_DBG(("merge src: r%2ld f%d b%2d e%3d",
src->rev, src->branch->sibling_defn->family->fid,
- src->branch->sibling_defn->bid, src->eid));
+ src->branch->sibling_defn->bsid, src->eid));
SVN_DBG(("merge tgt: r%2ld f%d b%2d e%3d",
tgt->rev, tgt->branch->sibling_defn->family->fid,
- tgt->branch->sibling_defn->bid, tgt->eid));
+ tgt->branch->sibling_defn->bsid, tgt->eid));
SVN_DBG(("merge yca: r%2ld f%d b%2d e%3d",
yca->rev, yca->branch->sibling_defn->family->fid,
- yca->branch->sibling_defn->bid, yca->eid));
+ yca->branch->sibling_defn->bsid, yca->eid));
/*
for (eid, diff1) in element_differences(YCA, FROM):
@@ -1172,9 +1172,9 @@ svn_branch_diff_r(svn_editor3_t *editor,
for (hi = apr_hash_first(scratch_pool, subbranches_all);
hi; hi = apr_hash_next(hi))
{
- const char *bid = apr_hash_this_key(hi);
- svn_branch_instance_t *branch_l = svn_hash_gets(subbranches_l, bid);
- svn_branch_instance_t *branch_r = svn_hash_gets(subbranches_r, bid);
+ const char *branch_id = apr_hash_this_key(hi);
+ svn_branch_instance_t *branch_l = svn_hash_gets(subbranches_l, branch_id);
+ svn_branch_instance_t *branch_r = svn_hash_gets(subbranches_r, branch_id);
svn_branch_el_rev_id_t *sub_left = NULL, *sub_right = NULL;
if (branch_l)
@@ -1309,7 +1309,7 @@ svn_branch_revision_root_find_branch_by_
}
SVN_DBG(("branch found: f%db%de%d at '/%s'",
branch->sibling_defn->family->fid,
- branch->sibling_defn->bid,
+ branch->sibling_defn->bsid,
branch->sibling_defn->root_eid,
svn_branch_get_root_rrpath(branch, scratch_pool)));
return branch;