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/20 18:27:18 UTC
svn commit: r1709638 -
/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Author: julianfoad
Date: Tue Oct 20 16:27:17 2015
New Revision: 1709638
URL: http://svn.apache.org/viewvc?rev=1709638&view=rev
Log:
On the 'move-tracking-2' branch: Re-apply a fix made in r1708949 and lost in
r1708994.
* subversion/libsvn_delta/branch.c
(branch_txn_open_branch): Don't assert what isn't always true.
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=1709638&r1=1709637&r2=1709638&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Tue Oct 20 16:27:17 2015
@@ -147,8 +147,6 @@ branch_txn_open_branch(svn_branch_txn_t
= svn_branch_txn_get_branch_by_id(txn, *new_branch_id_p, scratch_pool);
if (new_branch)
{
- SVN_ERR_ASSERT(predecessor->rev == new_branch->predecessor->rev);
- SVN_ERR_ASSERT(strcmp(predecessor->bid, new_branch->predecessor->bid) == 0);
SVN_ERR_ASSERT(root_eid == svn_branch_root_eid(new_branch));
return SVN_NO_ERROR;
}