You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/12/02 21:12:12 UTC
svn commit: r1041564 - in /subversion/branches/1.5.x: ./ build/ac-macros/
notes/tree-conflicts/ subversion/bindings/swig/ subversion/include/private/
subversion/libsvn_client/ subversion/libsvn_subr/ subversion/libsvn_wc/
subversion/tests/cmdline/svnte...
Author: hwright
Date: Thu Dec 2 20:12:11 2010
New Revision: 1041564
URL: http://svn.apache.org/viewvc?rev=1041564&view=rev
Log:
Reintegrate the 1.5.x-serf-config branch:
* 1.5.x-serf-config branch
Block Subversion from compiling with too-new serf versions.
Justification:
Prevent user confusion in the presence of incompatible serf installs.
Votes:
+1: peters, philip, cmpilato
Modified:
subversion/branches/1.5.x/ (props changed)
subversion/branches/1.5.x/CHANGES (props changed)
subversion/branches/1.5.x/COMMITTERS (props changed)
subversion/branches/1.5.x/STATUS
subversion/branches/1.5.x/build/ac-macros/serf.m4
subversion/branches/1.5.x/notes/tree-conflicts/scratch-pad.txt (props changed)
subversion/branches/1.5.x/subversion/bindings/swig/ (props changed)
subversion/branches/1.5.x/subversion/include/private/ (props changed)
subversion/branches/1.5.x/subversion/libsvn_client/merge.c (props changed)
subversion/branches/1.5.x/subversion/libsvn_subr/ (props changed)
subversion/branches/1.5.x/subversion/libsvn_wc/adm_ops.c (props changed)
subversion/branches/1.5.x/subversion/tests/cmdline/svntest/actions.py (props changed)
subversion/branches/1.5.x/www/images/subversion-diagram.png (props changed)
subversion/branches/1.5.x/www/images/subversion_logo-200x173.png (props changed)
subversion/branches/1.5.x/www/images/subversion_logo-384x332.png (props changed)
subversion/branches/1.5.x/www/images/subversion_logo_hor-468x64.png (props changed)
Propchange: subversion/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -26,6 +26,7 @@
/subversion/branches/1.5.x-ra_serf-backports:872354-872626
/subversion/branches/1.5.x-rb-test-fix:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements:874586-874922
+/subversion/branches/1.5.x-serf-config:1041544-1041563
/subversion/branches/1.5.x-tests-pass:870925-870973
/subversion/branches/issue-3220-dev:872210-872226
/subversion/branches/log-g-performance:870941-871032
Propchange: subversion/branches/1.5.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -26,6 +26,7 @@
/subversion/branches/1.5.x-ra_serf-backports/CHANGES:872354-872626
/subversion/branches/1.5.x-rb-test-fix/CHANGES:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/CHANGES:874586-874922
+/subversion/branches/1.5.x-serf-config/CHANGES:1041544-1041563
/subversion/branches/1.5.x-tests-pass/CHANGES:870925-870973
/subversion/branches/r30963-1.5.x/CHANGES:871056-871076
/subversion/branches/svn-mergeinfo-enhancements/CHANGES:870196
Propchange: subversion/branches/1.5.x/COMMITTERS
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -26,6 +26,7 @@
/subversion/branches/1.5.x-ra_serf-backports/COMMITTERS:872354-872626
/subversion/branches/1.5.x-rb-test-fix/COMMITTERS:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/COMMITTERS:874586-874922
+/subversion/branches/1.5.x-serf-config/COMMITTERS:1041544-1041563
/subversion/branches/1.5.x-tests-pass/COMMITTERS:870925-870973
/subversion/branches/r30963-1.5.x/COMMITTERS:871056-871076
/subversion/branches/svn-mergeinfo-enhancements/COMMITTERS:870196
Modified: subversion/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1041564&r1=1041563&r2=1041564&view=diff
==============================================================================
--- subversion/branches/1.5.x/STATUS (original)
+++ subversion/branches/1.5.x/STATUS Thu Dec 2 20:12:11 2010
@@ -160,10 +160,3 @@ Approved changes:
Votes:
+1: cmpilato, danielsh, rhuijben
-0: hwright (until such time as a backport branch exists)
-
- * 1.5.x-serf-config branch
- Block Subversion from compiling with too-new serf versions.
- Justification:
- Prevent user confusion in the presence of incompatible serf installs.
- Votes:
- +1: peters, philip, cmpilato
Modified: subversion/branches/1.5.x/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/build/ac-macros/serf.m4?rev=1041564&r1=1041563&r2=1041564&view=diff
==============================================================================
--- subversion/branches/1.5.x/build/ac-macros/serf.m4 (original)
+++ subversion/branches/1.5.x/build/ac-macros/serf.m4 Thu Dec 2 20:12:11 2010
@@ -19,10 +19,18 @@ AC_DEFUN(SVN_LIB_SERF,
serf_prefix=$withval
save_cppflags="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/serf-0"
+ AC_MSG_CHECKING([supported Serf version])
AC_CHECK_HEADERS(serf.h,[
save_ldflags="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
- AC_CHECK_LIB(serf-0, serf_context_create,[serf_found="yes"])
+ AC_CHECK_LIB(serf-0, serf_context_create,[
+ AC_COMPILE_IFELSE([
+#include <serf.h>
+#if SERF_MAJOR_VERSION > 0 || SERF_MINOR_VERSION > 3
+#error serf version too new, we only support 0.3.x and below
+#endif
+ ],[serf_found="yes"],
+ [AC_MSG_ERROR([only serf versions up to 0.3.x supported])])])
LDFLAGS="$save_ldflags"])
CPPFLAGS="$save_cppflags"
fi
Propchange: subversion/branches/1.5.x/notes/tree-conflicts/scratch-pad.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -14,5 +14,6 @@
/subversion/branches/1.5.x-r37169/notes/tree-conflicts/scratch-pad.txt:877272-878304
/subversion/branches/1.5.x-rb-test-fix/notes/tree-conflicts/scratch-pad.txt:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/notes/tree-conflicts/scratch-pad.txt:874586-874922
+/subversion/branches/1.5.x-serf-config/notes/tree-conflicts/scratch-pad.txt:1041544-1041563
/subversion/trunk/libsvn_subr:876953
/subversion/trunk/notes/tree-conflicts/scratch-pad.txt:836421-867527,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,877842,878673,878682,879293,880082,1000038,1000060,1022675,1032808,1033166,1038163,1041083,1041438
Propchange: subversion/branches/1.5.x/subversion/bindings/swig/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -26,6 +26,7 @@
/subversion/branches/1.5.x-ra_serf-backports/subversion/bindings/swig:872354-872626
/subversion/branches/1.5.x-rb-test-fix/subversion/bindings/swig:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/subversion/bindings/swig:874586-874922
+/subversion/branches/1.5.x-serf-config/subversion/bindings/swig:1041544-1041563
/subversion/branches/1.5.x-tests-pass/subversion/bindings/swig:870925-870973
/subversion/branches/log-g-performance/subversion/bindings/swig:870941-871032
/subversion/branches/r30963-1.5.x/subversion/bindings/swig:871056-871076
Propchange: subversion/branches/1.5.x/subversion/include/private/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -27,6 +27,7 @@
/subversion/branches/1.5.x-ra_serf-backports/subversion/include/private:872354-872626
/subversion/branches/1.5.x-rb-test-fix/subversion/include/private:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/subversion/include/private:874586-874922
+/subversion/branches/1.5.x-serf-config/subversion/include/private:1041544-1041563
/subversion/branches/1.5.x-tests-pass/subversion/include/private:870925-870973
/subversion/branches/issue-3220-dev/subversion/include/private:872210-872226
/subversion/branches/log-g-performance/subversion/include/private:870941-871032
Propchange: subversion/branches/1.5.x/subversion/libsvn_client/merge.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -26,6 +26,7 @@
/subversion/branches/1.5.x-ra_serf-backports/subversion/libsvn_client/merge.c:872354-872626
/subversion/branches/1.5.x-rb-test-fix/subversion/libsvn_client/merge.c:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/subversion/libsvn_client/merge.c:874586-874922
+/subversion/branches/1.5.x-serf-config/subversion/libsvn_client/merge.c:1041544-1041563
/subversion/branches/1.5.x-tests-pass/subversion/libsvn_client/merge.c:870925-870973
/subversion/branches/issue-3220-dev/subversion/libsvn_client/merge.c:872210-872226
/subversion/branches/log-g-performance/subversion/libsvn_client/merge.c:870941-871032
Propchange: subversion/branches/1.5.x/subversion/libsvn_subr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -27,6 +27,7 @@
/subversion/branches/1.5.x-ra_serf-backports/subversion/libsvn_subr:872354-872626
/subversion/branches/1.5.x-rb-test-fix/subversion/libsvn_subr:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/subversion/libsvn_subr:874586-874922
+/subversion/branches/1.5.x-serf-config/subversion/libsvn_subr:1041544-1041563
/subversion/branches/1.5.x-tests-pass/subversion/libsvn_subr:870925-870973
/subversion/branches/issue-3220-dev/subversion/libsvn_subr:872210-872226
/subversion/branches/log-g-performance/subversion/libsvn_subr:870941-871032
Propchange: subversion/branches/1.5.x/subversion/libsvn_wc/adm_ops.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -26,6 +26,7 @@
/subversion/branches/1.5.x-ra_serf-backports/subversion/libsvn_wc/adm_ops.c:872354-872626
/subversion/branches/1.5.x-rb-test-fix/subversion/libsvn_wc/adm_ops.c:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/subversion/libsvn_wc/adm_ops.c:874586-874922
+/subversion/branches/1.5.x-serf-config/subversion/libsvn_wc/adm_ops.c:1041544-1041563
/subversion/branches/1.5.x-tests-pass/subversion/libsvn_wc/adm_ops.c:870925-870973
/subversion/branches/issue-3220-dev/subversion/libsvn_wc/adm_ops.c:872210-872226
/subversion/branches/log-g-performance/subversion/libsvn_wc/adm_ops.c:870941-871032
Propchange: subversion/branches/1.5.x/subversion/tests/cmdline/svntest/actions.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -26,6 +26,7 @@
/subversion/branches/1.5.x-ra_serf-backports/subversion/tests/cmdline/svntest/actions.py:872354-872626
/subversion/branches/1.5.x-rb-test-fix/subversion/tests/cmdline/svntest/actions.py:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py:874586-874922
+/subversion/branches/1.5.x-serf-config/subversion/tests/cmdline/svntest/actions.py:1041544-1041563
/subversion/branches/1.5.x-tests-pass/subversion/tests/cmdline/svntest/actions.py:870925-870973
/subversion/branches/issue-3220-dev/subversion/tests/cmdline/svntest/actions.py:872210-872226
/subversion/branches/log-g-performance/subversion/tests/cmdline/svntest/actions.py:870941-871032
Propchange: subversion/branches/1.5.x/www/images/subversion-diagram.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -14,5 +14,6 @@
/subversion/branches/1.5.x-r37169/www/images/subversion-diagram.png:877272-878304
/subversion/branches/1.5.x-rb-test-fix/www/images/subversion-diagram.png:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png:874586-874922
+/subversion/branches/1.5.x-serf-config/www/images/subversion-diagram.png:1041544-1041563
/subversion/trunk/MITTERS:876953
/subversion/trunk/www/images/subversion-diagram.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,877842,878673,878682,879293,880082,1000038,1000060,1022675,1032808,1033166,1038163,1041083,1041438
Propchange: subversion/branches/1.5.x/www/images/subversion_logo-200x173.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -14,5 +14,6 @@
/subversion/branches/1.5.x-r37169/www/images/subversion_logo-200x173.png:877272-878304
/subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo-200x173.png:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png:874586-874922
+/subversion/branches/1.5.x-serf-config/www/images/subversion_logo-200x173.png:1041544-1041563
/subversion/trunk/384x332.png:876953
/subversion/trunk/www/images/subversion_logo-200x173.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,877842,878673,878682,879293,880082,1000038,1000060,1022675,1032808,1033166,1038163,1041083,1041438
Propchange: subversion/branches/1.5.x/www/images/subversion_logo-384x332.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -14,4 +14,5 @@
/subversion/branches/1.5.x-r37169/www/images/subversion_logo-384x332.png:877272-878304
/subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo-384x332.png:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png:874586-874922
+/subversion/branches/1.5.x-serf-config/www/images/subversion_logo-384x332.png:1041544-1041563
/subversion/trunk/www/images/subversion_logo-384x332.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,877842,878673,878682,879293,880082,1000038,1000060,1022675,1032808,1033166,1038163,1041083,1041438
Propchange: subversion/branches/1.5.x/www/images/subversion_logo_hor-468x64.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 2 20:12:11 2010
@@ -14,5 +14,6 @@
/subversion/branches/1.5.x-r37169/www/images/subversion_logo_hor-468x64.png:877272-878304
/subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo_hor-468x64.png:874916-874919
/subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png:874586-874922
+/subversion/branches/1.5.x-serf-config/www/images/subversion_logo_hor-468x64.png:1041544-1041563
/subversion/trunk:876953
/subversion/trunk/www/images/subversion_logo_hor-468x64.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876993,877191,877230,877243,877459,877720,877730,877842,878673,878682,879293,880082,1000038,1000060,1022675,1032808,1033166,1038163,1041083,1041438