You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/03/07 17:54:06 UTC
svn commit: r1575323 - /subversion/trunk/subversion/libsvn_fs_x/transaction.c
Author: stefan2
Date: Fri Mar 7 16:54:06 2014
New Revision: 1575323
URL: http://svn.apache.org/r1575323
Log:
* subversion/libsvn_fs_x/transaction.c
(create_new_txn_noderev_from_rev): Since roots may get copied, we need to
verify that the must-be root is no copy.
Modified:
subversion/trunk/subversion/libsvn_fs_x/transaction.c
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1575323&r1=1575322&r2=1575323&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Mar 7 16:54:06 2014
@@ -941,7 +941,8 @@ create_new_txn_noderev_from_rev(svn_fs_t
SVN_ERR(svn_fs_x__get_node_revision(&noderev, fs, src, pool));
/* This must be a root node. */
- SVN_ERR_ASSERT(svn_fs_x__id_node_id(noderev->id)->number == 0);
+ SVN_ERR_ASSERT( svn_fs_x__id_node_id(noderev->id)->number == 0
+ && svn_fs_x__id_copy_id(noderev->id)->number == 0);
if (svn_fs_x__id_is_txn(noderev->id))
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,