Author: danielsh
Date: Tue Jul 12 18:56:59 2011
New Revision: 1145720
URL: http://svn.apache.org/viewvc?rev=1145720&view=rev
Log:
On the revprop-packing branch, block merging r1145670 from trunk.
Modified:
subversion/branches/revprop-packing/ (props changed)
subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h
(props changed)
subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h
(props changed)
subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h
(props changed)
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c
(props changed)
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h
(props changed)
subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c
(props changed)
subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c
(props changed)
Propchange: subversion/branches/revprop-packing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 18:56:59 2011
@@ -52,4 +52,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1143817-1144579,1145515,1145519
+/subversion/trunk:1143817-1144579,1145515,1145519,1145670
Propchange:
subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 18:56:59 2011
@@ -43,4 +43,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_diff/diff.h:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_diff/diff.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_diff/diff.h:873926-874008
-/subversion/trunk/subversion/include/private/svn_adler32.h:1143817-1144579,1145515,1145519
+/subversion/trunk/subversion/include/private/svn_adler32.h:1143817-1144579,1145515,1145519,1145670
Propchange:
subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 18:56:59 2011
@@ -52,4 +52,4 @@
/subversion/branches/tree-conflicts/subversion/include/svn_string.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/include/svn_string.h:873926-874008
/subversion/branches/uris-as-urls/subversion/include/svn_string.h:1060426-1064427
-/subversion/trunk/subversion/include/private/svn_string_private.h:1143817-1144579,1145515,1145519
+/subversion/trunk/subversion/include/private/svn_string_private.h:1143817-1144579,1145515,1145519,1145670
Propchange:
subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 18:56:59 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1143817-1144579,1145515,1145519
+/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1143817-1144579,1145515,1145519,1145670
Propchange:
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 18:56:59 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1143817-1144579,1145515,1145519
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1143817-1144579,1145515,1145519,1145670
Propchange:
subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 18:56:59 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1143817-1144579,1145515,1145519
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1143817-1144579,1145515,1145519,1145670
Propchange: subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 18:56:59 2011
@@ -1,4 +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/trunk/subversion/libsvn_subr/adler32.c:1143817-1144579,1145515,1145519
+/subversion/trunk/subversion/libsvn_subr/adler32.c:1143817-1144579,1145515,1145519,1145670
Propchange:
subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 18:56:59 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1143817-1144579,1145515,1145519
+/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1143817-1144579,1145515,1145519,1145670
