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/05/05 16:23:18 UTC
svn commit: r1677833 -
/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Author: julianfoad
Date: Tue May 5 14:23:18 2015
New Revision: 1677833
URL: http://svn.apache.org/r1677833
Log:
On the 'move-tracking-2' branch: Fix printing of subbranch ids, and remove
redundant code, following r1677827.
* subversion/svnmover/svnmover.c
(flat_branch_get_subbranch_at_eid): Remove redundant code.
(flat_branch_subbranch_str): Print the id of the subbranch, not the parent.
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=1677833&r1=1677832&r2=1677833&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Tue May 5 14:23:18 2015
@@ -426,8 +426,6 @@ flat_branch_get_subbranch_at_eid(flat_br
if (! s)
return NULL;
- sub_fb = apr_pcalloc(result_pool, sizeof(*sub_fb));
- sub_fb->s = s;
rrpath = svn_relpath_join(fb->rrpath,
svn_branch_subtree_get_path_by_eid(fb->s, eid,
result_pool),
@@ -494,7 +492,7 @@ flat_branch_subbranch_str(flat_branch_t
if (subbranch)
return apr_psprintf(result_pool,
- " (branch %s)", fb->bid);
+ " (branch %s)", subbranch->bid);
return "";
}