You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/03/16 19:03:41 UTC
svn commit: r923910 [1/9] - in /subversion/branches/1.6.x-issue3432: ./
build/ build/ac-macros/ build/generator/ contrib/cgi/
contrib/client-side/emacs/ contrib/client-side/svn_load_dirs/
contrib/hook-scripts/ contrib/server-side/ doc/user/ notes/ pack...
Author: pburba
Date: Tue Mar 16 18:03:37 2010
New Revision: 923910
URL: http://svn.apache.org/viewvc?rev=923910&view=rev
Log:
Synch the 1.6.x-issue3432 backport branch up with 1.6.x so it can once
again be reintegrated without conflicts.
* subversion/libsvn_client/merge.c
* subversion/tests/cmdline/merge_tests.py
Resolve some minor conflicts in these two files caused by other changes
backported to 1.6.x since the issue 3432 fixes were nominated 100 years
ago.
All other changes are just part of the sync.
Added:
subversion/branches/1.6.x-issue3432/contrib/client-side/svn_load_dirs/LICENSE_AFL3.txt
- copied unchanged from r923876, subversion/branches/1.6.x/contrib/client-side/svn_load_dirs/LICENSE_AFL3.txt
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/resolve_tests.py
- copied unchanged from r923876, subversion/branches/1.6.x/subversion/tests/cmdline/resolve_tests.py
Modified:
subversion/branches/1.6.x-issue3432/ (props changed)
subversion/branches/1.6.x-issue3432/CHANGES (contents, props changed)
subversion/branches/1.6.x-issue3432/COMMITTERS
subversion/branches/1.6.x-issue3432/STATUS
subversion/branches/1.6.x-issue3432/build/ac-macros/apache.m4
subversion/branches/1.6.x-issue3432/build/ac-macros/berkeley-db.m4
subversion/branches/1.6.x-issue3432/build/ac-macros/kwallet.m4
subversion/branches/1.6.x-issue3432/build/ac-macros/neon.m4
subversion/branches/1.6.x-issue3432/build/ac-macros/serf.m4
subversion/branches/1.6.x-issue3432/build/ac-macros/svn-macros.m4
subversion/branches/1.6.x-issue3432/build/ac-macros/swig.m4
subversion/branches/1.6.x-issue3432/build/generator/gen_win.py
subversion/branches/1.6.x-issue3432/build/run_tests.py
subversion/branches/1.6.x-issue3432/configure.ac
subversion/branches/1.6.x-issue3432/contrib/cgi/mirror_dir_through_svn.README
subversion/branches/1.6.x-issue3432/contrib/client-side/emacs/psvn.el
subversion/branches/1.6.x-issue3432/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
subversion/branches/1.6.x-issue3432/contrib/hook-scripts/commit-email.pl.in
subversion/branches/1.6.x-issue3432/contrib/server-side/svn-fast-backup
subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror-test.sh
subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror.sh
subversion/branches/1.6.x-issue3432/doc/user/cvs-crossover-guide.html
subversion/branches/1.6.x-issue3432/notes/fs_dumprestore.txt
subversion/branches/1.6.x-issue3432/notes/interactive-conflict-resolution.txt
subversion/branches/1.6.x-issue3432/notes/object-model.txt
subversion/branches/1.6.x-issue3432/notes/sasl.txt
subversion/branches/1.6.x-issue3432/packages/windows-WiX/BuildSubversion/Pre.rtf
subversion/branches/1.6.x-issue3432/packages/windows-innosetup/Pre.rtf
subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/perl/native/Client.pm
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/tests/mergeinfo.py
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/ruby/test/test_core.rb
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/ruby/test/windows_util.rb
subversion/branches/1.6.x-issue3432/subversion/bindings/swig/svn_client.i
subversion/branches/1.6.x-issue3432/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/1.6.x-issue3432/subversion/include/private/svn_opt_private.h
subversion/branches/1.6.x-issue3432/subversion/include/svn_mergeinfo.h
subversion/branches/1.6.x-issue3432/subversion/include/svn_opt.h
subversion/branches/1.6.x-issue3432/subversion/include/svn_version.h
subversion/branches/1.6.x-issue3432/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/add.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/commit_util.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/copy.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/delete.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/externals.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/log.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/merge.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/mergeinfo.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/mergeinfo.h
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/repos_diff.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_client/revisions.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_delta/svndiff.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_delta/text_delta.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_neon/commit.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/blame.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/commit.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/log.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/property.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_serf/serf.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_svn/client.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_ra_svn/marshal.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_repos/dump.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_repos/load.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_repos/repos.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_subr/config_file.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_subr/io.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_subr/mergeinfo.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_subr/opt.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_subr/prompt.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_subr/sqlite.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_wc/adm_ops.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_wc/props.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_wc/questions.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_wc/update_editor.c
subversion/branches/1.6.x-issue3432/subversion/libsvn_wc/wc_db.h
subversion/branches/1.6.x-issue3432/subversion/mod_dav_svn/liveprops.c
subversion/branches/1.6.x-issue3432/subversion/mod_dav_svn/repos.c
subversion/branches/1.6.x-issue3432/subversion/po/fr.po
subversion/branches/1.6.x-issue3432/subversion/po/nb.po
subversion/branches/1.6.x-issue3432/subversion/po/pl.po
subversion/branches/1.6.x-issue3432/subversion/po/zh_CN.po
subversion/branches/1.6.x-issue3432/subversion/svn/add-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/changelist-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/cleanup-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/commit-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/delete-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/lock-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/main.c
subversion/branches/1.6.x-issue3432/subversion/svn/mkdir-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/move-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/propdel-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/propedit-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/propset-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/resolve-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/resolved-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/revert-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/status-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/unlock-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svn/update-cmd.c
subversion/branches/1.6.x-issue3432/subversion/svnlook/main.c
subversion/branches/1.6.x-issue3432/subversion/svnserve/cyrus_auth.c
subversion/branches/1.6.x-issue3432/subversion/svnserve/main.c
subversion/branches/1.6.x-issue3432/subversion/svnsync/main.c
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/autoprop_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/basic_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/export_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/externals_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/log_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/merge_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/resolved_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/svntest/actions.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/svntest/main.py
subversion/branches/1.6.x-issue3432/subversion/tests/cmdline/update_tests.py
subversion/branches/1.6.x-issue3432/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/1.6.x-issue3432/subversion/tests/libsvn_subr/path-test.c
subversion/branches/1.6.x-issue3432/tools/buildbot/slaves/README
subversion/branches/1.6.x-issue3432/tools/client-side/change-svn-wc-format.py
subversion/branches/1.6.x-issue3432/tools/client-side/svn-graph.pl
subversion/branches/1.6.x-issue3432/tools/dev/contribulyze.py
subversion/branches/1.6.x-issue3432/tools/dev/po-merge.py
subversion/branches/1.6.x-issue3432/tools/dev/svn-merge-revs.py
subversion/branches/1.6.x-issue3432/tools/dist/construct-rolling-environment.sh
subversion/branches/1.6.x-issue3432/tools/dist/gen_nightly_ann.py
subversion/branches/1.6.x-issue3432/www/design.html
subversion/branches/1.6.x-issue3432/www/merge-tracking/func-spec.html
subversion/branches/1.6.x-issue3432/www/merge-tracking/requirements.html
subversion/branches/1.6.x-issue3432/www/merge-tracking/summit.html
subversion/branches/1.6.x-issue3432/www/variance-adjusted-patching.html
subversion/branches/1.6.x-issue3432/www/webdav-usage.html
Propchange: subversion/branches/1.6.x-issue3432/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 18:03:37 2010
@@ -1,38 +1,66 @@
-subversion/branches/1.5.x-r30215:870312
-subversion/branches/1.6.x-UNC-paths:876471-876545
-subversion/branches/1.6.x-dirent-basename:876130-876262
-subversion/branches/1.6.x-no-svn_uri:876360-876415
-subversion/branches/1.6.x-r36178:877876-877884
-subversion/branches/1.6.x-r36252:876328-876788
-subversion/branches/1.6.x-r37622:877699-877993
-subversion/branches/1.6.x-r37627:877704-877928
-subversion/branches/1.6.x-r37857:877932-877936
-subversion/branches/bdb-reverse-deltas:872050-872529
-subversion/branches/diff-callbacks3:870059-870761
-subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
-subversion/branches/double-delete:870511-872970
-subversion/branches/file-externals:871779-873302
-subversion/branches/fs-rep-sharing:869036-873803
-subversion/branches/fsfs-pack:873717-874575
-subversion/branches/gnome-keyring:870558-871410
-subversion/branches/in-memory-cache:869829-871452
-subversion/branches/issue-2843-dev:871432-874179
-subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
-subversion/branches/issue-3067-deleted-subtrees:873375-874084
-subversion/branches/issue-3148-dev:875193-875204
-subversion/branches/issue-3220-dev:872210-872226
-subversion/branches/issue-3334-dirs:875156-875867
-subversion/branches/kwallet:870785-871314
-subversion/branches/log-g-performance:870941-871032
-subversion/branches/merge-skips-obstructions:874525-874615
-subversion/branches/reintegrate-improvements:873853-874164
-subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
-subversion/branches/svnpatch-diff:871905,871986
-subversion/branches/svnserve-logging:869828-870893
-subversion/branches/tc-issue-3334:874697-874773
-subversion/branches/tc-merge-notify:874017-874062
-subversion/branches/tc-resolve:874191-874239
-subversion/branches/tc_url_rev:874351-874483
-subversion/branches/tree-conflicts:868291-873154
-subversion/branches/tree-conflicts-notify:873926-874008
-subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876055-876056,876059,876083,876091,876101,876109,876123-876125,876129,876132,876138,876160,876167,876180,876185,876205,876223-876225,876230,876233,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612
,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878089,878091,878093,878095,878127,878129,878131,878142,878175-878176,878216,878269,878303,878321,878338,878341,878343,878399,878423,878426,878462
+/subversion/branches/1.5.x-r30215:866657
+/subversion/branches/1.6.x:878598-923876
+/subversion/branches/1.6.x-1.6.8-serfassertion:900822-900868
+/subversion/branches/1.6.x-UNC-paths:872816-872890
+/subversion/branches/1.6.x-dirent-basename:872475-872607
+/subversion/branches/1.6.x-future-proof:880259-884209
+/subversion/branches/1.6.x-issue-3242-partial:916088-923778
+/subversion/branches/1.6.x-issue3443:874942-875825
+/subversion/branches/1.6.x-issue3519:880376-889934
+/subversion/branches/1.6.x-issue3573:906488-923765
+/subversion/branches/1.6.x-no-svn_uri:872705-872760
+/subversion/branches/1.6.x-r36178:874221-874229
+/subversion/branches/1.6.x-r36252:872673-873133
+/subversion/branches/1.6.x-r37622:874044-874338
+/subversion/branches/1.6.x-r37627:874049-874273
+/subversion/branches/1.6.x-r37857:874277-874281
+/subversion/branches/1.6.x-r37953:876154-876416
+/subversion/branches/1.6.x-r37988:874408-875242
+/subversion/branches/1.6.x-r38000:875428-876112
+/subversion/branches/1.6.x-r38222:874644-875236
+/subversion/branches/1.6.x-r38572:875006-875011
+/subversion/branches/1.6.x-r38799:875225-875262
+/subversion/branches/1.6.x-r38927:875347-875521
+/subversion/branches/1.6.x-r39019:879132-895676
+/subversion/branches/1.6.x-r39109:879131
+/subversion/branches/1.6.x-r39557:876013-876252
+/subversion/branches/1.6.x-r39887:876369-876411
+/subversion/branches/1.6.x-r40452:880530-890996
+/subversion/branches/1.6.x-r889840:889888-890974
+/subversion/branches/1.6.x-r891672:891676-923748
+/subversion/branches/1.6.x-r892050:923839-923856
+/subversion/branches/1.6.x-r896522:896528-897866
+/subversion/branches/1.6.x-r898963:899874-915098
+/subversion/branches/1.6.x-r905326:905545-923537
+/subversion/branches/1.6.x-wc-ng-check-override:910213-923776
+/subversion/branches/bdb-reverse-deltas:868395-868874
+/subversion/branches/diff-callbacks3:866404-867106
+/subversion/branches/dont-save-plaintext-passwords-by-default:867073-867463
+/subversion/branches/double-delete:866856-869315
+/subversion/branches/file-externals:868124-869647
+/subversion/branches/fs-rep-sharing:865381-870148
+/subversion/branches/fsfs-pack:870062-870920
+/subversion/branches/gnome-keyring:866903-867755
+/subversion/branches/http-protocol-v2:875632
+/subversion/branches/in-memory-cache:866174-867797
+/subversion/branches/issue-2843-dev:867777-870524
+/subversion/branches/issue-3000:868058,868061-868064,868066-868071,868073,868079
+/subversion/branches/issue-3067-deleted-subtrees:869720-870429
+/subversion/branches/issue-3148-dev:871538-871549
+/subversion/branches/issue-3220-dev:868555-868571
+/subversion/branches/issue-3242-dev:879762,880472,880579
+/subversion/branches/issue-3334-dirs:871501-872212
+/subversion/branches/kwallet:867130-867659
+/subversion/branches/log-g-performance:867286-867377
+/subversion/branches/merge-skips-obstructions:870870-870960
+/subversion/branches/reintegrate-improvements:870198-870509
+/subversion/branches/svn-mergeinfo-enhancements:866464-866540,866542-866633
+/subversion/branches/svnpatch-diff:868250,868331
+/subversion/branches/svnserve-logging:866173-867238
+/subversion/branches/tc-issue-3334:871042-871118
+/subversion/branches/tc-merge-notify:870362-870407
+/subversion/branches/tc-resolve:870536-870584
+/subversion/branches/tc_url_rev:870696-870828
+/subversion/branches/tree-conflicts:864636-869499
+/subversion/branches/tree-conflicts-notify:870271-870353
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,876862,877203,877595,877597,877665,878216,878269,878321,878341,878343,878399,878423,878426,879093,879688,880274-880275,880370,880450,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,898963,899826,899828,900797,901752,904301,904394,904594,905303,905326,906256,906305,917640,918211,922516
Modified: subversion/branches/1.6.x-issue3432/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/CHANGES?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/CHANGES (original)
+++ subversion/branches/1.6.x-issue3432/CHANGES Tue Mar 16 18:03:37 2010
@@ -1,5 +1,112 @@
+Version 1.6.9
+(25 Jan 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.9
+
+ User-visible changes:
+ * allow multiple external updates over ra_svn (issue #3487)
+ * fix a segmentation fault when using FSFS (r881905)
+ * support Berkeley DB 4.8 (r879688)
+ * various autoprop improvements (r880274, -5)
+ * improve usage of svn+ssh:// on Windows (issue #2580)
+ * teach 1.6.x to recognize 1.7 working copies (1.6.x-future-proof branch)
+ * update help text for 'svn update' and 'svn switch' (r886164, -97)
+ * make 'svnadmin load --parent-dir' create valid mergeinfo (r888979, -9081)
+ * tolerate relative merge source paths in mergeinfo (r889840)
+ * teach mod_dav_svn to support the Label header (issue #3519)
+ * fixed: svnsync leaves stale sync-locks on mirrors (r884842)
+ * fix applicability of 'svn resolve --accept=theirs-conflict' (r880525, -6)
+ * fixed: segfault in 'svn resolve' (r896522, -47)
+ * fix commit failure against an out-of-date mirror (r900797)
+
+ Developer-visible changes:
+ * update ruby bindings test expectation (r880162)
+ * don't allow rangelist and mergeinfo API to modify input args (r879093)
+
+
+Version 1.6.8
+(Not released, see changes for 1.6.9.)
+
+
+Version 1.6.7
+(Not released, see changes for 1.6.9.)
+
+
+[ Note: All revision numbers for versions prior to 1.6.7 reference the
+ original repository on svn.collab.net. For more information see:
+ http://svn.apache.org/repos/asf/subversion/README ]
+
+
+Version 1.6.6
+(22 Oct 2009, from /branches/1.6.x)
+http://svn.collab.net/repos/svn/tags/1.6.6
+
+ User-visible changes:
+ * fix crash during 'svn update' (r39673)
+ * respect Apache's ServerSignature directive (r40008, -21, -31)
+ * don't add a file with mixed line endings, and then abort (issue #2713)
+ * support Neon 0.29.
+ * fix a crash in 'svn rm --force' (r37953)
+ * handle tree conflicts involving replacements (issue #3486)
+ * allow non-threadsafe sqlite if APR has no threads (r39301)
+ * print newline before plaintext SSL cert / password prompts (r38982, r39302)
+ * improve merge performance with implicit subtree mergeinfo (issue #3443)
+ * fix "libsvn_ra_svn/marshal.c assertion failed (opt || cstr)" (issue #3485)
+ * make file externals work for binary files (issue #3368)
+ * perform MIME type matching case-insensitively (issue #3479)
+ * do not treat non-existent revisions as HEAD in 'svn export' (issue #3400)
+ * revert r36720's default MIME type change back to "text/plain" (issue #3508)
+ * improve "tree conflict already exists" error message (r38872)
+ * fix failure to commit replacement of a directory (issue #3281)
+ * fix mod_dav_svn parent dir links to preserve peg revisions (issue #3425)
+
+ Developer-visible changes:
+ * fix 2 failing tests in ruby bindings (r38886)
+ * do not require GNU grep for build (issue #3453)
+ * use '$SED' instead of 'sed' in build scripts (issue #3458)
+ * add svn.client.{log5,merge_peg3} to python bindings (r39635, -6, -7)
+ * include the time of a test run in tests.log (r39887)
+
+
+Version 1.6.5
+(22 Aug 2009, from /branches/1.6.x)
+http://svn.collab.net/repos/svn/tags/1.6.5
+
+ User-visible changes:
+ * fix mod_dav_svn directory view links to preserve peg revisions (r38021)
+ * do not error on Windows when ALLUSERPROFILE dir nonexistent (r38053, -5, -7)
+ * properly escape lock comments over ra_neon (r38101, -2)
+ * allow syncing copies of '/' over ra_neon and ra_serf (issue #3438)
+ * make 'svnlook diff' show empty added or deleted files (r38458)
+ * fix building with Apache 2.4 (r36720)
+ * fix possible data loss on ext4 and GPFS filesystems (issue #3442)
+ * resolve symlinks when checking for ~/.subversion (r36023)
+ * don't let svn+ssh SIGKILL ssh processes (issue #2580)
+ * allow PLAIN and LOGIN mechanisms with SASL in svnserve (r38205)
+ * fix peg revision parsing in filenames like 'dir/@file.txt' (issue #3416)
+ * fix detection of Apache <2.0.56 (r38290, -3, -4)
+ * don't pretend to do tree conflict resolution (r38799, -801, -805)
+ * fix data corruption when syncing from svnserve to mod_dav_svn (r38686, -7)
+ * fix GNOME Keyring with '--non-interactive' option (r38222, -3, -61, -410)
+ * fixed: false "File '...' already exists" error during commit (issue #3119)
+
+ Developer-visible changes:
+ * avoid referencing uninitialized variables (r38388)
+ * plug a couple of error leaks (r38572)
+ * improve windows test output (r38616, -7, -9, -49)
+
+
+Version 1.6.4
+(06 Aug 2009, from /branches/1.6.x)
+http://svn.collab.net/repos/svn/tags/1.6.4
+
+ User-visible changes:
+ * fixed: heap overflow vulnerability on server and client
+ See CVE-2009-2411, and descriptive advisory at
+ http://subversion.tigris.org/security/CVE-2009-2411-advisory.txt
+
+
Version 1.6.3
-(19 Jun 2009, from /branches/1.6.x)
+(22 Jun 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.3
User-visible changes:
@@ -11,7 +118,6 @@ http://svn.collab.net/repos/svn/tags/1.6
* update dsvn.el for 1.6 (r37774)
* don't allow setting of props on out-of-date dirs under neon (r37745)
* improve BASH completion (r36450, -52, -70, -79, -538)
- * improve some DAV-based error messages (issue #3414)
* always show tree conflicts with 'svn st' (issue #3382)
* improve correctness of 'svn mergeinfo' (issue #3126)
* decrease the amount of memory needed for large commits (r37894, -6)
@@ -20,12 +126,14 @@ http://svn.collab.net/repos/svn/tags/1.6
* improve 'svn merge' perf by reducing server contact (r37491, -593, -618)
* stop propagating self-referential mergeinfo in reintegrate merges (r37931)
* fix NLS detection where -liconv is required for bindtextdomain() (r37827)
- * don't delete unversioned files with 'rm --keel-local' (r38015, -17, -19)
+ * don't delete unversioned files with 'rm --keep-local' (r38015, -17, -19)
* bump apr and apr-util versions included in deps to latest. (r37941)
* avoid temp file name collisions with ra_serf, ra_neon (r37972)
* fixed: potential segfault with noop file merges (r37779)
* fixed: incorrect output with 'svn blame -g' (r37719, -23, -41)
* fixed: bindings don't load FS libs when module search enabled (issue #3413)
+ * fixed: DAV RA layers not properly handling update/switch working copy
+ directory to revision/place in which it doesn't exist (issue #3414)
* fixed: potential abort() in the working copy library (r37857)
* fixed: memory leak in hash reading functions (r37868, -979)
@@ -35,7 +143,7 @@ http://svn.collab.net/repos/svn/tags/1.6
Version 1.6.2
-(09 May 2009, from /branches/1.6.x)
+(11 May 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.2
User-visible changes:
@@ -65,7 +173,7 @@ http://svn.collab.net/repos/svn/tags/1.6
Version 1.6.1
-(10 Apr 2009, from /branches/1.6.x)
+(9 Apr 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.1
User-visible changes:
@@ -210,8 +318,18 @@ http://svn.collab.net/repos/svn/tags/1.6
* fix building Ruby bindings with Ruby 1.9 (r35852, r35883)
+Version 1.5.7
+(06 Aug 2009, from /branches/1.5.x)
+http://svn.collab.net/repos/svn/tags/1.5.7
+
+ User-visible changes:
+ * fixed: heap overflow vulnerability on server and client
+ See CVE-2009-2411, and descriptive advisory at
+ http://subversion.tigris.org/security/CVE-2009-2411-advisory.txt
+
+
Version 1.5.6
-(27 Feb 2009, from /branches/1.5.x)
+(26 Feb 2009, from /branches/1.5.x)
http://svn.collab.net/repos/svn/tags/1.5.6
User-visible changes:
Propchange: subversion/branches/1.6.x-issue3432/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 16 18:03:37 2010
@@ -1,38 +1,65 @@
-subversion/branches/1.5.x-r30215/CHANGES:870312
-subversion/branches/1.6.x-UNC-paths/CHANGES:876471-876545
-subversion/branches/1.6.x-dirent-basename/CHANGES:876130-876262
-subversion/branches/1.6.x-no-svn_uri/CHANGES:876360-876415
-subversion/branches/1.6.x-r36178/CHANGES:877876-877884
-subversion/branches/1.6.x-r36252/CHANGES:876328-876788
-subversion/branches/1.6.x-r37622/CHANGES:877699-877993
-subversion/branches/1.6.x-r37627/CHANGES:877704-877928
-subversion/branches/1.6.x-r37857/CHANGES:877932-877936
-subversion/branches/bdb-reverse-deltas/CHANGES:872050-872529
-subversion/branches/diff-callbacks3/CHANGES:870059-870761
-subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:870728-871118
-subversion/branches/double-delete/CHANGES:870511-872970
-subversion/branches/file-externals/CHANGES:871779-873302
-subversion/branches/fs-rep-sharing/CHANGES:869036-873803
-subversion/branches/fsfs-pack/CHANGES:873717-874575
-subversion/branches/gnome-keyring/CHANGES:870558-871410
-subversion/branches/in-memory-cache/CHANGES:869829-871452
-subversion/branches/issue-2843-dev/CHANGES:871432-874179
-subversion/branches/issue-3000/CHANGES:871713,871716-871719,871721-871726,871728,871734
-subversion/branches/issue-3067-deleted-subtrees/CHANGES:873375-874084
-subversion/branches/issue-3148-dev/CHANGES:875193-875204
-subversion/branches/issue-3220-dev/CHANGES:872210-872226
-subversion/branches/issue-3334-dirs/CHANGES:875156-875867
-subversion/branches/kwallet/CHANGES:870785-871314
-subversion/branches/log-g-performance/CHANGES:870941-871032
-subversion/branches/merge-skips-obstructions/CHANGES:874525-874615
-subversion/branches/reintegrate-improvements/CHANGES:873853-874164
-subversion/branches/svn-mergeinfo-enhancements/CHANGES:870119-870195,870197-870288
-subversion/branches/svnpatch-diff/CHANGES:871905,871986
-subversion/branches/svnserve-logging/CHANGES:869828-870893
-subversion/branches/tc-issue-3334/CHANGES:874697-874773
-subversion/branches/tc-merge-notify/CHANGES:874017-874062
-subversion/branches/tc-resolve/CHANGES:874191-874239
-subversion/branches/tc_url_rev/CHANGES:874351-874483
-subversion/branches/tree-conflicts/CHANGES:868291-873154
-subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-subversion/trunk/CHANGES:875962-878136,878142,878175-878176,878216,878269,878303,878321,878338,878341,878343,878399,878423,878426,878462
+/subversion/branches/1.5.x-r30215/CHANGES:866657
+/subversion/branches/1.6.x/CHANGES:878598-923876
+/subversion/branches/1.6.x-1.6.8-serfassertion/CHANGES:900822-900868
+/subversion/branches/1.6.x-UNC-paths/CHANGES:872816-872890
+/subversion/branches/1.6.x-dirent-basename/CHANGES:872475-872607
+/subversion/branches/1.6.x-future-proof/CHANGES:880259-884209
+/subversion/branches/1.6.x-issue-3242-partial/CHANGES:916088-923778
+/subversion/branches/1.6.x-issue3443/CHANGES:874942-875825
+/subversion/branches/1.6.x-issue3519/CHANGES:880376-889934
+/subversion/branches/1.6.x-issue3573/CHANGES:906488-923765
+/subversion/branches/1.6.x-no-svn_uri/CHANGES:872705-872760
+/subversion/branches/1.6.x-r36178/CHANGES:874221-874229
+/subversion/branches/1.6.x-r36252/CHANGES:872673-873133
+/subversion/branches/1.6.x-r37622/CHANGES:874044-874338
+/subversion/branches/1.6.x-r37627/CHANGES:874049-874273
+/subversion/branches/1.6.x-r37857/CHANGES:874277-874281
+/subversion/branches/1.6.x-r37953/CHANGES:876154-876416
+/subversion/branches/1.6.x-r37988/CHANGES:874408-875242
+/subversion/branches/1.6.x-r38000/CHANGES:875428-876112
+/subversion/branches/1.6.x-r38222/CHANGES:874644-875236
+/subversion/branches/1.6.x-r38572/CHANGES:875006-875011
+/subversion/branches/1.6.x-r38799/CHANGES:875225-875262
+/subversion/branches/1.6.x-r38927/CHANGES:875347-875521
+/subversion/branches/1.6.x-r39019/CHANGES:879132-895676
+/subversion/branches/1.6.x-r39109/CHANGES:879131
+/subversion/branches/1.6.x-r39557/CHANGES:876013-876252
+/subversion/branches/1.6.x-r39887/CHANGES:876369-876411
+/subversion/branches/1.6.x-r40452/CHANGES:880530-890996
+/subversion/branches/1.6.x-r889840/CHANGES:889888-890974
+/subversion/branches/1.6.x-r891672/CHANGES:891676-923748
+/subversion/branches/1.6.x-r892050/CHANGES:923839-923856
+/subversion/branches/1.6.x-r896522/CHANGES:896528-897866
+/subversion/branches/1.6.x-r898963/CHANGES:899874-915098
+/subversion/branches/1.6.x-r905326/CHANGES:905545-923537
+/subversion/branches/1.6.x-wc-ng-check-override/CHANGES:910213-923776
+/subversion/branches/bdb-reverse-deltas/CHANGES:868395-868874
+/subversion/branches/diff-callbacks3/CHANGES:866404-867106
+/subversion/branches/dont-save-plaintext-passwords-by-default/CHANGES:867073-867463
+/subversion/branches/double-delete/CHANGES:866856-869315
+/subversion/branches/file-externals/CHANGES:868124-869647
+/subversion/branches/fs-rep-sharing/CHANGES:865381-870148
+/subversion/branches/fsfs-pack/CHANGES:870062-870920
+/subversion/branches/gnome-keyring/CHANGES:866903-867755
+/subversion/branches/in-memory-cache/CHANGES:866174-867797
+/subversion/branches/issue-2843-dev/CHANGES:867777-870524
+/subversion/branches/issue-3000/CHANGES:868058,868061-868064,868066-868071,868073,868079
+/subversion/branches/issue-3067-deleted-subtrees/CHANGES:869720-870429
+/subversion/branches/issue-3148-dev/CHANGES:871538-871549
+/subversion/branches/issue-3220-dev/CHANGES:868555-868571
+/subversion/branches/issue-3242-dev/CHANGES:879762,880472,880579
+/subversion/branches/issue-3334-dirs/CHANGES:871501-872212
+/subversion/branches/kwallet/CHANGES:867130-867659
+/subversion/branches/log-g-performance/CHANGES:867286-867377
+/subversion/branches/merge-skips-obstructions/CHANGES:870870-870960
+/subversion/branches/reintegrate-improvements/CHANGES:870198-870509
+/subversion/branches/svn-mergeinfo-enhancements/CHANGES:866464-866540,866542-866633
+/subversion/branches/svnpatch-diff/CHANGES:868250,868331
+/subversion/branches/svnserve-logging/CHANGES:866173-867238
+/subversion/branches/tc-issue-3334/CHANGES:871042-871118
+/subversion/branches/tc-merge-notify/CHANGES:870362-870407
+/subversion/branches/tc-resolve/CHANGES:870536-870584
+/subversion/branches/tc_url_rev/CHANGES:870696-870828
+/subversion/branches/tree-conflicts/CHANGES:864636-869499
+/subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
+/subversion/trunk/CHANGES:875962-901365,901752,904301,904394,904594,905303,905326,917640,918211,922516
Modified: subversion/branches/1.6.x-issue3432/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/COMMITTERS?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/COMMITTERS [UTF-8] (original)
+++ subversion/branches/1.6.x-issue3432/COMMITTERS [UTF-8] Tue Mar 16 18:03:37 2010
@@ -20,7 +20,7 @@ Blanket commit access:
daniel Daniel Stenberg <da...@haxx.se>
cmpilato C. Michael Pilato <cm...@collab.net>
kevin Kevin Pilch-Bisson <ke...@pilch-bisson.net>
- philip Philip Martin <ph...@codematters.co.uk>
+ philip Philip Martin <ph...@wandisco.com>
jerenkrantz Justin Erenkrantz <ju...@erenkrantz.com>
rooneg Garrett Rooney <ro...@electricjellyfish.net>
bcollins Ben Collins <bc...@debian.org>
@@ -32,7 +32,7 @@ Blanket commit access:
mbk Mark Benedetto King <mb...@lowlatency.com>
epg Eric Gillespie <ep...@pretzelnet.org>
jaa Jani Averbach <ja...@iki.fi>
- julianfoad Julian Foad <ju...@btopenworld.com>
+ julianfoad Julian Foad <ju...@wandisco.com>
ringstrom Tobias Ringström <to...@ringstrom.mine.nu>
jpieper Josh Pieper <jj...@pobox.com>
jszakmeister John Szakmeister <jo...@szakmeister.net>
Modified: subversion/branches/1.6.x-issue3432/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/STATUS?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/STATUS (original)
+++ subversion/branches/1.6.x-issue3432/STATUS Tue Mar 16 18:03:37 2010
@@ -10,17 +10,169 @@ See "Stabilizing and maintaining release
details on how release lines and voting work, what kinds of bugs can
delay a release, etc.
-Status of 1.6.4:
+Status of 1.6.10:
================
Candidate changes:
- * r36720
- Fix building with Apache 2.4.
+ * r878216, r878341, r878343, r876862, r877203, r877595, r877665, r877597, r878269,
+ r878321, r878399, r878423, r878426
+ Fix issue #3432 'Merge can record mergeinfo from natural history gaps'
+ Justification:
+ Gaps in merge sources can lead to the creation of invalid mergeinfo
+ or the removal of valid mergeinfo.
+ Notes:
+ The fix itself in r878399 is relatively simple, but recent refactoring
+ of the merge code on trunk makes it look a lot worse than it is.
+ Unless otherwise noted, all of the following are nominated simply to
+ avoid a conflict nightmare:
+ r878216, r878341, r878343 - New test and test tweaks for the issue.
+ r876862 - Comment changes only.
+ r877203 - Scope reduction of a pool.
+ r877595 - Minor bug fix and some refactoring.
+ r877665 - Comment changes only.
+ r877597 - Merge code refactoring.
+ r878269 - Pool use cleanup, no functional change.
+ r878321 - More merge code refactoring.
+ r878423 - Variable rename to avoid shadowing a previous local.
+ r878426 - Remove an unused variable.
+ Branch:
+ ^/subversion/branches/1.6.x-issue3432
+ Votes:
+ +1: pburba, stsp
+
+ * r876032, r876104, r878447, r878910, r878911, r878916
+ Several fixes to the Win32 exception handler. This change also makes it
+ available on Windows Vista and 7 where it was previously blocked by a
+ version check.
+ Justification:
+ This exception handler is a valuable debugging tool for users who don't
+ have development tools installed. (Most users on Windows).
+ Notes:
+ Most of these revisions cancel out each other. The real changes are in
+ r878447 (removing version check) and r878910,r878916 (fixing formatting
+ specifier). It's probably easier to review the combined patch than the
+ individual revisions.
+ Branch:
+ ^/subversion/branches/1.6.x-r38836.
+ Votes:
+ +1: rhuijben
+ +0: pburba - I don't have a Vista or Win7 box to try this out on, but it
+ works fine on my XP box.
+ +0: lgo - code reviewed and looks good, but I don't have access to a
+ Windows machine.
+
+ * r879766
+ Fix issue #3498: Subversion password stores freeze Eclipse
+ Justification:
+ All subclipse users are in great need of this.
+ Branch:
+ Resolves a minor conflict in libsvn_auth_gnome_keyring/gnome_keyring.c
+ where the code changed was refactored on trunk.
+ ^/subversion/branches/1.6.x-r39692
+ Votes:
+ +1: stylesen
+ +0: julianfoad (reviewed, not tested)
+ -0: rhuijben (needs more explanation: The not-interactive and no
+ callback code paths should be more similar if the code
+ works correctly. I think the not interactive code path
+ needs the same fix).
+
+ * r879902, r879916
+ Disables file synchronization mutexes in fsfs on Windows. These mutexes
+ were added to make POSIX systems lock files that were in use by other
+ threads in the same process.
+
+ Windows implements per filehandle locking, so it doesn't need these
+ locks. We usually see the opposite problem in Subversion on Windows.
+ Justification:
+ This gives a measurable performance boost (5% decrease in running time
+ on running the testsuite in parallel mode (on trunk). The difference
+ will be bigger when measured on a real subversion server like one
+ running apache or svnserve.
+ Votes:
+ +1: rhuijben
+
+ * r896915
+ On Windows, stop retrying a move operation without looking to the
+ initial error code.
+ Justification:
+ Without this patch the initial move error is lost, which makes it
+ impossible to diagnose the real error.
+ Votes:
+ +1: rhuijben, cmpilato
+
+ * r898048
+ Extend the Windows only, crypto api verification of server certificates
+ to check for certificate revocation. Also simplify the code by making
+ Windows do the chain verification instead of just taking an intermediate
+ result.
+ Justification:
+ It's better to be safe, when we are talking about SSL.
+ Votes:
+ +1: rhuijben
+
+ * r877016, r902093
+ Fix issue #3390 'relative externals not updated during switch'.
+ Justification:
+ One of the selling points of relative externals was their ability
+ to be used to span branches and tags. Not so useful if switching
+ to a different tag or branch doesn't actually cause the external
+ to point to the right place.
+ Branch:
+ ^/subversion/branches/1.6.x-issue3390
+ Votes:
+ +1: cmpilato, stsp
+
+ * r878590, r878607, r878625, r878626, r878627
+ In trunk we optimized the common case of 'find-and-replace with same uri'
+ of proxied content thanks to issue 3445.
+ r878590 is just a change that adds FIXME marker to code comment. We take it
+ to avoid spurious conflicts with other revisions.
+ r878607 Special cases no-op find and replace.
+ "r878625, r878626, r878627" are follow-up to r878607 and the other long
+ pending Master info leak to the clients.
+ Justification:
+ 1. This group has the most common 'optimization' fix of *not* groking the
+ proxied response to find and replace with same string.
+ 2. Fixes the master information leak via the Location header.
+ 3. Need this to be ported for the other defect to be ported
+ without conflict.
+ Votes:
+ +1: kameshj
+
+ * r916286, r917512
+ This backport depends on the r878590 group only for the conflict free port.
+ Justification:
+ Vague commit error when server has been configured with <Location /svn/>
+ and write through proxy.
+ Votes:
+ +1: kameshj
+
+ * r917523
+ This backport depends on the r878590 and r916286 groups only for the
+ conflict free port.
+ Justification:
+ If the configured slave url has the *encodable* characters *write through*
+ is not happening rather commit happens in slave itself.
Votes:
- +1: arfrever, stsp
+ +1: kameshj
- * r37478, r37543, r37544, r37545, r37547
+ * r923674, r923679
+ Fix pool lifetime issue in the status walker.
+ Justification:
+ Without this patch externals information is kept in a per directory pool,
+ which is cleared when the status walker goes back to the parent
+ directory. The is_external_path() function then uses freed memory.
+ Branch:
+ ^/subversion/branches/1.6.x-issue3605
+ Votes:
+ +1: rhuijben
+
+Veto-blocked changes:
+=====================
+
+ * r877552, r877617, r877618, r877619, r877621
Support using `svnversion` on files and improve some messages printed by
`svnversion`.
Justification:
@@ -47,103 +199,20 @@ Candidate changes:
'/nonexistent' doesn't exist
Votes:
+1: arfrever
- -0: rhuijben, cmpilato (Introduces new features and changes output)
-
- * r37988
- Fix issue #3416, "Cannot add or commit 'dir/@file.txt'"
- Justification:
- Makes Subversion's behaviour regarding peg-revision parsing
- consistent with what The Book describes, and makes all subcommands
- properly deal with filenames starting with the '@' character.
- Branch:
- ^/branches/1.6.x-r37988
- Notes:
- Doesn't merge cleanly (two tree conflicts) from trunk, and needed an API
- change for backport.
- Votes:
- +1: stsp
+ -0: cmpilato (Introduces new features and changes output)
+ -1: rhuijben (Introduces new features and changes output;
+ I think it should be removed from STATUS)
- * r38004, r38014, r38028, r38122
+ * r878078, r878088, r878102, r878196
Make KWallet window attached to terminal window.
Justification:
Without this change, KWallet window can appear behind terminal window
and is left after killing terminal.
Votes:
+1: arfrever
- -0: psamuelson, stsp (without r38122) (code is ugly and Linux-specific -
- would getenv("WINDOWID") work instead?)
-
- * r38166, r38168
- Fix issue #2580, svn+ssh SIGKILLs ssh processes
- Justification:
- Without this fix, svn+ssh:// does not play nicely with ssh
- connection pooling.
- Notes:
- See the issue for (an overwhelming amount of) details.
- Votes:
- +1: stsp
-
- * r38205
- Allow PLAIN and LOGIN mechanisms with SASL in svnserve.
- Justification:
- Allows authentication via LDAP to actually work, as advertised
- by The Book. If plaintext passwords are a concern, users can
- secure their network links by other means than TLS. We should
- not be making this decision for them.
- Notes:
- See http://svn.haxx.se/users/archive-2009-06/0536.shtml
- Votes:
- +1: stsp, rhuijben
-
- * r38222, r38223, r38261
- Fix GNOME Keyring with '--non-interactive' option.
- Justification:
- This was introduced in 1.6.x
- Branch:
- ^/branches/1.6.x-r38222
- Notes:
- Merging r38221:r38223 from trunk conflicts in
- subversion/libsvn_auth_gnome_keyring/gnome_keyring.c.
- r38261 is also merged to the backport branch.
- Votes:
- +1: stylesen
-
- * r38279, r38311
- Fix issue #3442, on ext4 and GPFS filesystems with a fsfs
- repository. If a crash occurs just after a commit is finished,
- then it's possible for the rev and current file to be fine but the
- revprops file to be empty. Also fixes possible data loss since the
- old code clobbers the existing revprops file.
- Justification:
- Data loss is bad.
- Votes:
- +1: blair, hwright
-
- * r38290, r38293, r38294
- Fix detection of Apache <2.0.56.
- AP_SERVER_MINORVERSION_NUMBER does not exist in earlier versions.
- But AP_SERVER_MINORVERSION (which is a string) does exist, so use that.
- Justification:
- Some people are stuck with older versions of things.
- Votes:
- +1: arfrever, stsp
-
- * r38458
- Make 'svnlook diff' show empty added or deleted files.
- Justification:
- If we don't print any output for empty added or deleted files,
- hook scripts relying on 'svnlook diff' to gather information about
- files affected by a revision can get confused.
- E.g. contrib/hook-scripts/enforcer is known to be affected,
- it cannot enforce rules on added empty files.
- Granted, this is not a very serious bug, but the fix is trivial.
- Votes:
- +1: stsp, rhuijben
-
- * r38521
- Fix Issue 3453: Building Subversion 1.6 requires GNU grep 2.5.
- Votes:
- +1: arfrever
+ -0: peters
+ -1: stsp, rhuijben ("/proc/%ld/stat" is ugly and Linux-specific -
+ would just getenv("WINDOWID") work instead?)
Approved changes:
=================
Modified: subversion/branches/1.6.x-issue3432/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/ac-macros/apache.m4?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/ac-macros/apache.m4 (original)
+++ subversion/branches/1.6.x-issue3432/build/ac-macros/apache.m4 Tue Mar 16 18:03:37 2010
@@ -85,13 +85,16 @@ if test -n "$APXS" && test "$APXS" != "n
AC_MSG_ERROR([unknown APR version])
;;
esac
- AC_EGREP_CPP([apache_minor_version= *$apache_minor_version_wanted_regex],
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+ AC_EGREP_CPP([[apache_minor_version= *"$apache_minor_version_wanted_regex"]],
[
#include "$APXS_INCLUDE/ap_release.h"
-apache_minor_version=AP_SERVER_MINORVERSION_NUMBER],
+apache_minor_version=AP_SERVER_MINORVERSION],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_MSG_ERROR([Apache version incompatible with APR version])])
+ CPPFLAGS="$old_CPPFLAGS"
fi
AC_ARG_WITH(apache-libexecdir,
Modified: subversion/branches/1.6.x-issue3432/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/ac-macros/berkeley-db.m4?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/1.6.x-issue3432/build/ac-macros/berkeley-db.m4 Tue Mar 16 18:03:37 2010
@@ -62,18 +62,18 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
status=required
fi
else
- if test -n "`echo "$withval" | $EGREP -o ":.*:.*:"`"; then
- svn_berkeley_db_header=["`echo "$withval" | sed -e "s/\([^:]*\):.*/\1/"`"]
+ if echo "$withval" | $EGREP ":.*:.*:" > /dev/null; then
+ svn_berkeley_db_header=["`echo "$withval" | $SED -e "s/\([^:]*\):.*/\1/"`"]
SVN_DB_INCLUDES=""
- for i in [`echo "$withval" | sed -e "s/.*:\([^:]*\):[^:]*:.*/\1/"`]; do
+ for i in [`echo "$withval" | $SED -e "s/.*:\([^:]*\):[^:]*:.*/\1/"`]; do
SVN_DB_INCLUDES="$SVN_DB_INCLUDES -I$i"
done
SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
- for l in [`echo "$withval" | sed -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`]; do
+ for l in [`echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`]; do
LDFLAGS="$LDFLAGS -L$l"
done
SVN_DB_LIBS=""
- for l in [`echo "$withval" | sed -e "s/.*:\([^:]*\)/\1/"`]; do
+ for l in [`echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`]; do
SVN_DB_LIBS="$SVN_DB_LIBS -l$l"
done
SVN_DB_LIBS="${SVN_DB_LIBS## }"
@@ -161,7 +161,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
# Or that it resides in a non-standard location which we would have
# to compensate with using something like -R`$apu_config --prefix`/lib.
#
- SVN_DB_LIBS=["${SVN_DB_LIBS-`$apu_config --libs | sed -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"]
+ SVN_DB_LIBS=["${SVN_DB_LIBS-`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"]
CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS"
LIBS="`$apu_config --ldflags` $SVN_DB_LIBS $LIBS"
Modified: subversion/branches/1.6.x-issue3432/build/ac-macros/kwallet.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/ac-macros/kwallet.m4?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/ac-macros/kwallet.m4 (original)
+++ subversion/branches/1.6.x-issue3432/build/ac-macros/kwallet.m4 Tue Mar 16 18:03:37 2010
@@ -41,8 +41,10 @@ AC_DEFUN(SVN_LIB_KWALLET,
old_CXXFLAGS="$CXXFLAGS"
old_LDFLAGS="$LDFLAGS"
old_LIBS="$LIBS"
- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui | $GREP -o -- -D[^[:space:]]*`]; do
- CPPFLAGS="$CPPFLAGS $d"
+ for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
+ if test -n ["`echo "$d" | $GREP -- '^-D[^[:space:]]*'`"]; then
+ CPPFLAGS="$CPPFLAGS $d"
+ fi
done
qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
kde_dir="`$kde4_config --prefix`"
Modified: subversion/branches/1.6.x-issue3432/build/ac-macros/neon.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/ac-macros/neon.m4?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/ac-macros/neon.m4 (original)
+++ subversion/branches/1.6.x-issue3432/build/ac-macros/neon.m4 Tue Mar 16 18:03:37 2010
@@ -141,7 +141,7 @@ AC_DEFUN(SVN_NEON_CONFIG,
if test "$NEON_PKG_CONFIG" = "yes" ; then
NEON_VERSION=`$PKG_CONFIG neon --modversion`
else
- NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
+ NEON_VERSION=`$neon_config --version | $SED -e 's/^neon //'`
fi
AC_MSG_RESULT([$NEON_VERSION])
@@ -165,8 +165,8 @@ AC_DEFUN(SVN_NEON_CONFIG,
test "$svn_allowed_neon" = "any"; then
svn_allowed_neon_on_system="yes"
if test "$NEON_PKG_CONFIG" = "yes"; then
- SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`]
- CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"]
+ SVN_NEON_INCLUDES=[`$PKG_CONFIG neon --cflags | $SED -e 's/-D[^ ]*//g'`]
+ CFLAGS=["$CFLAGS `$PKG_CONFIG neon --cflags | $SED -e 's/-I[^ ]*//g'`"]
old_CFLAGS="$CFLAGS"
old_LIBS="$LIBS"
NEON_LIBS=`$PKG_CONFIG neon --libs`
@@ -186,8 +186,8 @@ int main()
CFLAGS="$old_CFLAGS"
LIBS="$old_LIBS"
else
- SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
- CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
+ SVN_NEON_INCLUDES=[`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`]
+ CFLAGS=["$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"]
NEON_LIBS=`$neon_config --libs`
fi
svn_lib_neon="yes"
Modified: subversion/branches/1.6.x-issue3432/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/ac-macros/serf.m4?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/ac-macros/serf.m4 (original)
+++ subversion/branches/1.6.x-issue3432/build/ac-macros/serf.m4 Tue Mar 16 18:03:37 2010
@@ -17,7 +17,7 @@ AC_DEFUN(SVN_LIB_SERF,
else
AC_MSG_NOTICE([serf library configuration])
serf_prefix=$withval
- save_cppflags="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
+ save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/serf-0"
AC_CHECK_HEADERS(serf.h,[
save_ldflags="$LDFLAGS"
Modified: subversion/branches/1.6.x-issue3432/build/ac-macros/svn-macros.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/ac-macros/svn-macros.m4?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/ac-macros/svn-macros.m4 (original)
+++ subversion/branches/1.6.x-issue3432/build/ac-macros/svn-macros.m4 Tue Mar 16 18:03:37 2010
@@ -60,7 +60,7 @@ AC_DEFUN([SVN_EXTERNAL_PROJECT], [
cd $1
# A "../" for each directory in /$config_subdirs.
- ac_dots=[`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`]
+ ac_dots=[`echo $apr_config_subdirs| $SED -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`]
# Make the cache file name correct relative to the subdirectory.
case "$cache_file" in
Modified: subversion/branches/1.6.x-issue3432/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/ac-macros/swig.m4?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/ac-macros/swig.m4 (original)
+++ subversion/branches/1.6.x-issue3432/build/ac-macros/swig.m4 Tue Mar 16 18:03:37 2010
@@ -53,7 +53,7 @@ AC_DEFUN(SVN_FIND_SWIG,
if test "$SWIG" != "none"; then
AC_MSG_CHECKING([swig version])
SWIG_VERSION_RAW="`$SWIG -version 2>&1 | \
- sed -ne 's/^.*Version \(.*\)$/\1/p'`"
+ $SED -ne 's/^.*Version \(.*\)$/\1/p'`"
# We want the version as an integer so we can test against
# which version we're using. SWIG doesn't provide this
# to us so we have to come up with it on our own.
@@ -62,7 +62,7 @@ AC_DEFUN(SVN_FIND_SWIG,
# and the patch level is zero padded to three places.
# e.g. 1.3.24 becomes 103024
SWIG_VERSION="`echo \"$SWIG_VERSION_RAW\" | \
- sed -e 's/[[^0-9\.]].*$//' \
+ $SED -e 's/[[^0-9\.]].*$//' \
-e 's/\.\([[0-9]]\)$/.0\1/' \
-e 's/\.\([[0-9]][[0-9]]\)$/.0\1/' \
-e 's/\.\([[0-9]]\)\./0\1/; s/\.//g;'`"
@@ -190,7 +190,7 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_CACHE_CHECK([how to compile Ruby extensions], [svn_cv_ruby_compile],[
# Ruby doesn't like '-ansi', so strip that out of CFLAGS
- svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | sed -e "s/ -ansi//g"`"
+ svn_cv_ruby_compile="$rbconfig_CC `echo $CFLAGS | $SED -e "s/ -ansi//g"`"
])
SWIG_RB_COMPILE="$svn_cv_ruby_compile"
@@ -210,7 +210,7 @@ AC_DEFUN(SVN_FIND_SWIG,
AC_MSG_CHECKING([for rb_errinfo])
old_CFLAGS="$CFLAGS"
old_LIBS="$LIBS"
- CFLAGS="`echo $CFLAGS | sed -e "s/ -ansi//g"` $svn_cv_ruby_includes"
+ CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g"` $svn_cv_ruby_includes"
LIBS="$SWIG_RB_LIBS"
AC_LINK_IFELSE([
#include <ruby.h>
@@ -239,7 +239,7 @@ int main()
AC_MSG_CHECKING([where to install Ruby scripts])
AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[
svn_cv_ruby_sitedir_libsuffix="`echo "$rbconfig_sitelibdir" | \
- sed -e "s,^$rbconfig_sitedir,,"`"
+ $SED -e "s,^$rbconfig_sitedir,,"`"
])
SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])
@@ -247,7 +247,7 @@ int main()
AC_MSG_CHECKING([where to install Ruby extensions])
AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[
svn_cv_ruby_sitedir_archsuffix="`echo "$rbconfig_sitearchdir" | \
- sed -e "s,^$rbconfig_sitedir,,"`"
+ $SED -e "s,^$rbconfig_sitedir,,"`"
])
SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])
Modified: subversion/branches/1.6.x-issue3432/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/generator/gen_win.py?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/generator/gen_win.py (original)
+++ subversion/branches/1.6.x-issue3432/build/generator/gen_win.py Tue Mar 16 18:03:37 2010
@@ -151,7 +151,7 @@ class GeneratorBase(gen_base.GeneratorBa
def _find_bdb(self):
"Find the Berkeley DB library and version"
- for ver in ("47", "46", "45", "44", "43", "42", "41", "40"):
+ for ver in ("48", "47", "46", "45", "44", "43", "42", "41", "40"):
lib = "libdb" + ver
path = os.path.join(self.bdb_path, "lib")
if os.path.exists(os.path.join(path, lib + ".lib")):
Modified: subversion/branches/1.6.x-issue3432/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/build/run_tests.py?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/build/run_tests.py (original)
+++ subversion/branches/1.6.x-issue3432/build/run_tests.py Tue Mar 16 18:03:37 2010
@@ -16,6 +16,7 @@ test programs.
'''
import os, sys
+import time
import getopt
try:
@@ -135,6 +136,7 @@ class TestHarness:
self.log.write('START: %s\n' % progbase)
self.log.flush()
+ start_time = time.time()
if progbase[-3:] == '.py':
progname = sys.executable
cmdline = [quote(progname),
@@ -197,7 +199,14 @@ class TestHarness:
print('FAILURE')
else:
print('success')
- self.log.write('END: %s\n\n' % progbase)
+ elapsed_time = time.strftime('%H:%M:%S',
+ time.gmtime(time.time() - start_time))
+ if self.log:
+ self.log.write('END: %s\n' % progbase)
+ self.log.write('ELAPSED: %s %s\n\n' % (progbase, elapsed_time))
+ else:
+ print('END: %s\n' % progbase)
+ print('ELAPSED: %s %s\n' % (progbase, elapsed_time))
return failed
def _run_prog(self, progname, arglist):
Modified: subversion/branches/1.6.x-issue3432/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/configure.ac?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/configure.ac (original)
+++ subversion/branches/1.6.x-issue3432/configure.ac Tue Mar 16 18:03:37 2010
@@ -40,6 +40,10 @@ AC_PROG_CXX
# Look for a C pre-processor
AC_PROG_CPP
+# Look for a good sed
+# AC_PROG_SED was introduced in Autoconf 2.59b
+m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [SED="${SED:-sed}"])
+
# Grab target_cpu, so we can use it in the Solaris pkginfo file
AC_CANONICAL_TARGET
@@ -79,8 +83,8 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config)
# Either a space-separated list of allowable Neon versions, or "any" to
# mean allow anything.
-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28"
-NEON_RECOMMENDED_VER=0.28.4
+NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
+NEON_RECOMMENDED_VER="0.29.0"
NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
dnl You can skip the neon version check only if you know what you are doing
AC_ARG_ENABLE(neon-version-check,
@@ -448,10 +452,13 @@ if test "$enable_nls" = "yes"; then
enable_nls="no"
])
if test "$enable_nls" = "no"; then
+ # Destroy the cached result so we can test again
+ unset ac_cv_search_bindtextdomain
# On some systems, libintl needs libiconv to link properly,
# so try again with -liconv.
AC_SEARCH_LIBS(bindtextdomain, [intl],
[
+ enable_nls="yes"
# This is here so that -liconv ends up in LIBS
# if it worked with -liconv.
AC_CHECK_LIB(iconv, libiconv_open)
@@ -529,7 +536,7 @@ BUILD_RULES="fsmod-lib ramod-lib lib bin
if test "$svn_lib_berkeley_db" = "yes"; then
BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"
- INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`"
+ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-fsmod-lib/install-fsmod-lib install-bdb-lib/'`"
INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib"
BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
@@ -537,25 +544,25 @@ fi
if test "$svn_lib_neon" = "yes"; then
BUILD_RULES="$BUILD_RULES neon-lib"
- INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
+ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib"
fi
if test "$svn_lib_serf" = "yes"; then
BUILD_RULES="$BUILD_RULES serf-lib"
- INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-ramod-lib/install-ramod-lib install-serf-lib/'`"
+ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-serf-lib/'`"
INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-serf-lib"
fi
if test "$svn_lib_kwallet" = "yes"; then
BUILD_RULES="$BUILD_RULES kwallet-lib"
- INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-lib/install-lib install-kwallet-lib/'`"
+ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-kwallet-lib/'`"
INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-kwallet-lib"
fi
if test "$with_gnome_keyring" = "yes"; then
BUILD_RULES="$BUILD_RULES gnome-keyring-lib"
- INSTALL_RULES="`echo $INSTALL_RULES | sed 's/install-lib/install-lib install-gnome-keyring-lib/'`"
+ INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-lib/install-lib install-gnome-keyring-lib/'`"
INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-gnome-keyring-lib"
fi
@@ -680,15 +687,15 @@ AS_HELP_STRING([--enable-maintainer-mode
if test "$enable_debugging" = "yes" ; then
dnl At the moment, we don't want optimization, because we're
dnl debugging.
- CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-O[^ ]* //g'`"]
- CXXFLAGS=["`echo $CXXFLAGS' ' | sed -e 's/-O[^ ]* //g'`"]
+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-O[^ ]* //g'`"]
dnl SVN_DEBUG enables specific features for developer builds
dnl AP_DEBUG enables specific (Apache) features for developer builds
CFLAGS="$CFLAGS -DSVN_DEBUG -DAP_DEBUG"
CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG"
elif test "$enable_debugging" = "no" ; then
- CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"]
- CXXFLAGS=["`echo $CXXFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"]
+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"]
+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' | $SED -e 's/-g//g'`"]
dnl Compile with NDEBUG to get rid of assertions
CFLAGS="$CFLAGS -DNDEBUG"
CXXFLAGS="$CXXFLAGS -DNDEBUG"
@@ -986,9 +993,10 @@ AC_SUBST(INCLUDE_OUTPUTS)
AC_CONFIG_HEADERS(subversion/svn_private_config.h)
AC_CONFIG_COMMANDS([svn_private_config.h],
- [sed -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h > subversion/svn_private_config.h.new
+ [$SED -e "s/@SVN_DB_HEADER@/$SVN_DB_HEADER/" subversion/svn_private_config.h > subversion/svn_private_config.h.new
mv -f subversion/svn_private_config.h.new subversion/svn_private_config.h],
- [SVN_DB_HEADER="$SVN_DB_HEADER"])
+ [SED="$SED"
+ SVN_DB_HEADER="$SVN_DB_HEADER"])
AC_CONFIG_FILES([Makefile])
SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
Modified: subversion/branches/1.6.x-issue3432/contrib/cgi/mirror_dir_through_svn.README
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/contrib/cgi/mirror_dir_through_svn.README?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/contrib/cgi/mirror_dir_through_svn.README (original)
+++ subversion/branches/1.6.x-issue3432/contrib/cgi/mirror_dir_through_svn.README Tue Mar 16 18:03:37 2010
@@ -55,7 +55,7 @@ How to use it
1) Get a copy of svn_load_dirs.pl, revision 3787 or later. You can
find it in:
- http://svn.collab.net/repos/svn/trunk/tools/client-side/
+ http://svn.apache.org/repos/asf/subversion/trunk/tools/client-side/
2) Edit the configuration variables in mirror_dirs_through_svn.cgi so
it knows the location of svn, the location of svn_load_dirs.pl, the
Modified: subversion/branches/1.6.x-issue3432/contrib/client-side/emacs/psvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/contrib/client-side/emacs/psvn.el?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/contrib/client-side/emacs/psvn.el (original)
+++ subversion/branches/1.6.x-issue3432/contrib/client-side/emacs/psvn.el Tue Mar 16 18:03:37 2010
@@ -136,7 +136,7 @@
;; The latest version of psvn.el can be found at:
;; http://www.xsteve.at/prg/emacs/psvn.el
;; Or you can check it out from the subversion repository:
-;; svn co http://svn.collab.net/repos/svn/trunk/contrib/client-side/emacs emacs-svn
+;; svn co http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs emacs-svn
;; TODO:
;; * shortcut for svn propset svn:keywords "Date" psvn.el
@@ -1701,7 +1701,7 @@ The results are used to build the `svn-s
;; (message "Going to skip %s" skip-double-external-dir-entry-name)
nil)
((looking-at "--- Changelist") ; skip svn changelist header lines
- ;; See: http://svn.collab.net/repos/svn/trunk/notes/changelist-design.txt
+ ;; See: http://svn.apache.org/repos/asf/subversion/trunk/notes/changelist-design.txt
nil)
(t
(setq svn-marks (buffer-substring (point) (+ (point) svn-marks-length))
Modified: subversion/branches/1.6.x-issue3432/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in (original)
+++ subversion/branches/1.6.x-issue3432/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Tue Mar 16 18:03:37 2010
@@ -1,5 +1,11 @@
#!/usr/bin/perl -w
+# Copyright (c) 2002,2003,2004,2005,2006,2007,2009 Dolby. All rights reserved.
+#
+# Licensed under the Academic Free License version 3.0. See LICENSE_AFL3.txt
+# or http://www.opensource.org/licenses/academic.php for a copy of the license
+# text.
+
# $HeadURL$
# $LastChangedDate$
# $LastChangedBy$
Modified: subversion/branches/1.6.x-issue3432/contrib/hook-scripts/commit-email.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/contrib/hook-scripts/commit-email.pl.in?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/contrib/hook-scripts/commit-email.pl.in (original)
+++ subversion/branches/1.6.x-issue3432/contrib/hook-scripts/commit-email.pl.in Tue Mar 16 18:03:37 2010
@@ -5,7 +5,7 @@
# using mailer.py for post-commit and post-revprop change
# notifications. If you wish to improve or add features to a
# post-commit notification script, please do that work on mailer.py.
-# See http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/mailer .
+# See http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/mailer .
# ====================================================================
# ====================================================================
Modified: subversion/branches/1.6.x-issue3432/contrib/server-side/svn-fast-backup
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/contrib/server-side/svn-fast-backup?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/contrib/server-side/svn-fast-backup (original)
+++ subversion/branches/1.6.x-issue3432/contrib/server-side/svn-fast-backup Tue Mar 16 18:03:37 2010
@@ -251,7 +251,7 @@ def do_rsync_backup():
### Use rsync to make a copy.
# We need to copy the 'current' file first.
# Don't copy the transactions/ directory.
- # See http://svn.collab.net/repos/svn/trunk/notes/fsfs
+ # See http://svn.apache.org/repos/asf/subversion/trunk/notes/fsfs
rsync_dest = os.path.join(backup_tmpdir,'')
Modified: subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror-test.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror-test.sh?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror-test.sh (original)
+++ subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror-test.sh Tue Mar 16 18:03:37 2010
@@ -7,7 +7,7 @@
#
# License:
# The same as svn itself. for latest version check:
-# http://svn.collab.net/repos/svn/trunk/subversion/LICENSE
+# http://svn.apache.org/repos/asf/subversion/trunk/subversion/LICENSE
#
#######################################################################
Modified: subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror.sh?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror.sh (original)
+++ subversion/branches/1.6.x-issue3432/contrib/server-side/svnmirror.sh Tue Mar 16 18:03:37 2010
@@ -65,14 +65,14 @@ VERSION="0.0.7"
#
# License:
# The same as svn itself. for latest version check:
-# http://svn.collab.net/repos/svn/trunk/subversion/LICENSE
+# http://svn.apache.org/repos/asf/subversion/trunk/subversion/LICENSE
#
# Thanks to the subversion team for their great work.
#
# Links:
# If you do not like our solution check:
# - svnpush
-# + http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn-push/svn-push.c
+# + http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svn-push/svn-push.c
# - svn replicate
# + https://open.datacore.ch/read-only/
# - SVN::Mirror and SVN::Web
Modified: subversion/branches/1.6.x-issue3432/doc/user/cvs-crossover-guide.html
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/doc/user/cvs-crossover-guide.html?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/doc/user/cvs-crossover-guide.html (original)
+++ subversion/branches/1.6.x-issue3432/doc/user/cvs-crossover-guide.html Tue Mar 16 18:03:37 2010
@@ -784,7 +784,7 @@ different convention altogether.</p>
<p>As an example, you can see all of Subversion's tags by running:</p>
<pre>
- $ svn ls --verbose http://svn.collab.net/repos/svn/tags
+ $ svn ls --verbose http://svn.apache.org/repos/asf/subversion/tags
…
7739 kfogel Nov 13 22:05 0.33.0/
7796 josander Nov 18 12:15 0.33.1/
Modified: subversion/branches/1.6.x-issue3432/notes/fs_dumprestore.txt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/notes/fs_dumprestore.txt?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/notes/fs_dumprestore.txt (original)
+++ subversion/branches/1.6.x-issue3432/notes/fs_dumprestore.txt Tue Mar 16 18:03:37 2010
@@ -1,5 +1,5 @@
This document has been moved to:
- http://svn.collab.net/repos/svn/trunk/notes/dump-load-format.txt
+ http://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt
(This forwarding pointer is just for link-compatibility.)
Modified: subversion/branches/1.6.x-issue3432/notes/interactive-conflict-resolution.txt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/notes/interactive-conflict-resolution.txt?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/notes/interactive-conflict-resolution.txt (original)
+++ subversion/branches/1.6.x-issue3432/notes/interactive-conflict-resolution.txt Tue Mar 16 18:03:37 2010
@@ -63,5 +63,5 @@ So your conflict-callback is going to ha
-> CLI simply says, "You want to delete the prop, they want to
set its value to blah." No other diff offered.
-http://svn.collab.net/repos/svn/trunk/subversion/svn/conflict-callbacks.c
+http://svn.apache.org/repos/asf/subversion/trunk/subversion/svn/conflict-callbacks.c
contains the conflict resolution callback for the command-line client.
Modified: subversion/branches/1.6.x-issue3432/notes/object-model.txt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/notes/object-model.txt?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/notes/object-model.txt (original)
+++ subversion/branches/1.6.x-issue3432/notes/object-model.txt Tue Mar 16 18:03:37 2010
@@ -167,4 +167,4 @@ Notes
[6] http://www.wxwidgets.org/
[7] http://mapserver.gis.umn.edu/
[8] http://svn.haxx.se/dev/archive-2003-10/0215.shtml
-[9] http://svn.collab.net/repos/svn/branches/ctypes-python-bindings/
+[9] http://svn.apache.org/repos/asf/subversion/branches/ctypes-python-bindings/
Modified: subversion/branches/1.6.x-issue3432/notes/sasl.txt
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/notes/sasl.txt?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/notes/sasl.txt (original)
+++ subversion/branches/1.6.x-issue3432/notes/sasl.txt Tue Mar 16 18:03:37 2010
@@ -190,13 +190,17 @@ Contents
===============
Cyrus SASL has two authentication mechanisms, PLAIN and LOGIN, that send the
- password over the network in plain text. This would be fine if the
- transmission medium was already encrypted with TLS (Transport Layer
- Security). However, the svn:// protocol doesn't support TLS yet, so both
- these mechanisms are currently disabled in both the client and the server.
+ password over the network in plain text. The svn:// protocol doesn't support
+ TLS yet, so both these mechanisms expose passwords to the network in clear
+ text.
- As a consequence, you won't be able to use the saslauthd daemon to
- authenticate users, because that method only works with plain text passwords.
+ As a consequence, users should take great care to secure the network link
+ by other means, such as by deploying a secure VPN or by using stunnel for
+ SSL encryption (http://stunnel.mirt.net/)
+
+ In particular, this problem affects users using the saslauthd daemon
+ to authenticate users, because that method only works with plain text
+ passwords.
8. GSSAPI
=========
Modified: subversion/branches/1.6.x-issue3432/packages/windows-WiX/BuildSubversion/Pre.rtf
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/packages/windows-WiX/BuildSubversion/Pre.rtf?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
Binary files - no diff available.
Modified: subversion/branches/1.6.x-issue3432/packages/windows-innosetup/Pre.rtf
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/packages/windows-innosetup/Pre.rtf?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/packages/windows-innosetup/Pre.rtf (original)
+++ subversion/branches/1.6.x-issue3432/packages/windows-innosetup/Pre.rtf Tue Mar 16 18:03:37 2010
@@ -5,7 +5,7 @@ Subversion is a compelling replacement f
\par
See:\par
http://subversion.tigris.org/ and\par
- http://svn.collab.net/repos/svn/trunk/CHANGES for more info.\par
+ http://svn.apache.org/repos/asf/subversion/trunk/CHANGES for more info.\par
\par
Subversion is using some external programs and libraries included in this package.\par
The proper licenses are in the licenses folder in the application path created after this installation.\par
Modified: subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/native/JNIUtil.cpp?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/native/JNIUtil.cpp Tue Mar 16 18:03:37 2010
@@ -234,7 +234,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
g_pool = svn_pool_create(NULL);
#if defined(WIN32) || defined(__CYGWIN__)
- /* See http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt */
+ /* See http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt */
/* ### This code really only needs to be invoked by consumers of
### the libsvn_wc library, which basically means SVNClient. */
if (getenv ("SVN_ASP_DOT_NET_HACK"))
Modified: subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java (original)
+++ subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java Tue Mar 16 18:03:37 2010
@@ -42,7 +42,7 @@ public interface SVNClientInterface
* @return The name of the working copy's administrative
* directory, which is usually <code>.svn</code>.
* @see <a
- * href="http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt">
+ * href="http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt">
* Instructions on changing this as a work-around for the behavior of
* ASP.Net on Windows.</a>
* @since 1.3
Modified: subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java (original)
+++ subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java Tue Mar 16 18:03:37 2010
@@ -70,7 +70,7 @@ public class SVNClientSynchronized imple
* @return The name of the working copy's administrative
* directory, which is usually <code>.svn</code>.
* @see <a
- * href="http://svn.collab.net/repos/svn/trunk/notes/asp-dot-net-hack.txt">
+ * href="http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt">
* Instructions on changing this as a work-around for the behavior of
* ASP.Net on Windows.</a>
* @since 1.3
Modified: subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java (original)
+++ subversion/branches/1.6.x-issue3432/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java Tue Mar 16 18:03:37 2010
@@ -21,7 +21,7 @@ package org.tigris.subversion.javahl;
/**
* Encapsulates version information about the underlying native
* libraries. Basically a wrapper for <a
- * href="http://svn.collab.net/repos/svn/trunk/subversion/include/svn_version.h"><code>svn_version.h</code></a>.
+ * href="http://svn.apache.org/repos/asf/subversion/trunk/subversion/include/svn_version.h"><code>svn_version.h</code></a>.
*/
public class Version
{
Modified: subversion/branches/1.6.x-issue3432/subversion/bindings/swig/include/svn_containers.swg
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/subversion/bindings/swig/include/svn_containers.swg?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/subversion/bindings/swig/include/svn_containers.swg (original)
+++ subversion/branches/1.6.x-issue3432/subversion/bindings/swig/include/svn_containers.swg Tue Mar 16 18:03:37 2010
@@ -667,6 +667,16 @@
/* -----------------------------------------------------------------------
Input of apr_array_header_t * <svn_opt_revision_range_t *>
*/
+#ifdef SWIGPYTHON
+%typemap(in) apr_array_header_t *REVISION_RANGE_LIST {
+ $1 = (apr_array_header_t *) svn_swig_py_struct_ptr_list_to_array($input,
+ $descriptor(svn_opt_revision_range_t *), _global_pool);
+ if (PyErr_Occurred()) {
+ SWIG_fail;
+ }
+}
+#endif
+
#ifdef SWIGRUBY
%typemap(in) apr_array_header_t *REVISION_RANGE_LIST {
$1 = svn_swig_rb_array_to_apr_array_revision_range($input, _global_pool);
Modified: subversion/branches/1.6.x-issue3432/subversion/bindings/swig/perl/native/Client.pm
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/subversion/bindings/swig/perl/native/Client.pm?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/subversion/bindings/swig/perl/native/Client.pm (original)
+++ subversion/branches/1.6.x-issue3432/subversion/bindings/swig/perl/native/Client.pm Tue Mar 16 18:03:37 2010
@@ -46,7 +46,7 @@ SVN::Client - Subversion client function
SVN::Client::get_username_provider()]
);
- $ctx->cat (\*STDOUT, 'http://svn.collab.net/repos/svn/trunk/README',
+ $ctx->cat (\*STDOUT, 'http://svn.apache.org/repos/asf/subversion/trunk/README',
'HEAD');
sub simple_prompt {
Modified: subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Tue Mar 16 18:03:37 2010
@@ -1243,6 +1243,51 @@ const apr_array_header_t *svn_swig_py_re
return temp;
}
+const apr_array_header_t *
+svn_swig_py_struct_ptr_list_to_array(PyObject *source,
+ swig_type_info *type_descriptor,
+ apr_pool_t *pool)
+{
+ int targlen;
+ apr_array_header_t *temp;
+
+ if (source == Py_None)
+ return NULL;
+
+ if (!PySequence_Check(source))
+ {
+ PyErr_SetString(PyExc_TypeError, "not a sequence");
+ return NULL;
+ }
+ targlen = PySequence_Length(source);
+ temp = apr_array_make(pool, targlen, sizeof(void *));
+
+ temp->nelts = targlen;
+ while (targlen--)
+ {
+ void *struct_ptr;
+ int status;
+ PyObject *o = PySequence_GetItem(source, targlen);
+ if (o == NULL)
+ return NULL;
+
+ status = svn_swig_ConvertPtr(o, &struct_ptr, type_descriptor);
+
+ if (status == 0)
+ {
+ APR_ARRAY_IDX(temp, targlen, void *) = struct_ptr;
+ Py_DECREF(o);
+ }
+ else
+ {
+ Py_DECREF(o);
+ PyErr_SetString(PyExc_TypeError,
+ "not a SWIG proxy of correct type");
+ return NULL;
+ }
+ }
+ return temp;
+}
/*** apr_array_header_t conversions. To create a new type of
Modified: subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h?rev=923910&r1=923909&r2=923910&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h (original)
+++ subversion/branches/1.6.x-issue3432/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h Tue Mar 16 18:03:37 2010
@@ -244,6 +244,16 @@ SVN_SWIG_SWIGUTIL_EXPORT
const apr_array_header_t *svn_swig_py_revnums_to_array(PyObject *source,
apr_pool_t *pool);
+/* helper function to convert a Python sequence of SWIG wrapper objects
+ into an APR array of pointers to the wrapped structs. The structs themselves
+ are not copied. */
+SVN_SWIG_SWIGUTIL_EXPORT
+const apr_array_header_t *
+svn_swig_py_struct_ptr_list_to_array(PyObject *source,
+ swig_type_info *type_descriptor,
+ apr_pool_t *pool);
+
+
/* make an editor that "thunks" from C callbacks up to Python */
SVN_SWIG_SWIGUTIL_EXPORT
void svn_swig_py_make_editor(const svn_delta_editor_t **editor,