Author: artagnon
Date: Mon Oct 4 15:36:03 2010
New Revision: 1004291
URL: http://svn.apache.org/viewvc?rev=1004291&view=rev
Log:
Block r1004286 from being merged into the performance branch to avoid a cyclic
merge
Modified:
subversion/branches/performance/ (props changed)
subversion/branches/performance/subversion/include/private/svn_file_handle_cache.h
(props changed)
subversion/branches/performance/subversion/include/private/svn_temp_serializer.h
(props changed)
subversion/branches/performance/subversion/libsvn_fs_fs/temp_serializer.c
(props changed)
subversion/branches/performance/subversion/libsvn_fs_fs/temp_serializer.h
(props changed)
subversion/branches/performance/subversion/libsvn_fs_util/caching.c
(props changed)
subversion/branches/performance/subversion/libsvn_subr/svn_file_handle_cache.c
(props changed)
subversion/branches/performance/subversion/libsvn_subr/svn_temp_serializer.c
(props changed)
Propchange: subversion/branches/performance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 15:36:03 2010
@@ -37,4 +37,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:962911-995462,995465-999095,999111-1001415
+/subversion/trunk:962911-995462,995465-999095,999111-1001415,1004286
Propchange:
subversion/branches/performance/subversion/include/private/svn_file_handle_cache.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 15:36:03 2010
@@ -1 +1 @@
-/subversion/trunk/subversion/include/private/svn_file_handle_cache.h:962911-995462
+/subversion/trunk/subversion/include/private/svn_file_handle_cache.h:962911-995462,1004286
Propchange:
subversion/branches/performance/subversion/include/private/svn_temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 15:36:03 2010
@@ -1 +1 @@
-/subversion/trunk/subversion/include/private/svn_temp_serializer.h:962911-995462
+/subversion/trunk/subversion/include/private/svn_temp_serializer.h:962911-995462,1004286
Propchange:
subversion/branches/performance/subversion/libsvn_fs_fs/temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 15:36:03 2010
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:962911-995462
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:962911-995462,1004286
Propchange:
subversion/branches/performance/subversion/libsvn_fs_fs/temp_serializer.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 15:36:03 2010
@@ -34,4 +34,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_fs_fs/fs_fs.h:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_fs_fs/fs_fs.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_fs_fs/fs_fs.h:873926-874008
-/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:962911-995462
+/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:962911-995462,1004286
Propchange: subversion/branches/performance/subversion/libsvn_fs_util/caching.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 15:36:03 2010
@@ -34,4 +34,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_fs/caching.c:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_fs/caching.c:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_fs/caching.c:873926-874008
-/subversion/trunk/subversion/libsvn_fs_util/caching.c:962911-995462
+/subversion/trunk/subversion/libsvn_fs_util/caching.c:962911-995462,1004286
Propchange:
subversion/branches/performance/subversion/libsvn_subr/svn_file_handle_cache.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 15:36:03 2010
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_subr/svn_file_handle_cache.c:962911-995462
+/subversion/trunk/subversion/libsvn_subr/svn_file_handle_cache.c:962911-995462,1004286
Propchange:
subversion/branches/performance/subversion/libsvn_subr/svn_temp_serializer.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 4 15:36:03 2010
@@ -1 +1 @@
-/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:962911-995462
+/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:962911-995462,1004286
