Author: danielsh
Date: Thu Jul 7 20:30:19 2011
New Revision: 1144023
URL: http://svn.apache.org/viewvc?rev=1144023&view=rev
Log:
Merge r1144017 from the revprop-packing branch, as that revision
was intended for trunk:
* subversion/libsvn_repos/load-fs-vtable.c
(prefix_mergeinfo_paths): Point to the duplicate of this function in svnrdump.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/include/private/svn_adler32.h (props changed)
subversion/trunk/subversion/include/private/svn_string_private.h (props
changed)
subversion/trunk/subversion/include/private/svn_temp_serializer.h (props
changed)
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (props changed)
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h (props changed)
subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
subversion/trunk/subversion/libsvn_subr/adler32.c (props changed)
subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c (props
changed)
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 20:30:19 2011
@@ -39,6 +39,7 @@
/subversion/branches/py-tests-as-modules:956579-1033052
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/revprop-packing:1144017
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements:918519-934609
Propchange: subversion/trunk/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 20:30:19 2011
@@ -31,6 +31,7 @@
/subversion/branches/py-tests-as-modules/subversion/libsvn_diff/diff.h:956579-1033052
/subversion/branches/ra_serf-digest-authn/subversion/libsvn_diff/diff.h:875693-876404
/subversion/branches/reintegrate-improvements/subversion/libsvn_diff/diff.h:873853-874164
+/subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h:1144017
/subversion/branches/subtree-mergeinfo/subversion/libsvn_diff/diff.h:876734-878766
/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_diff/diff.h:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements/subversion/libsvn_diff/diff.h:918519-934609
Propchange: subversion/trunk/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 20:30:19 2011
@@ -39,6 +39,7 @@
/subversion/branches/py-tests-as-modules/subversion/include/svn_string.h:956579-1033052
/subversion/branches/ra_serf-digest-authn/subversion/include/svn_string.h:875693-876404
/subversion/branches/reintegrate-improvements/subversion/include/svn_string.h:873853-874164
+/subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h:1144017
/subversion/branches/subtree-mergeinfo/subversion/include/svn_string.h:876734-878766
/subversion/branches/svn-mergeinfo-enhancements/subversion/include/svn_string.h:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements/subversion/include/svn_string.h:918519-934609
Propchange: subversion/trunk/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 20:30:19 2011
@@ -1 +1,2 @@
+/subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h:1144017
/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301
Propchange: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 20:30:19 2011
@@ -1 +1,2 @@
+/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c:1144017
/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301
Propchange: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 20:30:19 2011
@@ -1 +1,2 @@
+/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h:1144017
/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301
Modified: subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c?rev=1144023&r1=1144022&r2=1144023&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c Thu Jul 7
20:30:19 2011
@@ -181,6 +181,8 @@ change_node_prop(svn_fs_root_t *txn_root
/* Prepend the mergeinfo source paths in MERGEINFO_ORIG with PARENT_DIR, and
return it in *MERGEINFO_VAL. */
+/* ### FIXME: Consider somehow sharing code with
+ ### svnrdump/load_editor.c:prefix_mergeinfo_paths() */
static svn_error_t *
prefix_mergeinfo_paths(svn_string_t **mergeinfo_val,
const svn_string_t *mergeinfo_orig,
Propchange: subversion/trunk/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 20:30:19 2011
@@ -1,3 +1,4 @@
/subversion/branches/diff-optimizations/subversion/libsvn_subr/adler32.c:1031270-1037352
/subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c:1037353-1067789
/subversion/branches/performance/subversion/libsvn_subr/adler32.c:1067697-1078365
+/subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c:1144017
Propchange: subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 7 20:30:19 2011
@@ -1 +1,2 @@
+/subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c:1144017
/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301
