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/05/12 18:10:23 UTC
svn commit: r1481591 -
/subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c
Author: stefan2
Date: Sun May 12 16:10:23 2013
New Revision: 1481591
URL: http://svn.apache.org/r1481591
Log:
On the fsfs-format7 branch: fix copy'n'pastos that resulted in wrong
copyfrom and copyroot revs in noderev containers.
* subversion/libsvn_fs_fs/noderevs.c
(svn_fs_fs__noderevs_get,
svn_fs_fs__noderevs_get_func): actually set copyfrom_rev
(svn_fs_fs__write_noderevs_container,
svn_fs_fs__read_noderevs_container): read & write copyroot_rev
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=1481591&r1=1481590&r2=1481591&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_fs/noderevs.c Sun May 12 16:10:23 2013
@@ -486,7 +486,7 @@ svn_fs_fs__noderevs_get(node_revision_t
= svn_fs_fs__string_table_get(container->paths,
binary_noderev->copyfrom_path,
pool);
- noderev->copyroot_rev = binary_noderev->copyfrom_rev;
+ noderev->copyfrom_rev = binary_noderev->copyfrom_rev;
}
else
{
@@ -658,7 +658,7 @@ svn_fs_fs__write_noderevs_container(svn_
svn_packed__add_uint(noderevs_stream, noderev->copyfrom_path);
svn_packed__add_uint(noderevs_stream, noderev->copyfrom_rev);
svn_packed__add_uint(noderevs_stream, noderev->copyroot_path);
- svn_packed__add_uint(noderevs_stream, noderev->copyroot_path);
+ svn_packed__add_uint(noderevs_stream, noderev->copyroot_rev);
svn_packed__add_uint(noderevs_stream, noderev->prop_rep);
svn_packed__add_uint(noderevs_stream, noderev->data_rep.representation);
@@ -817,7 +817,7 @@ svn_fs_fs__read_noderevs_container(svn_f
noderev.copyfrom_path = svn_packed__get_uint(noderevs_stream);
noderev.copyfrom_rev = svn_packed__get_uint(noderevs_stream);
noderev.copyroot_path = svn_packed__get_uint(noderevs_stream);
- noderev.copyroot_path = svn_packed__get_uint(noderevs_stream);
+ noderev.copyroot_rev = svn_packed__get_uint(noderevs_stream);
noderev.prop_rep = svn_packed__get_uint(noderevs_stream);
noderev.data_rep.representation = svn_packed__get_uint(noderevs_stream);
@@ -958,7 +958,7 @@ svn_fs_fs__noderevs_get_func(void **out,
= svn_fs_fs__string_table_get_func(paths,
binary_noderev->copyfrom_path,
pool);
- noderev->copyroot_rev = binary_noderev->copyfrom_rev;
+ noderev->copyfrom_rev = binary_noderev->copyfrom_rev;
}
else
{