Author: julianfoad
Date: Wed Jun 3 13:09:43 2015
New Revision: 1683318
URL: http://svn.apache.org/r1683318
Log:
On the 'move-tracking-2' branch: Fix an inconsistency in branch-id displays.
* subversion/svnmover/svnmover.c
(flat_branch_get_subbranch_at_eid): Treat branch 0 specially when
constructing a 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=1683318&r1=1683317&r2=1683318&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Jun
3 13:09:43 2015
@@ -688,7 +688,8 @@ flat_branch_get_subbranch_at_eid(flat_br
svn_branch_subtree_get_path_by_eid(fb->s, eid,
result_pool),
result_pool);
- bid = apr_psprintf(result_pool, "%s.%d", fb->bid, eid);
+ bid = fb->bid ? apr_psprintf(result_pool, "B%d", eid)
+ : apr_psprintf(result_pool, "%s.%d", fb->bid, eid);
sub_fb = flat_branch_create(s, rrpath, bid, result_pool);
return sub_fb;
}
