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 2013/06/29 21:52:35 UTC
svn commit: r1498008 -
/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c
Author: stefan2
Date: Sat Jun 29 19:15:04 2013
New Revision: 1498008
URL: http://svn.apache.org/r1498008
Log:
On the fsfs-format7 branch: Fix the detection / storage of the copyroot
information in noderevs containers. The copyroot information is valid
iff the copyroot path is not NULL.
* subversion/libsvn_fs_fs/noderevs.c
(svn_fs_fs__noderevs_add): use path to check for presense of copyroot
Modified:
subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c?rev=1498008&r1=1498007&r2=1498008&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c Sat Jun 29 19:15:04 2013
@@ -296,7 +296,7 @@ svn_fs_fs__noderevs_add(svn_fs_fs__noder
binary_noderev.flags = (noderev->has_mergeinfo ? NODEREV_HAS_MINFO : 0)
| (noderev->copyfrom_path ? NODEREV_HAS_COPYFROM : 0)
- | (noderev->copyroot_rev ? NODEREV_HAS_COPYROOT : 0)
+ | (noderev->copyroot_path ? NODEREV_HAS_COPYROOT : 0)
| (noderev->created_path ? NODEREV_HAS_CPATH : 0)
| (int)noderev->kind;
@@ -314,7 +314,7 @@ svn_fs_fs__noderevs_add(svn_fs_fs__noder
binary_noderev.copyfrom_rev = noderev->copyfrom_rev;
}
- if (noderev->copyroot_rev)
+ if (noderev->copyroot_path)
{
binary_noderev.copyroot_path
= svn_fs_fs__string_table_builder_add(container->builder,