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/12 12:13:24 UTC
svn commit: r1145522 - in /subversion/branches/revprop-packing: ./
subversion/include/private/ subversion/libsvn_fs_fs/
subversion/libsvn_subr/ subversion/tests/cmdline/svntest/
Author: danielsh
Date: Tue Jul 12 10:13:24 2011
New Revision: 1145522
URL: http://svn.apache.org/viewvc?rev=1145522&view=rev
Log:
Track rename of the --pre-1.7-compatible option.
This record-only-merges r1145519 from trunk, which removed the option there
prior to the 1.7.0 release. (See also r1145515.)
The test harness has to allow SERVER_MINOR_VERSION=7, as that is used for the
server_has_atomic_revprop() helper. It may or may not accept
SERVER_MINOR_VERSION=8 at this time, but if it doesn't then that should be
fixed (eventually) on trunk, rather than on this branch.
* subversion/tests/cmdline/svntest/main.py
(create_repos): Track rename.
(server_has_fsfs_revprop_packing): New, unused.
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)
subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py
Propchange: subversion/branches/revprop-packing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:13:24 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
+/subversion/trunk:1143817-1144579,1145515,1145519
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:13:24 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
+/subversion/trunk/subversion/include/private/svn_adler32.h:1143817-1144579,1145515,1145519
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:13:24 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
+/subversion/trunk/subversion/include/private/svn_string_private.h:1143817-1144579,1145515,1145519
Propchange: subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:13:24 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1143817-1144579,1145515
+/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1143817-1144579,1145515,1145519
Propchange: subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:13:24 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1143817-1144579,1145515
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1143817-1144579,1145515,1145519
Propchange: subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:13:24 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1143817-1144579,1145515
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1143817-1144579,1145515,1145519
Propchange: subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:13:24 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
+/subversion/trunk/subversion/libsvn_subr/adler32.c:1143817-1144579,1145515,1145519
Propchange: subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 10:13:24 2011
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1143817-1144579,1145515
+/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1143817-1144579,1145515,1145519
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py?rev=1145522&r1=1145521&r2=1145522&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py Tue Jul 12 10:13:24 2011
@@ -759,8 +759,8 @@ def create_repos(path):
opts += ("--pre-1.5-compatible",)
elif options.server_minor_version < 6:
opts += ("--pre-1.6-compatible",)
- elif options.server_minor_version < 7:
- opts += ("--pre-1.7-compatible",)
+ elif options.server_minor_version < 8:
+ opts += ("--pre-1.8-compatible",)
if options.fs_type is not None:
opts += ("--fs-type=" + options.fs_type,)
exit_code, stdout, stderr = run_command(svnadmin_binary, 1, 0, "create",
@@ -1135,6 +1135,9 @@ def server_enforces_date_syntax():
def server_has_atomic_revprop():
return options.server_minor_version >= 7
+def server_has_fsfs_revprop_packing():
+ return options.server_minor_version >= 8
+
######################################################################