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/10/21 11:53:24 UTC
svn commit: r1709782 -
/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Author: julianfoad
Date: Wed Oct 21 09:53:24 2015
New Revision: 1709782
URL: http://svn.apache.org/viewvc?rev=1709782&view=rev
Log:
On the 'move-tracking-2' branch: Fix a bug introduced in r1709777.
* subversion/libsvn_delta/branch.c
(branch_txn_open_branch): Ensure the new branch id output is always
provided (if requested), by avoiding an early return.
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
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=1709782&r1=1709781&r2=1709782&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Wed Oct 21 09:53:24 2015
@@ -149,13 +149,14 @@ branch_txn_open_branch(svn_branch_txn_t
if (new_branch)
{
SVN_ERR_ASSERT(root_eid == svn_branch_root_eid(new_branch));
- return SVN_NO_ERROR;
}
-
- new_branch = svn_branch_txn_add_new_branch(txn,
- new_branch_id,
- predecessor,
- root_eid, scratch_pool);
+ else
+ {
+ new_branch = svn_branch_txn_add_new_branch(txn,
+ new_branch_id,
+ predecessor,
+ root_eid, scratch_pool);
+ }
if (new_branch_id_p)
*new_branch_id_p = new_branch_id;