Author: julianfoad
Date: Thu Jun 25 22:05:24 2015
New Revision: 1687656
URL: http://svn.apache.org/r1687656
Log:
On the 'move-tracking-2' branch: Fix a branch id error.
* subversion/svnmover/svnmover.c
(flat_branch_get_subbranch_at_eid): Correctly construct the
branch id of a subbranch.
(branch_merge_subtree_r): In debug prints, remove a redundant 'b'
prefix before branch id.
Modified:
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
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=1687656&r1=1687655&r2=1687656&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Thu Jun
25 22:05:24 2015
@@ -720,8 +720,7 @@ flat_branch_get_subbranch_at_eid(flat_br
svn_branch_subtree_get_path_by_eid(fb->s, eid,
result_pool),
result_pool);
- bid = fb->bid ? apr_psprintf(result_pool, "B%d", eid)
- : apr_psprintf(result_pool, "%s.%d", fb->bid, eid);
+ bid = apr_psprintf(result_pool, "%s.%d", fb->bid, eid);
sub_fb = flat_branch_create(s, rrpath, bid, result_pool);
return sub_fb;
}
@@ -1428,13 +1427,13 @@ branch_merge_subtree_r(svn_editor3_t *ed
SVN_ERR_ASSERT(src->eid == tgt->eid);
SVN_ERR_ASSERT(src->eid == yca->eid);
- SVN_DBG(("merge src: r%2ld b%s e%3d",
+ SVN_DBG(("merge src: r%2ld %s e%3d",
src->rev,
svn_branch_get_id(src->branch, scratch_pool), src->eid));
- SVN_DBG(("merge tgt: r%2ld b%s e%3d",
+ SVN_DBG(("merge tgt: r%2ld %s e%3d",
tgt->rev,
svn_branch_get_id(tgt->branch, scratch_pool), tgt->eid));
- SVN_DBG(("merge yca: r%2ld b%s e%3d",
+ SVN_DBG(("merge yca: r%2ld %s e%3d",
yca->rev,
svn_branch_get_id(yca->branch, scratch_pool), yca->eid));
