You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/07/09 00:03:14 UTC
svn commit: r1144523 - in /subversion/branches/revprop-packing: ./
subversion/include/private/ subversion/libsvn_fs_fs/ subversion/libsvn_subr/
Author: danielsh
Date: Fri Jul 8 22:03:14 2011
New Revision: 1144523
URL: http://svn.apache.org/viewvc?rev=1144523&view=rev
Log:
On the revprop-packing branch, merge r1144488,r1144494,r1144502 from trunk.
Some semantic changes to fs.h were record-only merged, since that's where the branch
diverges 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/structure
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 Fri Jul 8 22:03:14 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-1143899
+/subversion/trunk:1143817-1143899,1144488,1144494,1144502
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 22:03:14 2011
@@ -43,3 +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:1144488,1144494,1144502
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 22:03:14 2011
@@ -52,3 +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:1144488,1144494,1144502
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 22:03:14 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301
+/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1144488,1144494,1144502
Modified: subversion/branches/revprop-packing/subversion/libsvn_fs_fs/structure
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/libsvn_fs_fs/structure?rev=1144523&r1=1144522&r2=1144523&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/libsvn_fs_fs/structure (original)
+++ subversion/branches/revprop-packing/subversion/libsvn_fs_fs/structure Fri Jul 8 22:03:14 2011
@@ -233,6 +233,8 @@ character.
Packing revision properties (format 5: SQLite)
---------------------------
+
+This was supported by 1.7-dev builds but never included in a blessed release.
See r1143829 of this file:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/structure?view=markup&pathrev=1143829
Propchange: subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 22:03:14 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1144488,1144494,1144502
Propchange: subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 22:03:14 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1144488,1144494,1144502
Propchange: subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 22:03:14 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/trunk/subversion/libsvn_subr/adler32.c:1144488,1144494,1144502
Propchange: subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 8 22:03:14 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301
+/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1144488,1144494,1144502