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 2012/04/23 14:33:03 UTC
svn commit: r1329209 [1/38] - in /subversion/branches/javahl-ra: ./ build/
build/ac-macros/ build/generator/ build/generator/templates/ build/win32/
contrib/client-side/emacs/ contrib/client-side/vim/
contrib/server-side/mod_dontdothat/ notes/ notes/ap...
Author: hwright
Date: Mon Apr 23 12:32:48 2012
New Revision: 1329209
URL: http://svn.apache.org/viewvc?rev=1329209&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with trunk.
Added:
subversion/branches/javahl-ra/notes/directory-index/
- copied from r1329208, subversion/trunk/notes/directory-index/
subversion/branches/javahl-ra/subversion/bindings/javahl/Manifest.in
- copied unchanged from r1295003, subversion/trunk/subversion/bindings/javahl/Manifest.in
subversion/branches/javahl-ra/subversion/include/private/svn_delta_private.h
- copied unchanged from r1329208, subversion/trunk/subversion/include/private/svn_delta_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_named_atomic.h
- copied unchanged from r1329208, subversion/trunk/subversion/include/private/svn_named_atomic.h
subversion/branches/javahl-ra/subversion/libsvn_fs/editor.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_fs/editor.c
subversion/branches/javahl-ra/subversion/libsvn_ra/editor.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_ra/editor.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/sb_bucket.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_ra_serf/sb_bucket.c
subversion/branches/javahl-ra/subversion/libsvn_subr/base64.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/base64.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cache_config.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/cache_config.c
subversion/branches/javahl-ra/subversion/libsvn_subr/crypto.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/crypto.c
subversion/branches/javahl-ra/subversion/libsvn_subr/crypto.h
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/crypto.h
subversion/branches/javahl-ra/subversion/libsvn_subr/mutex.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/mutex.c
subversion/branches/javahl-ra/subversion/libsvn_subr/named_atomic.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/named_atomic.c
subversion/branches/javahl-ra/subversion/libsvn_subr/string.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/string.c
subversion/branches/javahl-ra/subversion/libsvn_subr/temp_serializer.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/temp_serializer.c
subversion/branches/javahl-ra/subversion/libsvn_subr/types.c
- copied unchanged from r1329208, subversion/trunk/subversion/libsvn_subr/types.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/crypto-test.c
- copied unchanged from r1329208, subversion/trunk/subversion/tests/libsvn_subr/crypto-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/named_atomic-test-common.h
- copied unchanged from r1329208, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test-common.h
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/named_atomic-test-proc.c
- copied unchanged from r1329208, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test-proc.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/named_atomic-test.c
- copied unchanged from r1329208, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/javahl-ra/tools/dev/aprerr.txt
- copied unchanged from r1329208, subversion/trunk/tools/dev/aprerr.txt
subversion/branches/javahl-ra/tools/dev/gdb-py/
- copied from r1295003, subversion/trunk/tools/dev/gdb-py/
subversion/branches/javahl-ra/tools/dev/merge-graph.py
- copied, changed from r1295003, subversion/trunk/tools/dev/merge-graph.py
subversion/branches/javahl-ra/tools/dev/mergegraph/
- copied from r1295003, subversion/trunk/tools/dev/mergegraph/
subversion/branches/javahl-ra/tools/dist/make-deps-tarball.sh (props changed)
- copied unchanged from r1329208, subversion/trunk/tools/dist/make-deps-tarball.sh
subversion/branches/javahl-ra/tools/examples/info.rb
- copied unchanged from r1295003, subversion/trunk/tools/examples/info.rb
subversion/branches/javahl-ra/tools/server-side/mod_dontdothat/ (props changed)
- copied from r1295003, subversion/trunk/tools/server-side/mod_dontdothat/
subversion/branches/javahl-ra/tools/server-side/svnpubsub/
- copied from r1295003, subversion/trunk/tools/server-side/svnpubsub/
subversion/branches/javahl-ra/tools/server-side/svnpubsub/daemonize.py
- copied unchanged from r1329208, subversion/trunk/tools/server-side/svnpubsub/daemonize.py
Removed:
subversion/branches/javahl-ra/contrib/client-side/vim/svn.vim
subversion/branches/javahl-ra/contrib/server-side/mod_dontdothat/
subversion/branches/javahl-ra/subversion/libsvn_subr/svn_base64.c
subversion/branches/javahl-ra/subversion/libsvn_subr/svn_cache_config.c
subversion/branches/javahl-ra/subversion/libsvn_subr/svn_mutex.c
subversion/branches/javahl-ra/subversion/libsvn_subr/svn_string.c
subversion/branches/javahl-ra/subversion/libsvn_subr/svn_temp_serializer.c
subversion/branches/javahl-ra/subversion/libsvn_subr/svn_types.c
subversion/branches/javahl-ra/subversion/tests/libsvn_delta/editor-test.c
subversion/branches/javahl-ra/tools/dist/templates/htaccess.ezt
subversion/branches/javahl-ra/tools/dist/templates/rc-candidates.ezt
subversion/branches/javahl-ra/tools/dist/templates/stable-candidates.ezt
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/CHANGES
subversion/branches/javahl-ra/COMMITTERS
subversion/branches/javahl-ra/INSTALL
subversion/branches/javahl-ra/Makefile.in
subversion/branches/javahl-ra/autogen.sh
subversion/branches/javahl-ra/build.conf
subversion/branches/javahl-ra/build/ac-macros/apache.m4
subversion/branches/javahl-ra/build/ac-macros/serf.m4
subversion/branches/javahl-ra/build/ac-macros/svn-macros.m4
subversion/branches/javahl-ra/build/find_python.sh
subversion/branches/javahl-ra/build/generator/gen_make.py
subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py
subversion/branches/javahl-ra/build/generator/gen_win.py
subversion/branches/javahl-ra/build/generator/templates/makefile.ezt
subversion/branches/javahl-ra/build/generator/templates/neon.vcxproj.ezt
subversion/branches/javahl-ra/build/generator/templates/serf.vcxproj.ezt
subversion/branches/javahl-ra/build/generator/templates/svn_config.vcxproj.ezt
subversion/branches/javahl-ra/build/generator/templates/svn_locale.vcxproj.ezt
subversion/branches/javahl-ra/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/javahl-ra/build/generator/templates/zlib.vcxproj.ezt
subversion/branches/javahl-ra/build/run_tests.py
subversion/branches/javahl-ra/build/win32/make_dist.py
subversion/branches/javahl-ra/build/win32/vc6-build.bat.in
subversion/branches/javahl-ra/configure.ac
subversion/branches/javahl-ra/contrib/client-side/emacs/dsvn.el
subversion/branches/javahl-ra/contrib/client-side/emacs/vc-svn.el
subversion/branches/javahl-ra/get-deps.sh
subversion/branches/javahl-ra/notes/api-errata/1.7/ra001.txt
subversion/branches/javahl-ra/notes/dump-load-format.txt
subversion/branches/javahl-ra/notes/http-and-webdav/webdav-protocol
subversion/branches/javahl-ra/notes/knobs
subversion/branches/javahl-ra/notes/merge-tracking/func-spec.html
subversion/branches/javahl-ra/notes/moves
subversion/branches/javahl-ra/notes/ra-serf-testing.txt
subversion/branches/javahl-ra/notes/repos-dictated-config
subversion/branches/javahl-ra/notes/subversion-design.html
subversion/branches/javahl-ra/notes/wc-ng/conflict-storage
subversion/branches/javahl-ra/subversion/bindings/javahl/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/README
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/File.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/javahl-ra/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/branches/javahl-ra/subversion/bindings/swig/INSTALL
subversion/branches/javahl-ra/subversion/bindings/swig/core.i
subversion/branches/javahl-ra/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/javahl-ra/subversion/bindings/swig/include/svn_types.swg
subversion/branches/javahl-ra/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/branches/javahl-ra/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Base.pm (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Client.pm (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Core.pm (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Delta.pm (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Fs.pm (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Ra.pm (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Repos.pm (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Wc.pm (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/t/0use.t (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/t/1repos.t (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/t/2fs.t (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/t/3client.t (contents, props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/t/4pool.t (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/t/5delta-compat.t (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/t/5delta.t (props changed)
subversion/branches/javahl-ra/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/javahl-ra/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/javahl-ra/subversion/bindings/swig/python/svn/client.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/svn/core.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/svn/delta.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/svn/diff.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/svn/fs.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/svn/ra.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/svn/repos.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/svn/wc.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/tests/client.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/tests/mergeinfo.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/tests/pool.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/tests/repository.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
subversion/branches/javahl-ra/subversion/bindings/swig/python/tests/wc.py
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/svn/core.rb
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/svn/fs.rb
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/test/test_delta.rb
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/test/test_repos.rb
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/javahl-ra/subversion/bindings/swig/ruby/test/util.rb
subversion/branches/javahl-ra/subversion/include/private/svn_auth_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_cache.h
subversion/branches/javahl-ra/subversion/include/private/svn_client_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_cmdline_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_debug.h
subversion/branches/javahl-ra/subversion/include/private/svn_dep_compat.h
subversion/branches/javahl-ra/subversion/include/private/svn_error_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_fs_util.h
subversion/branches/javahl-ra/subversion/include/private/svn_fspath.h
subversion/branches/javahl-ra/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_mutex.h (contents, props changed)
subversion/branches/javahl-ra/subversion/include/private/svn_opt_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_ra_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_repos_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_string_private.h
subversion/branches/javahl-ra/subversion/include/private/svn_subr_private.h (contents, props changed)
subversion/branches/javahl-ra/subversion/include/private/svn_temp_serializer.h
subversion/branches/javahl-ra/subversion/include/private/svn_wc_private.h
subversion/branches/javahl-ra/subversion/include/svn_checksum.h
subversion/branches/javahl-ra/subversion/include/svn_client.h
subversion/branches/javahl-ra/subversion/include/svn_config.h
subversion/branches/javahl-ra/subversion/include/svn_delta.h
subversion/branches/javahl-ra/subversion/include/svn_diff.h
subversion/branches/javahl-ra/subversion/include/svn_dirent_uri.h
subversion/branches/javahl-ra/subversion/include/svn_editor.h
subversion/branches/javahl-ra/subversion/include/svn_error.h
subversion/branches/javahl-ra/subversion/include/svn_error_codes.h
subversion/branches/javahl-ra/subversion/include/svn_fs.h
subversion/branches/javahl-ra/subversion/include/svn_io.h
subversion/branches/javahl-ra/subversion/include/svn_mergeinfo.h
subversion/branches/javahl-ra/subversion/include/svn_pools.h
subversion/branches/javahl-ra/subversion/include/svn_props.h
subversion/branches/javahl-ra/subversion/include/svn_ra.h
subversion/branches/javahl-ra/subversion/include/svn_ra_svn.h
subversion/branches/javahl-ra/subversion/include/svn_repos.h
subversion/branches/javahl-ra/subversion/include/svn_sorts.h
subversion/branches/javahl-ra/subversion/include/svn_string.h
subversion/branches/javahl-ra/subversion/include/svn_utf.h
subversion/branches/javahl-ra/subversion/include/svn_wc.h
subversion/branches/javahl-ra/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/branches/javahl-ra/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/javahl-ra/subversion/libsvn_client/add.c
subversion/branches/javahl-ra/subversion/libsvn_client/checkout.c
subversion/branches/javahl-ra/subversion/libsvn_client/client.h
subversion/branches/javahl-ra/subversion/libsvn_client/cmdline.c
subversion/branches/javahl-ra/subversion/libsvn_client/commit.c
subversion/branches/javahl-ra/subversion/libsvn_client/commit_util.c
subversion/branches/javahl-ra/subversion/libsvn_client/copy.c
subversion/branches/javahl-ra/subversion/libsvn_client/delete.c
subversion/branches/javahl-ra/subversion/libsvn_client/deprecated.c
subversion/branches/javahl-ra/subversion/libsvn_client/diff.c
subversion/branches/javahl-ra/subversion/libsvn_client/export.c
subversion/branches/javahl-ra/subversion/libsvn_client/externals.c
subversion/branches/javahl-ra/subversion/libsvn_client/info.c
subversion/branches/javahl-ra/subversion/libsvn_client/log.c
subversion/branches/javahl-ra/subversion/libsvn_client/merge.c
subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.c
subversion/branches/javahl-ra/subversion/libsvn_client/mergeinfo.h
subversion/branches/javahl-ra/subversion/libsvn_client/patch.c
subversion/branches/javahl-ra/subversion/libsvn_client/prop_commands.c
subversion/branches/javahl-ra/subversion/libsvn_client/ra.c
subversion/branches/javahl-ra/subversion/libsvn_client/repos_diff.c
subversion/branches/javahl-ra/subversion/libsvn_client/status.c
subversion/branches/javahl-ra/subversion/libsvn_client/switch.c
subversion/branches/javahl-ra/subversion/libsvn_client/update.c
subversion/branches/javahl-ra/subversion/libsvn_client/util.c
subversion/branches/javahl-ra/subversion/libsvn_delta/compat.c
subversion/branches/javahl-ra/subversion/libsvn_delta/delta.h
subversion/branches/javahl-ra/subversion/libsvn_delta/editor.c
subversion/branches/javahl-ra/subversion/libsvn_delta/svndiff.c
subversion/branches/javahl-ra/subversion/libsvn_delta/text_delta.c
subversion/branches/javahl-ra/subversion/libsvn_delta/xdelta.c
subversion/branches/javahl-ra/subversion/libsvn_diff/diff_file.c
subversion/branches/javahl-ra/subversion/libsvn_diff/parse-diff.c
subversion/branches/javahl-ra/subversion/libsvn_fs/fs-loader.c
subversion/branches/javahl-ra/subversion/libsvn_fs/fs-loader.h
subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/locks-table.c
subversion/branches/javahl-ra/subversion/libsvn_fs_base/fs.c
subversion/branches/javahl-ra/subversion/libsvn_fs_base/id.c
subversion/branches/javahl-ra/subversion/libsvn_fs_base/notes/structure
subversion/branches/javahl-ra/subversion/libsvn_fs_base/reps-strings.c
subversion/branches/javahl-ra/subversion/libsvn_fs_base/tree.c
subversion/branches/javahl-ra/subversion/libsvn_fs_base/util/fs_skels.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/caching.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/dag.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/dag.h
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs.h
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/id.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/structure
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/temp_serializer.h
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/tree.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/tree.h
subversion/branches/javahl-ra/subversion/libsvn_ra/compat.c
subversion/branches/javahl-ra/subversion/libsvn_ra/ra_loader.c
subversion/branches/javahl-ra/subversion/libsvn_ra/ra_loader.h
subversion/branches/javahl-ra/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/javahl-ra/subversion/libsvn_ra_neon/commit.c
subversion/branches/javahl-ra/subversion/libsvn_ra_neon/fetch.c
subversion/branches/javahl-ra/subversion/libsvn_ra_neon/log.c
subversion/branches/javahl-ra/subversion/libsvn_ra_neon/merge.c
subversion/branches/javahl-ra/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/javahl-ra/subversion/libsvn_ra_neon/session.c
subversion/branches/javahl-ra/subversion/libsvn_ra_neon/util.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/blame.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/commit.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/getdate.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/getlocks.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/locks.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/log.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/merge.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/options.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/property.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/replay.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/serf.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/update.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/util.c
subversion/branches/javahl-ra/subversion/libsvn_ra_serf/xml.c
subversion/branches/javahl-ra/subversion/libsvn_ra_svn/client.c
subversion/branches/javahl-ra/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/javahl-ra/subversion/libsvn_ra_svn/editorp.c
subversion/branches/javahl-ra/subversion/libsvn_ra_svn/marshal.c
subversion/branches/javahl-ra/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/javahl-ra/subversion/libsvn_repos/authz.c
subversion/branches/javahl-ra/subversion/libsvn_repos/commit.c
subversion/branches/javahl-ra/subversion/libsvn_repos/deprecated.c
subversion/branches/javahl-ra/subversion/libsvn_repos/dump.c
subversion/branches/javahl-ra/subversion/libsvn_repos/fs-wrap.c
subversion/branches/javahl-ra/subversion/libsvn_repos/hooks.c
subversion/branches/javahl-ra/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/javahl-ra/subversion/libsvn_repos/log.c
subversion/branches/javahl-ra/subversion/libsvn_repos/replay.c
subversion/branches/javahl-ra/subversion/libsvn_repos/reporter.c
subversion/branches/javahl-ra/subversion/libsvn_repos/repos.c
subversion/branches/javahl-ra/subversion/libsvn_repos/repos.h
subversion/branches/javahl-ra/subversion/libsvn_repos/rev_hunt.c
subversion/branches/javahl-ra/subversion/libsvn_subr/auth.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cache-memcache.c
subversion/branches/javahl-ra/subversion/libsvn_subr/checksum.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cmdline.c
subversion/branches/javahl-ra/subversion/libsvn_subr/config.c
subversion/branches/javahl-ra/subversion/libsvn_subr/config_file.c
subversion/branches/javahl-ra/subversion/libsvn_subr/debug.c
subversion/branches/javahl-ra/subversion/libsvn_subr/deprecated.c
subversion/branches/javahl-ra/subversion/libsvn_subr/dirent_uri.c
subversion/branches/javahl-ra/subversion/libsvn_subr/error.c
subversion/branches/javahl-ra/subversion/libsvn_subr/gpg_agent.c (contents, props changed)
subversion/branches/javahl-ra/subversion/libsvn_subr/io.c
subversion/branches/javahl-ra/subversion/libsvn_subr/macos_keychain.c
subversion/branches/javahl-ra/subversion/libsvn_subr/mergeinfo.c
subversion/branches/javahl-ra/subversion/libsvn_subr/opt.c
subversion/branches/javahl-ra/subversion/libsvn_subr/pool.c
subversion/branches/javahl-ra/subversion/libsvn_subr/properties.c
subversion/branches/javahl-ra/subversion/libsvn_subr/simple_providers.c
subversion/branches/javahl-ra/subversion/libsvn_subr/skel.c
subversion/branches/javahl-ra/subversion/libsvn_subr/spillbuf.c (contents, props changed)
subversion/branches/javahl-ra/subversion/libsvn_subr/sqlite.c
subversion/branches/javahl-ra/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
subversion/branches/javahl-ra/subversion/libsvn_subr/ssl_server_trust_providers.c
subversion/branches/javahl-ra/subversion/libsvn_subr/stream.c
subversion/branches/javahl-ra/subversion/libsvn_subr/time.c
subversion/branches/javahl-ra/subversion/libsvn_subr/utf.c
subversion/branches/javahl-ra/subversion/libsvn_subr/win32_crypto.c
subversion/branches/javahl-ra/subversion/libsvn_wc/adm_crawler.c
subversion/branches/javahl-ra/subversion/libsvn_wc/adm_ops.c
subversion/branches/javahl-ra/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/branches/javahl-ra/subversion/libsvn_wc/copy.c
subversion/branches/javahl-ra/subversion/libsvn_wc/deprecated.c
subversion/branches/javahl-ra/subversion/libsvn_wc/diff_editor.c
subversion/branches/javahl-ra/subversion/libsvn_wc/entries.c
subversion/branches/javahl-ra/subversion/libsvn_wc/externals.c
subversion/branches/javahl-ra/subversion/libsvn_wc/info.c
subversion/branches/javahl-ra/subversion/libsvn_wc/node.c
subversion/branches/javahl-ra/subversion/libsvn_wc/props.c
subversion/branches/javahl-ra/subversion/libsvn_wc/questions.c
subversion/branches/javahl-ra/subversion/libsvn_wc/status.c
subversion/branches/javahl-ra/subversion/libsvn_wc/update_editor.c
subversion/branches/javahl-ra/subversion/libsvn_wc/util.c
subversion/branches/javahl-ra/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/javahl-ra/subversion/libsvn_wc/wc-queries.sql
subversion/branches/javahl-ra/subversion/libsvn_wc/wc.h
subversion/branches/javahl-ra/subversion/libsvn_wc/wc_db.c
subversion/branches/javahl-ra/subversion/libsvn_wc/wc_db.h
subversion/branches/javahl-ra/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/javahl-ra/subversion/libsvn_wc/wc_db_private.h
subversion/branches/javahl-ra/subversion/libsvn_wc/wc_db_util.c
subversion/branches/javahl-ra/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/javahl-ra/subversion/libsvn_wc/workqueue.c
subversion/branches/javahl-ra/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/dav_svn.h
subversion/branches/javahl-ra/subversion/mod_dav_svn/liveprops.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/lock.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/merge.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/reports/log.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/reports/update.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/repos.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/util.c
subversion/branches/javahl-ra/subversion/mod_dav_svn/version.c
subversion/branches/javahl-ra/subversion/po/de.po
subversion/branches/javahl-ra/subversion/po/fr.po
subversion/branches/javahl-ra/subversion/po/ja.po
subversion/branches/javahl-ra/subversion/po/zh_CN.po
subversion/branches/javahl-ra/subversion/svn/cat-cmd.c
subversion/branches/javahl-ra/subversion/svn/cl.h
subversion/branches/javahl-ra/subversion/svn/commit-cmd.c
subversion/branches/javahl-ra/subversion/svn/copy-cmd.c
subversion/branches/javahl-ra/subversion/svn/delete-cmd.c
subversion/branches/javahl-ra/subversion/svn/diff-cmd.c
subversion/branches/javahl-ra/subversion/svn/import-cmd.c
subversion/branches/javahl-ra/subversion/svn/list-cmd.c
subversion/branches/javahl-ra/subversion/svn/log-cmd.c
subversion/branches/javahl-ra/subversion/svn/main.c
subversion/branches/javahl-ra/subversion/svn/merge-cmd.c
subversion/branches/javahl-ra/subversion/svn/mergeinfo-cmd.c
subversion/branches/javahl-ra/subversion/svn/mkdir-cmd.c
subversion/branches/javahl-ra/subversion/svn/move-cmd.c
subversion/branches/javahl-ra/subversion/svn/notify.c
subversion/branches/javahl-ra/subversion/svn/propedit-cmd.c
subversion/branches/javahl-ra/subversion/svn/proplist-cmd.c
subversion/branches/javahl-ra/subversion/svn/status-cmd.c
subversion/branches/javahl-ra/subversion/svn/status.c
subversion/branches/javahl-ra/subversion/svn/util.c
subversion/branches/javahl-ra/subversion/svnadmin/main.c
subversion/branches/javahl-ra/subversion/svndumpfilter/main.c
subversion/branches/javahl-ra/subversion/svnlook/main.c
subversion/branches/javahl-ra/subversion/svnrdump/dump_editor.c
subversion/branches/javahl-ra/subversion/svnrdump/load_editor.c
subversion/branches/javahl-ra/subversion/svnrdump/svnrdump.c
subversion/branches/javahl-ra/subversion/svnrdump/svnrdump.h
subversion/branches/javahl-ra/subversion/svnserve/main.c
subversion/branches/javahl-ra/subversion/svnserve/serve.c
subversion/branches/javahl-ra/subversion/svnserve/server.h
subversion/branches/javahl-ra/subversion/svnsync/main.c
subversion/branches/javahl-ra/subversion/svnsync/sync.c
subversion/branches/javahl-ra/subversion/svnversion/main.c
subversion/branches/javahl-ra/subversion/tests/README
subversion/branches/javahl-ra/subversion/tests/cmdline/README
subversion/branches/javahl-ra/subversion/tests/cmdline/authz_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/basic_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/checkout_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/commit_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/copy_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/davautocheck.sh
subversion/branches/javahl-ra/subversion/tests/cmdline/depth_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/diff_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/externals_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/javahl-ra/subversion/tests/cmdline/info_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/input_validation_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/lock_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/log_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/log_tests_data/merge_history_repo.png
subversion/branches/javahl-ra/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/merge_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/patch_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/prop_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/resolve_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/special_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/stat_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/__init__.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/actions.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/factory.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/main.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/tree.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/verify.py
subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/wc.py
subversion/branches/javahl-ra/subversion/tests/cmdline/switch_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/trans_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py
subversion/branches/javahl-ra/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/javahl-ra/subversion/tests/libsvn_client/ (props changed)
subversion/branches/javahl-ra/subversion/tests/libsvn_client/client-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_delta/window-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_fs/locks-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_ra_local/ra-local-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/ (props changed)
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/cache-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/checksum-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/config-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/config-test.cfg
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/spillbuf-test.c (contents, props changed)
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/string-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_wc/db-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/javahl-ra/subversion/tests/libsvn_wc/wc-incomplete-tester.c (contents, props changed)
subversion/branches/javahl-ra/subversion/tests/svn_test.h
subversion/branches/javahl-ra/subversion/tests/svn_test_main.c
subversion/branches/javahl-ra/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/javahl-ra/tools/client-side/detach.py
subversion/branches/javahl-ra/tools/client-side/mergeinfo-sanitizer.py (contents, props changed)
subversion/branches/javahl-ra/tools/client-side/svn-ssl-fingerprints.sh
subversion/branches/javahl-ra/tools/client-side/svnmucc/svnmucc.c
subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/ (props changed)
subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/printers.py
subversion/branches/javahl-ra/tools/dev/mergegraph/mergegraph.py
subversion/branches/javahl-ra/tools/dev/po-merge.py
subversion/branches/javahl-ra/tools/dev/svnraisetreeconflict/main.c
subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn
subversion/branches/javahl-ra/tools/dev/which-error.py
subversion/branches/javahl-ra/tools/dev/windows-build/Makefile
subversion/branches/javahl-ra/tools/diff/diff.c
subversion/branches/javahl-ra/tools/dist/_gnupg.py
subversion/branches/javahl-ra/tools/dist/backport.pl
subversion/branches/javahl-ra/tools/dist/dist.sh
subversion/branches/javahl-ra/tools/dist/release.py
subversion/branches/javahl-ra/tools/examples/SvnCLBrowse
subversion/branches/javahl-ra/tools/examples/get-location-segments.py
subversion/branches/javahl-ra/tools/server-side/mod_dontdothat/mod_dontdothat.c
subversion/branches/javahl-ra/tools/server-side/svn-rep-sharing-stats.c
subversion/branches/javahl-ra/tools/server-side/svnpredumpfilter.py
subversion/branches/javahl-ra/tools/server-side/svnpubsub/README.txt
subversion/branches/javahl-ra/tools/server-side/svnpubsub/rc.d/svnwcsub
subversion/branches/javahl-ra/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
subversion/branches/javahl-ra/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnpubsub/client.py
subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnpubsub/server.py
subversion/branches/javahl-ra/tools/server-side/svnpubsub/svntweet.py
subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnwcsub.py
subversion/branches/javahl-ra/tools/server-side/svnpubsub/test.conf
subversion/branches/javahl-ra/tools/server-side/svnpubsub/watcher.py
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/branches/multi-layer-moves:r1239019-1300930
Merged /subversion/trunk:r1200001-1295003,1295006-1329208
Merged /subversion/branches/revprop-cache:r1298521-1326293
Merged /subversion/branches/node_pool:r1304828-1305388
Modified: subversion/branches/javahl-ra/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/CHANGES?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/CHANGES (original)
+++ subversion/branches/javahl-ra/CHANGES Mon Apr 23 12:32:48 2012
@@ -4,7 +4,7 @@ http://svn.apache.org/repos/asf/subversi
User-visible changes:
- General:
- *
+ * remove extraneous externals output from 'svn status -q' (issue #1935)
- Major new features:
*
@@ -12,6 +12,16 @@ http://svn.apache.org/repos/asf/subversi
- Minor new features and improvements:
* new 'svnadmin load --revision' load filtering support (issue #3734)
* new 'commit --include-externals' option (related to issues #1167, #3563)
+ * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
+ * reject some attempts to merge between unrelated branches (r1215273)
+ * support GPG agent for password storage on UNIX-like platforms (r1150783)
+ * new 'svnadmin lock' / 'svnadmin unlock' subcommands (issue #3942, #4092)
+ * new SVNUseUTF8 configuration option for mod_dav_svn (issue #2487)
+ * new SVNHooksEnv configuration option for mod_dav_svn (r1239966)
+ * new --ignore-properties option for 'svn diff' (r1239553. -617)
+ * new --patch-compatible option for 'svn diff' (r1239561)
+ * new SvnPubSub distributed commit hooks (tools/server-side/svnpubsub)
+ * 'svn diff' can compare arbitrary files and directories (r1310291, et al)
- Client-side bugfixes:
*
@@ -24,7 +34,7 @@ http://svn.apache.org/repos/asf/subversi
Developer-visible changes:
- General:
- *
+ * Now require Python 2.5 for tests and dev tools (r1243627)
- API changes:
* fix inconsistent handling of log revs without changed paths (issue #3694)
@@ -32,6 +42,138 @@ http://svn.apache.org/repos/asf/subversi
- Bindings:
*
+
+Version 1.7.5
+(26 Apr 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.5
+
+ User-visible changes:
+ * avoid potential segfault when canonicalizing properties (r1296369)
+ * fix non-fatal FSFS corruption bug with concurrent commits (issue #4129)
+ * improve memory and file-handle management with externals (issue #4130)
+ * ra_serf: convert assertions to errors: MERGE fails (r1302417)
+ * mod_dav_svn: error on MERGE of non-existent resource (r1298343)
+ * fix undefined behaviour during multi-segment reverse merges (issue #4144)
+ * fix potential pool lifetime problem in the diff code (r1311935)
+ * libsvn_wc: reduce resources use while looking for the wc root (r1306334)
+ * cmdline: fix segfault during 'svn diff' argument processing (r1311702)
+ * fix regression with deep commit followed by depthy update (issue #4136)
+ * propset: avoid reading unitialised variable in error path (r1325361)
+ * mod_dav_svn: support httpd-2.4 (r1232267)
+ * mod_dav_svn: forbid BDB repositories under event MPM (issue #4157)
+
+ Developer-visible changes:
+ * swig-py tests: avoid FAILs on APR hash order (r1296137, r1292248)
+ * swig-rb tests: avoid FAILs on APR hash order (r1310535, r1310594)
+ * windows example distribution scripts: include svnrdump (r1295007)
+
+
+Version 1.7.4
+(08 Mar 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.4
+
+ User-visible changes:
+ * fix 'svn log --diff' for moved paths (r1210147, et al)
+ * fix ra_serf problem with reading directory entries via HTTPv2 (r1238121)
+ * prepend "sqlite:" to error messages from SQLite (r1245738, -817)
+ * fix randomly missing "Merged via" notifications in 'svn log -g' (r1293229)
+ * fix spurious conflict when merging deleted symbolic link (issue #4052)
+ * fix URL-to-WC copy of externals on Windows (issue #4123)
+ * improve an FSFS sanity-check error message (r1294470)
+ * fix regressions with symlinks pointing at externals (issue #4102)
+ * fix 'svn log --diff' output ordering issue on Windows (r1295671)
+
+ Developer-visible changes:
+ * don't build mod_dontdothat if not building with httpd (r1243976)
+ * fix the testsuite to avoid FAILs on APR hash order (r1230714, et al)
+
+
+Version 1.7.3
+(14 Feb 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.3
+
+ General:
+ * ship mod_dontdothat with the standard release
+
+ User-visible changes:
+ * fix segfault on 'svn rm $ROOT_URL' (issue #4074)
+ * replace a couple of assertions in favor of errors (r1207858, -949)
+ * fix a server assert after being upgraded (r1210195)
+ * fix segfault on 'svn mkdir svn://localhost' (r1211483)
+ * make 'svnadmin recover' prune the rep cache (r1213331, et al)
+ * make svnmucc use values from --config-dir option
+ * update and clarify the merge help text (r1154121, et al)
+ * replace wc assertion with informative error (r1222521, -693)
+ * copy permissions correctly for FSFS dirs (r1229252)
+ * improve 'svn log --with-all-revprops' over ra-dav (issue #4082)
+ * fix segfault when remapping a file external (issue #4093)
+ * fix segfault caused by obstructing unversioned dir (r1229677)
+ * fix regression on first update of external dir with '-r' (issue #4053)
+ * fix various EOL-handling problems in 'svn patch' (issues #3814, #3991)
+ * fix segfault in 'svn revert' (r1229303)
+ * improve correctness of 'svn patch --dry-run' (r1231944, -5)
+ * enforce revisions given in 'svn:externals' (issue #4053)
+ * fix potential corruption on 32-bit FSFS with large files (r1230212)
+ * make 'svn status --xml' show new files (issue #4097)
+ * fix 'svn mergeinfo' correctness (issue #4050)
+ * return the correct status for non-present nodes (r1232202, -07, -21, -22)
+ * improve SASL error messages (r1236343, et al)
+ * improve server cert error code for ra_serf (r1232413)
+ * fix SVNParentPath listings for parent path symlinks (r1221767, -80)
+ * fix mod_dav_svn's handling of POST errors (issue #4086)
+ * log some mod_dav_svn errors, rather than ignoring them (r1237720, -9596)
+ * relax requirements for canonicalization in mod_dav_svn (r1236173)
+ * fix a rare source of FSFS corruption (r1240752)
+ * allow committing the result of some copy operations (issue #4059)
+ * prevent one-byte buffer overflow in base64 decoding (r1242337)
+
+ Developer-visible changes:
+ * JavaHL: Add missing notify action, fixing an exception (r1221793)
+ * fix swig-py memory leak (r1235264, -296, -302, -736)
+ * fix spurious test suite failure (r1220742, -50)
+ * allow running tests on UNC shares (r1225491)
+ * bindings: see platform-specific password providers (r1242660, -1)
+ * skip 'svnrdump dump' tests over ra_serf (r1242537)
+ * convert a few ra_serf assertions to errors (r1242607)
+
+
+Version 1.7.2
+(02 Dec 2011, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.2
+
+ User-visible changes:
+ * fix working copy corruption after interrupted update/switch (issue #4040)
+ * avoid segfaults against pre-1.5 servers (r1186928)
+ * improve configure error message if apr-util uses old or no bdb (r1186784)
+ * make 'svn patch' ignore '/dev/null' targets for compat with git (r1197998)
+ * fix 'svn patch' segfault on patch that skips and deletes files (r1199950)
+ * omit "Committed revision N." output from 'svn commit --quiet' (r1200837)
+ * fix authz denial when svnserve root is a repository (issue #4060)
+ * fix uninitialized memory read in client diff code (r1201002)
+ * avoid potential segfault during merges (r1202807)
+ * fix an assertion failure when a symlink is updated (r1186944, -81, -83)
+ * make working copy operations fail if nodes have no base checksum (r1202630)
+ * fix nested <Location>s when using v2 protocol (r1203546, -651, -653)
+ * make mod_dav_svn ignore non-Subversion POST requests (r1187695)
+ * avoid reading freed memory (r1204478)
+ * recognize empty (only byte order mark) UTF-8 files as text (issue #4064)
+ * fix 1.7 client regression when operating against a 1.0.x server (r1199876)
+ * remove empty parent dirs of removed externals on update (issue #4044)
+ * make 'svn diff -c N' work for files added in rN (issue #2873)
+ * plug a memory leak in the bdb backend (r1205726)
+ * fix 'svn import' with native eol-style and inconsistent EOLs (r1205193)
+ * fix reading beyond the end of a string in bdb backend (r1205839, -48)
+ * don't assert when committing an incomplete directory (issue #4042)
+
+ Developer-visible changes:
+ * JavaHL: allow 'status -u' to function properly (r1189190, -395)
+ * don't put '\r' characters in our generate sql headers (r1189580)
+ * properly define WIN64 on Windows x64 builds (r1188609)
+ * better adherence to C89 in enum definitions (r1189665)
+ * bump copyright year in Windows DLLs (r1189261)
+ * log a better error when opening rep-cache.db fails (r1204610, -73)
+
+
Version 1.7.1
(24 Oct 2011, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.1
@@ -268,6 +410,30 @@ the 1.6 release: http://subversion.apac
* fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
+Version 1.6.18
+(29 Mar 2012, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.18
+
+ User-visible changes:
+ * reject invalid svn:mergeinfo at commit time over DAV (issue #3953)
+ * fix reintegrate merge regression introduced in 1.6.13 (issue #3957)
+ * make the stderr output of the post-commit hook XML-safe (r893478)
+ * fix a rare source of FSFS corruption (r1240752)
+ * plug a memory leak in the bdb backend (r1205726)
+ * server-side performance fix for "log -g" (r1152282)
+ * fix description of svndumpfilter's --targets option (r1151911)
+ * fix datastream corruption during resumed transfer in ra_serf (r1154733)
+ * fix a crash in ra_svn SASL authentication (r1166555, -678)
+ * fix potential corruption on 32-bit FSFS with large files (r1230212)
+ * make website links point to subversion.apache.org (r896893, -901, r915036)
+ * fix non-fatal FSFS corruption bug with concurrent commits (issue #4129)
+
+ Developer-visible changes:
+ * fix sqlite distfile retrieval in get-deps.sh (r1134734)
+ * fix swig-py memory leak (r1235264, -296, -302, -736)
+ * allow passing --with-jdk to gen-make.py on Windows (r966167)
+
+
Version 1.6.17
(01 Jun 2011, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.17
@@ -296,10 +462,10 @@ http://svn.apache.org/repos/asf/subversi
* fix 'log -g' excessive duplicate output (issue #3650)
* fix svnsync copyfrom handling bug with BDB (r1036429)
* server-side validation of svn:mergeinfo syntax during commit (issue #3895)
- * fix remotely triggerable mod_dav_svn DoS
+ * fix remotely triggerable mod_dav_svn DoS (r1130303)
See CVE-2011-1783, and descriptive advisory at
http://subversion.apache.org/security/CVE-2011-1783-advisory.txt
- * fix potential leak of authz-protected file contents
+ * fix potential leak of authz-protected file contents (r1130303)
See CVE-2011-1921, and descriptive advisory at
http://subversion.apache.org/security/CVE-2011-1921-advisory.txt
Modified: subversion/branches/javahl-ra/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/COMMITTERS?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/COMMITTERS [UTF-8] (original)
+++ subversion/branches/javahl-ra/COMMITTERS [UTF-8] Mon Apr 23 12:32:48 2012
@@ -57,6 +57,7 @@ Blanket commit access:
dannas Daniel Näslund <da...@dannas.name>
stefan2 Stefan Fuhrmann <st...@alice-dsl.de>
jcorvel Johan Corveleyn <jc...@gmail.com>
+ trent Trent Nelson <tr...@snakebite.org>
[[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
@@ -137,7 +138,7 @@ Commit access for specific areas:
madanus Madan U S <ma...@collab.net> (svnmerge) [EMAIL
IS BOUNCING]
wein Mathias Weinert <we...@mccw.de> (mailer)
- bhuvan Bhuvaneswaran <bh...@collab.net> (svn2feed.py,
+ bhuvan Bhuvaneswaran A <bh...@apache.org> (svn2feed.py,
build/hudson)
aogier Anthony Ogier <ao...@iorga.com> (svn-merge-vendor.py)
dkagedal David Kågedal <da...@lysator.liu.se> (dsvn.el)
@@ -154,12 +155,15 @@ Commit access for specific areas:
tools/buildbot)
artagnon Ramkumar Ramachandra <ar...@gmail.com> (svnrdump, svntest)
arwin Arwin Arni <ar...@collab.net> (svn-bisect)
+ joes Joe Schaefer <jo...@yahoo.com> (svnpubsub)
+
Translation of message files:
niqueco Nicolás Lichtmaier <ni...@reloco.com.ar> (po: es)
luebbe Lübbe Onken <lu...@tigris.org> (po: de)
jensseidel Jens Seidel <je...@users.sf.net> (po: de)
+ astieger Andreas Stieger <an...@gmx.de> (po: de)
oyvindmo Øyvind Møll <sv...@moll.no> (po: nb)
sunny256 Øyvind A. Holm <su...@sunbase.org> (po: nb)
jzgoda Jaroslaw Zgoda <jz...@o2.pl> (po: pl)
@@ -183,6 +187,8 @@ giorgio_valoti Giorgio Valoti <giorgio
Experimental branches:
+ ashod Ashod Nakashian <as...@apache.org> (compressed-
+ pristines br.)
gthompson Glenn A. Thompson <gt...@cdr.net> (pluggable-db br.)
sigfred Sigfred Håversen <bs...@mumak.com> (svnserve-ssl br.)
[EMAIL IS BOUNCING]
Modified: subversion/branches/javahl-ra/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/INSTALL?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/INSTALL (original)
+++ subversion/branches/javahl-ra/INSTALL Mon Apr 23 12:32:48 2012
@@ -324,7 +324,7 @@ I. INTRODUCTION
default. Add "http-library = neon" to the [global] section of
your ~/.subversion/servers file to use ra_neon instead.)
- a. Serf library 0.7.1 or newer (http://code.google.com/p/serf/)
+ a. Serf library 1.1.0 or newer (http://code.google.com/p/serf/)
In order to use ra_serf, you must install serf, and run
Subversion's ./configure with the argument --with-serf. If
@@ -478,11 +478,11 @@ I. INTRODUCTION
is done: See section III for details.
- 10. Python 2.4 or newer (http://www.python.org/) (OPTIONAL)
+ 10. Python 2.5 or newer (http://www.python.org/) (OPTIONAL)
If you want to run "make check" or build from the latest source
under Unix as described in section II.B and III.D, install
- Python 2.4 or higher on your system. The majority of the test
+ Python 2.5 or higher on your system. The majority of the test
suite is written in Python, as is part of Subversion's build
system.
@@ -842,7 +842,7 @@ II. INSTALLATION
is compatible with VC6, which is the one from february 2003.
You can get it from MSDN:
http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
- * Python 2.4 or higher, downloaded from http://www.python.org/ which is
+ * Python 2.5 or higher, downloaded from http://www.python.org/ which is
used to generate the project files.
* Perl 5.8 or higher from http://www.activestate.com/
* Awk (from http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe) is
Modified: subversion/branches/javahl-ra/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/Makefile.in?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/Makefile.in (original)
+++ subversion/branches/javahl-ra/Makefile.in Mon Apr 23 12:32:48 2012
@@ -99,6 +99,10 @@ javahl_libdir = @libdir@
javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work
javahl_test_srcdir=$(abs_srcdir)/subversion/bindings/javahl
+gnome_auth_dir = $(abs_builddir)/subversion/libsvn_auth_gnome_keyring/.libs
+kwallet_auth_dir = $(abs_builddir)/subversion/libsvn_auth_kwallet/.libs
+auth_plugin_dirs = $(gnome_auth_dir):$(kwallet_auth_dir)
+
MSGFMT = @MSGFMT@
MSGFMTFLAGS = @MSGFMTFLAGS@
MSGMERGE = @MSGMERGE@
@@ -131,6 +135,7 @@ INCLUDES = -I$(top_srcdir)/subversion/in
APACHE_INCLUDES = @APACHE_INCLUDES@
APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
+APACHE_LIBEXECDIR_TOOLS = $(DESTDIR)@APACHE_LIBEXECDIR@/svn-tools
APACHE_LDFLAGS = @APACHE_LDFLAGS@
SWIG = @SWIG@
@@ -248,6 +253,7 @@ INSTALL_CONTRIB = $(LIBTOOL) --mode=inst
INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_INCLUDE = $(INSTALL) -m 644
INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
+INSTALL_MOD_SHARED_TOOLS = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR_TOOLS)"
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_LOCALE = $(INSTALL_DATA)
@@ -293,8 +299,11 @@ SWIG_RB_SRC_DIR = $(abs_srcdir)/subversi
### Automate JAR creation using Makefile generator's javahl-java.jar
### property. Enhance generator to support JAR installation.
+JAVAHL_MANIFEST_IN = $(abs_srcdir)/subversion/bindings/javahl/Manifest.in
+JAVAHL_MANIFEST = subversion/bindings/javahl/Manifest
INSTALL_EXTRA_JAVAHL_JAVA=\
- $(JAR) cf $(JAVAHL_JAR) -C subversion/bindings/javahl/classes org; \
+ sed s/%bundleVersion/$(PACKAGE_VERSION)/ $(JAVAHL_MANIFEST_IN) > $(JAVAHL_MANIFEST); \
+ $(JAR) cfm $(JAVAHL_JAR) $(JAVAHL_MANIFEST) -C subversion/bindings/javahl/classes org; \
$(INSTALL_DATA) $(JAVAHL_JAR) $(DESTDIR)$(javahl_javadir);
INSTALL_EXTRA_JAVAHL_LIB=@INSTALL_EXTRA_JAVAHL_LIB@
@@ -374,16 +383,18 @@ fast-clean: doc-clean
$(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline/svntest \
-name "*.pyc" -exec rm {} ';'
-# clean all but bulky test output, returning to before './configure' was run.
+# clean everything, returning to before './configure' was run.
SVN_CONFIG_SCRIPT_FILES = @SVN_CONFIG_SCRIPT_FILES@
-fast-distclean: fast-clean
- rm -fr Makefile config.cache config.log config.nice config.status \
- libtool mkmf.log subversion/svn_private_config.h \
- subversion/bindings/javahl/classes subversion/bindings/javahl/include \
+local-distclean: local-clean
+ rm -fr config.cache config.log config.nice config.status \
+ libtool mkmf.log subversion/svn_private_config.h \
+ subversion/bindings/javahl/classes \
+ subversion/bindings/javahl/include \
$(SVN_CONFIG_SCRIPT_FILES)
+ rm -f Makefile
# clean everything out, returning to before './autogen.sh' was run.
-local-extraclean: local-distclean extraclean-swig extraclean-ctypes-python extraclean-javahl
+local-extraclean: extraclean-bindings local-distclean
rm -f $(top_srcdir)/build-outputs.mk \
$(top_srcdir)/subversion/svn_private_config.h.in \
$(top_srcdir)/configure \
@@ -401,10 +412,7 @@ local-extraclean: local-distclean extrac
# clean everything, including test output.
-local-clean: fast-clean check-clean clean-swig clean-ctypes-python clean-javahl
-
-# clean everything, including test output.
-local-distclean: fast-distclean check-clean
+local-clean: check-clean clean-bindings fast-clean
local-install: @INSTALL_RULES@
@@ -430,8 +438,6 @@ clean-javahl:
rm -f $(libsvnjavahl_PATH)/*.lo
rm -f $(libsvnjavahl_PATH)/*.o
-extraclean-javahl: clean-javahl
-
check-tigris-javahl: javahl-compat
@FIX_JAVAHL_LIB@
$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
@@ -484,12 +490,16 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
flags="--list --milestone-filter=$(MILESTONE_FILTER) \
--mode-filter=$(MODE_FILTER) --log-to-stdout $$flags"; \
fi; \
+ if test "$(SET_LOG_LEVEL)" != ""; then \
+ flags="--set-log-level $(SET_LOG_LEVEL) $$flags"; \
+ fi; \
+ LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)' \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
$$flags \
'$(abs_srcdir)' '$(abs_builddir)' $(TESTS); \
else \
- echo "make check: Python 2.4 or greater is required,"; \
+ echo "make check: Python 2.5 or greater is required,"; \
echo " but was not detected during configure"; \
exit 1; \
fi;
@@ -503,7 +513,7 @@ davcheck: bin $(TEST_DEPS) @BDB_TEST_DEP
# run make check.
davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
- @APXS=$(APXS) bash $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
+ @APXS=$(APXS) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
# First, run:
# subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
@@ -567,36 +577,24 @@ external-all external-install:
done;
### apr-util relies on generated files in apr, so reverse the
-### list so that it is cleaned before apr.
-external-clean external-distclean:
+### list so that it is cleaned before apr. also note that Neon does
+### not have an extraclean target, so get "close" with distclean
+external-clean external-distclean external-extraclean:
@target=`echo $@ | sed s/external-//`; \
list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)'; \
for i in $$list; do \
revlist="$$i $$revlist"; \
done; \
for i in $$revlist; do \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- done;
-
-### temporary hack. Neon does not have an "extraclean" and neither does db
-### If we don't have extraclean -- do the next best thing.
-external-extraclean:
- @list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)'; \
- for i in $$list; do \
- revlist="$$i $$revlist"; \
- done; \
- for i in $$revlist; do \
- if test "$$i" = "neon" || test "$$i" = "db/dist"; then \
- echo "------ making distclean(no extraclean) in $$i"; \
+ if test "$$i" = "neon" -a "$$target" = "extraclean"; then \
+ echo "------ making distclean (no extraclean) in $$i"; \
(cd $$i && $(MAKE) distclean) || exit 1; \
- echo "------ completed distclean(no extraclean) in $$i"; \
+ echo "------ completed distclean (no extraclean) in $$i"; \
else \
- echo "------ making extraclean in $$i"; \
- (cd $$i && $(MAKE) extraclean) || exit 1; \
- echo "------ completed extraclean in $$i"; \
- fi; \
+ echo "------ making $$target in $$i"; \
+ (cd $$i && $(MAKE) $$target) || exit 1; \
+ echo "------ completed $$target in $$i"; \
+ fi; \
done;
@@ -721,10 +719,15 @@ install-man:
install-swig-py: install-swig-py-lib
install-swig-rb: install-swig-rb-lib
+clean-bindings: clean-swig clean-ctypes-python clean-javahl
+
+extraclean-bindings: clean-swig extraclean-swig-headers \
+ extraclean-swig-py extraclean-swig-rb \
+ extraclean-swig-pl \
+ clean-ctypes-python clean-javahl \
+
clean-swig: clean-swig-headers clean-swig-py clean-swig-rb clean-swig-pl
@rm -f .swig_checked
-extraclean-swig: extraclean-swig-headers extraclean-swig-py \
- extraclean-swig-rb extraclean-swig-pl
EXTRACLEAN_SWIG_HEADERS=rm -f $(SWIG_SRC_DIR)/proxy/*.swg
@@ -858,8 +861,6 @@ clean-ctypes-python:
cd $(CTYPES_PYTHON_SRC_DIR); \
$(PYTHON) setup.py clean --all
-extraclean-ctypes-python: clean-ctypes-python
-
# manually describe a dependency, which we won't otherwise detect
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql
Modified: subversion/branches/javahl-ra/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/autogen.sh?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/autogen.sh (original)
+++ subversion/branches/javahl-ra/autogen.sh Mon Apr 23 12:32:48 2012
@@ -120,11 +120,11 @@ fi
#
# Note: this dependency on Python is fine: only SVN developers use autogen.sh
# and we can state that dev people need Python on their machine. Note
-# that running gen-make.py requires Python 2.4 or newer.
+# that running gen-make.py requires Python 2.5 or newer.
PYTHON="`./build/find_python.sh`"
if test -z "$PYTHON"; then
- echo "Python 2.4 or later is required to run autogen.sh"
+ echo "Python 2.5 or later is required to run autogen.sh"
echo "If you have a suitable Python installed, but not on the"
echo "PATH, set the environment variable PYTHON to the full path"
echo "to the Python executable, and re-run autogen.sh"
Modified: subversion/branches/javahl-ra/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build.conf?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build.conf (original)
+++ subversion/branches/javahl-ra/build.conf Mon Apr 23 12:32:48 2012
@@ -331,7 +331,7 @@ msvc-export =
private\svn_token.h private\svn_adler32.h
private\svn_temp_serializer.h private\svn_io_private.h
private\svn_string_private.h private\svn_magic.h
- private\svn_subr_private.h private\svn_mutex.h
+ private\svn_subr_private.h private\svn_mutex.h private\svn_named_atomic.h
# Working copy management lib
[libsvn_wc]
@@ -362,6 +362,15 @@ libs = libsvn_repos libsvn_subr
install = apache-mod
msvc-libs = libhttpd.lib
+[mod_dontdothat]
+description = Apache Httpd module to block certain kinds of Apache Subversion requests
+type = apache-mod
+path = tools/server-side/mod_dontdothat
+nonlibs = mod_dav_svn apr aprutil
+libs = libsvn_subr xml
+install = tools
+msvc-libs = libhttpd.lib
+
# ----------------------------------------------------------------------------
#
# CONSTRUCTED HEADERS
@@ -735,6 +744,14 @@ sources = config-test.c
install = test
libs = libsvn_test libsvn_subr apriconv apr
+[crypto-test]
+description = Test svn_crypto utilities
+type = exe
+path = subversion/tests/libsvn_subr
+sources = crypto-test.c
+install = test
+libs = libsvn_test libsvn_subr aprutil apr
+
[dirent_uri-test]
description = Test dirent_uri library
type = exe
@@ -775,6 +792,22 @@ sources = mergeinfo-test.c
install = test
libs = libsvn_test libsvn_subr apr
+[named_atomic-test]
+description = Test named atomics
+type = exe
+path = subversion/tests/libsvn_subr
+sources = named_atomic-test.c
+install = test
+libs = libsvn_test libsvn_subr apr
+
+[named_atomic-proc-test]
+description = Sub-process for named atomics
+type = exe
+path = subversion/tests/libsvn_subr
+sources = named_atomic-test-proc.c
+install = sub-test
+libs = libsvn_subr apr
+
[path-test]
description = Test path library
type = exe
@@ -874,14 +907,6 @@ sources = random-test.c
install = test
libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
-[editor-test]
-description = Test the editor v2 interface
-type = exe
-path = subversion/tests/libsvn_delta
-sources = editor-test.c
-install = test
-libs = libsvn_repos libsvn_fs libsvn_test libsvn_delta libsvn_subr apriconv apr
-
[window-test]
description = Test delta window generation
type = exe
@@ -1121,7 +1146,7 @@ type = project
path = build/win32
libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync
svnversion
- mod_authz_svn mod_dav_svn
+ mod_authz_svn mod_dav_svn mod_dontdothat
svnauthz-validate svnraisetreeconflict
[__ALL_TESTS__]
@@ -1132,8 +1157,8 @@ libs = __ALL__
strings-reps-test changes-test locks-test repos-test
checksum-test compat-test config-test hashdump-test mergeinfo-test
opt-test path-test stream-test string-test time-test utf-test
- target-test error-test cache-test editor-test spillbuf-test
- revision-test
+ target-test error-test cache-test spillbuf-test crypto-test
+ named_atomic-test named_atomic-proc-test revision-test
subst_translate-test
translate-test
random-test window-test
Modified: subversion/branches/javahl-ra/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/ac-macros/apache.m4?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/ac-macros/apache.m4 (original)
+++ subversion/branches/javahl-ra/build/ac-macros/apache.m4 Mon Apr 23 12:32:48 2012
@@ -100,7 +100,7 @@ if test -n "$APXS" && test "$APXS" != "n
apache_minor_version_wanted_regex=["[1-4]"]
;;
2)
- apache_minor_version_wanted_regex=["[3-4]"]
+ apache_minor_version_wanted_regex=["[3-5]"]
;;
*)
AC_MSG_ERROR([unknown APR version])
Modified: subversion/branches/javahl-ra/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/ac-macros/serf.m4?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/ac-macros/serf.m4 (original)
+++ subversion/branches/javahl-ra/build/ac-macros/serf.m4 Mon Apr 23 12:32:48 2012
@@ -32,14 +32,14 @@ AC_DEFUN(SVN_LIB_SERF,
serf_check_patch="$3"
AC_ARG_WITH(serf,AS_HELP_STRING([--with-serf=PREFIX],
- [Serf WebDAV client library]),
+ [Serf HTTP client library]),
[
if test "$withval" = "yes" ; then
AC_MSG_ERROR([--with-serf requires an argument.])
elif test "$withval" != "no" ; then
AC_MSG_NOTICE([serf library configuration])
serf_prefix=$withval
- for serf_major in serf-2 serf-1 serf-0; do
+ for serf_major in serf-2 serf-1; do
if ! test -d $serf_prefix/include/$serf_major; then continue; fi
save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/$serf_major"
@@ -62,20 +62,7 @@ AC_DEFUN(SVN_LIB_SERF,
test $serf_found = yes && break
done
fi
- ], [
- if test -d "$srcdir/serf"; then
- serf_found=reconfig
- fi
- ])
-
-
- if test $serf_found = "reconfig"; then
- SVN_EXTERNAL_PROJECT([serf], [--with-apr=$apr_config --with-apr-util=$apu_config])
- serf_major=serf-`$srcdir/serf/build/get-version.sh major $srcdir/serf/serf.h SERF`
- serf_prefix=$prefix
- SVN_SERF_INCLUDES="-I$srcdir/serf"
- SVN_SERF_LIBS="$abs_builddir/serf/lib$serf_major.la"
- fi
+ ])
if test $serf_found = "yes"; then
SVN_SERF_INCLUDES="-I$serf_prefix/include/$serf_major"
@@ -85,8 +72,6 @@ AC_DEFUN(SVN_LIB_SERF,
SVN_SERF_LIBS="-l$serf_major"
LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
fi
- elif test $serf_found = "reconfig"; then
- serf_found=yes
fi
svn_lib_serf=$serf_found
Modified: subversion/branches/javahl-ra/build/ac-macros/svn-macros.m4
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/ac-macros/svn-macros.m4?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/ac-macros/svn-macros.m4 (original)
+++ subversion/branches/javahl-ra/build/ac-macros/svn-macros.m4 Mon Apr 23 12:32:48 2012
@@ -202,3 +202,44 @@ AC_DEFUN([SVN_REMOVE_STANDARD_LIB_DIRS],
printf "%s" "${output_flags# }"
fi
])
+
+AC_DEFUN([SVN_CHECK_FOR_ATOMIC_BUILTINS],
+[
+ AC_CACHE_CHECK([whether the compiler provides atomic builtins], [svn_cv_atomic_builtins],
+ [AC_TRY_RUN([
+ int main()
+ {
+ unsigned long long val = 1010, tmp, *mem = &val;
+
+ if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020)
+ return 1;
+
+ tmp = val;
+
+ if (__sync_fetch_and_sub(mem, 1010) != tmp || val != 1010)
+ return 1;
+
+ if (__sync_sub_and_fetch(&val, 1010) != 0 || val != 0)
+ return 1;
+
+ tmp = 3030;
+
+ if (__sync_val_compare_and_swap(mem, 0, tmp) != 0 || val != tmp)
+ return 1;
+
+ if (__sync_lock_test_and_set(&val, 4040) != 3030)
+ return 1;
+
+ mem = &tmp;
+
+ if (__sync_val_compare_and_swap(&mem, &tmp, &val) != &tmp)
+ return 1;
+
+ __sync_synchronize();
+
+ if (mem != &val)
+ return 1;
+
+ return 0;
+ }], [svn_cv_atomic_builtins=yes], [svn_cv_atomic_builtins=no], [svn_cv_atomic_builtins=no])])
+])
Modified: subversion/branches/javahl-ra/build/find_python.sh
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/find_python.sh?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/find_python.sh (original)
+++ subversion/branches/javahl-ra/build/find_python.sh Mon Apr 23 12:32:48 2012
@@ -23,7 +23,7 @@
# Required version of Python
# Python 2.0 = 0x2000000
# Python 2.4 = 0x2040000
-VERSION=${1:-0x2040000}
+VERSION=${1:-0x2050000}
for pypath in "$PYTHON" "$PYTHON2" "$PYTHON3" python python2 python3; do
if [ "x$pypath" != "x" ]; then
Modified: subversion/branches/javahl-ra/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/generator/gen_make.py?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/generator/gen_make.py (original)
+++ subversion/branches/javahl-ra/build/generator/gen_make.py Mon Apr 23 12:32:48 2012
@@ -369,18 +369,21 @@ class Generator(gen_base.GeneratorBase):
# get the output files for these targets, sorted in dependency order
files = gen_base._sorted_files(self.graph, area)
- ezt_area = _eztdata(type=area, files=[ ], extra_install=None)
+ ezt_area = _eztdata(type=area, files=[ ], apache_files=[ ],
+ extra_install=None)
- if area == 'apache-mod':
- data.areas.append(ezt_area)
-
- for file in files:
+ def apache_file_to_eztdata(file):
# cd to dirname before install to work around libtool 1.4.2 bug.
dirname, fname = build_path_splitfile(file)
base, ext = os.path.splitext(fname)
name = base.replace('mod_', '')
- ezt_area.files.append(_eztdata(fullname=file, dirname=dirname,
- name=name, filename=fname))
+ return _eztdata(fullname=file, dirname=dirname,
+ name=name, filename=fname)
+ if area == 'apache-mod':
+ data.areas.append(ezt_area)
+
+ for file in files:
+ ezt_area.files.append(apache_file_to_eztdata(file))
elif area != 'test' and area != 'bdb-test':
data.areas.append(ezt_area)
@@ -390,6 +393,14 @@ class Generator(gen_base.GeneratorBase):
ezt_area.varname = area_var
ezt_area.uppervar = upper_var
+ # ### TODO: This is a hack. See discussion here:
+ # ### http://mid.gmane.org/20120316191639.GA28451@daniel3.local
+ apache_files = [t.filename for t in inst_targets
+ if isinstance(t, gen_base.TargetApacheMod)]
+
+ files = [f for f in files if f not in apache_files]
+ for file in apache_files:
+ ezt_area.apache_files.append(apache_file_to_eztdata(file))
for file in files:
# cd to dirname before install to work around libtool 1.4.2 bug.
dirname, fname = build_path_splitfile(file)
Modified: subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/javahl-ra/build/generator/gen_vcnet_vcproj.py Mon Apr 23 12:32:48 2012
@@ -115,6 +115,7 @@ class Generator(gen_win.WinGeneratorBase
'instrument_apr_pools' : self.instrument_apr_pools,
'instrument_purify_quantify' : self.instrument_purify_quantify,
'version' : self.vcproj_version,
+ 'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
}
if self.vcproj_extension == '.vcproj':
Modified: subversion/branches/javahl-ra/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/build/generator/gen_win.py?rev=1329209&r1=1329208&r2=1329209&view=diff
==============================================================================
--- subversion/branches/javahl-ra/build/generator/gen_win.py (original)
+++ subversion/branches/javahl-ra/build/generator/gen_win.py Mon Apr 23 12:32:48 2012
@@ -90,6 +90,7 @@ class GeneratorBase(gen_base.GeneratorBa
self.sqlite_path = 'sqlite-amalgamation'
self.skip_sections = { 'mod_dav_svn': None,
'mod_authz_svn': None,
+ 'mod_dontdothat' : None,
'libsvn_auth_kwallet': None,
'libsvn_auth_gnome_keyring': None }
@@ -126,6 +127,7 @@ class GeneratorBase(gen_base.GeneratorBa
self.httpd_path = val
del self.skip_sections['mod_dav_svn']
del self.skip_sections['mod_authz_svn']
+ del self.skip_sections['mod_dontdothat']
elif opt == '--with-libintl':
self.libintl_path = val
self.enable_nls = 1
@@ -186,6 +188,11 @@ class GeneratorBase(gen_base.GeneratorBa
self.sln_version = '11.00'
self.vcproj_version = '10.0'
self.vcproj_extension = '.vcxproj'
+ elif val == '11':
+ self.vs_version = '11'
+ self.sln_version = '12.00'
+ self.vcproj_version = '11.0'
+ self.vcproj_extension = '.vcxproj'
else:
print('WARNING: Unknown VS.NET version "%s",'
' assuming "%s"\n' % (val, '7.00'))
@@ -294,7 +301,7 @@ class WinGeneratorBase(GeneratorBase):
# Generate the build_zlib.bat file
if self.zlib_path:
- data = {'zlib_path': os.path.abspath(self.zlib_path),
+ data = {'zlib_path': os.path.relpath(self.zlib_path, self.projfilesdir),
'zlib_version': self.zlib_version,
'use_ml': self.have_ml and 1 or None}
bat = os.path.join(self.projfilesdir, 'build_zlib.bat')
@@ -334,7 +341,7 @@ class WinGeneratorBase(GeneratorBase):
def find_rootpath(self):
"Gets the root path as understand by the project system"
- return ".." + "\\.." * self.projfilesdir.count(os.sep) + "\\"
+ return os.path.relpath('.', self.projfilesdir) + "\\"
def makeguid(self, data):
"Generate a windows style GUID"
@@ -952,6 +959,8 @@ class WinGeneratorBase(GeneratorBase):
fakeincludes.append(self.apath(self.swig_libdir, 'perl5'))
else:
fakeincludes.append(self.swig_libdir)
+ if target.lang == "perl":
+ fakeincludes.extend(self.perl_includes)
if target.lang == "python":
fakeincludes.extend(self.python_includes)
if target.lang == "ruby":
@@ -1004,6 +1013,8 @@ class WinGeneratorBase(GeneratorBase):
if self.swig_libdir \
and (isinstance(target, gen_base.TargetSWIG)
or isinstance(target, gen_base.TargetSWIGLib)):
+ if target.lang == "perl" and self.perl_libdir:
+ fakelibdirs.append(self.perl_libdir)
if target.lang == "python" and self.python_libdir:
fakelibdirs.append(self.python_libdir)
if target.lang == "ruby" and self.ruby_libdir:
@@ -1141,16 +1152,20 @@ class WinGeneratorBase(GeneratorBase):
if not self.zlib_path:
return
zlib_path = os.path.abspath(self.zlib_path)
+ zlib_sources = map(lambda x : os.path.relpath(x, self.projfilesdir),
+ glob.glob(os.path.join(zlib_path, '*.c')) +
+ glob.glob(os.path.join(zlib_path,
+ 'contrib/masmx86/*.c')) +
+ glob.glob(os.path.join(zlib_path,
+ 'contrib/masmx86/*.asm')))
+ zlib_headers = map(lambda x : os.path.relpath(x, self.projfilesdir),
+ glob.glob(os.path.join(zlib_path, '*.h')))
+
self.move_proj_file(self.projfilesdir, name,
- (('zlib_path', zlib_path),
- ('zlib_sources',
- glob.glob(os.path.join(zlib_path, '*.c'))
- + glob.glob(os.path.join(zlib_path,
- 'contrib/masmx86/*.c'))
- + glob.glob(os.path.join(zlib_path,
- 'contrib/masmx86/*.asm'))),
- ('zlib_headers',
- glob.glob(os.path.join(zlib_path, '*.h'))),
+ (('zlib_path', os.path.relpath(zlib_path,
+ self.projfilesdir)),
+ ('zlib_sources', zlib_sources),
+ ('zlib_headers', zlib_headers),
('zlib_version', self.zlib_version),
('project_guid', self.makeguid('zlib')),
('use_ml', self.have_ml and 1 or None),
@@ -1161,19 +1176,22 @@ class WinGeneratorBase(GeneratorBase):
return
neon_path = os.path.abspath(self.neon_path)
+ neon_sources = map(lambda x : os.path.relpath(x, self.neon_path),
+ glob.glob(os.path.join(neon_path, 'src', '*.c')))
+ neon_headers = map(lambda x : os.path.relpath(x, self.neon_path),
+ glob.glob(os.path.join(neon_path, 'src', '*.h')))
+
self.move_proj_file(self.neon_path, name,
- (('neon_sources',
- glob.glob(os.path.join(neon_path, 'src', '*.c'))),
- ('neon_headers',
- glob.glob(os.path.join(neon_path, 'src', '*.h'))),
+ (('neon_sources', neon_sources),
+ ('neon_headers', neon_headers),
('expat_path',
- os.path.join(os.path.abspath(self.apr_util_path),
- 'xml', 'expat', 'lib')),
- ('zlib_path', self.zlib_path
- and os.path.abspath(self.zlib_path)),
- ('openssl_path',
- self.openssl_path
- and os.path.abspath(self.openssl_path)),
+ os.path.relpath(os.path.join(self.apr_util_path,
+ 'xml', 'expat', 'lib'),
+ self.neon_path)),
+ ('zlib_path', os.path.relpath(self.zlib_path,
+ self.neon_path)),
+ ('openssl_path', os.path.relpath(self.openssl_path,
+ self.neon_path)),
('project_guid', self.makeguid('neon')),
))
@@ -1182,29 +1200,31 @@ class WinGeneratorBase(GeneratorBase):
return
serf_path = os.path.abspath(self.serf_path)
+ serf_sources = map(lambda x : os.path.relpath(x, self.serf_path),
+ glob.glob(os.path.join(serf_path, '*.c'))
+ + glob.glob(os.path.join(serf_path, 'auth', '*.c'))
+ + glob.glob(os.path.join(serf_path, 'buckets',
+ '*.c')))
+ serf_headers = map(lambda x : os.path.relpath(x, self.serf_path),
+ glob.glob(os.path.join(serf_path, '*.h'))
+ + glob.glob(os.path.join(serf_path, 'auth', '*.h'))
+ + glob.glob(os.path.join(serf_path, 'buckets', '*.h')))
if self.serf_ver_maj != 0:
serflib = 'serf-%d.lib' % self.serf_ver_maj
else:
serflib = 'serf.lib'
self.move_proj_file(self.serf_path, name,
- (('serf_sources',
- glob.glob(os.path.join(serf_path, '*.c'))
- + glob.glob(os.path.join(serf_path, 'auth', '*.c'))
- + glob.glob(os.path.join(serf_path, 'buckets',
- '*.c'))),
- ('serf_headers',
- glob.glob(os.path.join(serf_path, '*.h'))
- + glob.glob(os.path.join(serf_path, 'auth', '*.h'))
- + glob.glob(os.path.join(serf_path, 'buckets',
- '*.h'))),
- ('zlib_path', self.zlib_path
- and os.path.abspath(self.zlib_path)),
- ('openssl_path',
- self.openssl_path
- and os.path.abspath(self.openssl_path)),
- ('apr_path', os.path.abspath(self.apr_path)),
- ('apr_util_path', os.path.abspath(self.apr_util_path)),
+ (('serf_sources', serf_sources),
+ ('serf_headers', serf_headers),
+ ('zlib_path', os.path.relpath(self.zlib_path,
+ self.serf_path)),
+ ('openssl_path', os.path.relpath(self.openssl_path,
+ self.serf_path)),
+ ('apr_path', os.path.relpath(self.apr_path,
+ self.serf_path)),
+ ('apr_util_path', os.path.relpath(self.apr_util_path,
+ self.serf_path)),
('project_guid', self.makeguid('serf')),
('apr_static', self.static_apr),
('serf_lib', serflib),
@@ -1219,7 +1239,8 @@ class WinGeneratorBase(GeneratorBase):
data = {
'version' : self.vcproj_version,
'configs' : self.configs,
- 'platforms' : self.platforms
+ 'platforms' : self.platforms,
+ 'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
}
for key, val in params:
data[key] = val
@@ -1232,13 +1253,15 @@ class WinGeneratorBase(GeneratorBase):
def _find_perl(self):
"Find the right perl library name to link swig bindings with"
+ self.perl_includes = []
+ self.perl_libdir = None
fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
'print "$Config{PERL_REVISION}$Config{PERL_VERSION}"'), 'r')
try:
- num = fp.readline()
- if num:
+ line = fp.readline()
+ if line:
msg = 'Found installed perl version number.'
- self.perl_lib = 'perl' + num.rstrip() + '.lib'
+ self.perl_lib = 'perl' + line.rstrip() + '.lib'
else:
msg = 'Could not detect perl version.'
self.perl_lib = 'perl56.lib'
@@ -1247,6 +1270,16 @@ class WinGeneratorBase(GeneratorBase):
finally:
fp.close()
+ fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
+ 'print $Config{archlib}'), 'r')
+ try:
+ line = fp.readline()
+ if line:
+ self.perl_libdir = os.path.join(line, 'CORE')
+ self.perl_includes = [os.path.join(line, 'CORE')]
+ finally:
+ fp.close()
+
def _find_ruby(self):
"Find the right Ruby library name to link swig bindings with"
self.ruby_includes = []