You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/03/06 18:50:31 UTC
svn commit: r1297604 [1/12] - in
/subversion/branches/reintegrate-keep-alive: ./ build/ build/ac-macros/
build/generator/ build/generator/templates/ build/win32/ notes/
notes/api-errata/1.7/ subversion/bindings/javahl/native/
subversion/bindings/javahl...
Author: julianfoad
Date: Tue Mar 6 17:50:23 2012
New Revision: 1297604
URL: http://svn.apache.org/viewvc?rev=1297604&view=rev
Log:
On the 'reintegrate-keep-alive' branch: Catch up to trunk@1297591.
Added:
subversion/branches/reintegrate-keep-alive/tools/dev/mergegraph/
- copied from r1295003, subversion/trunk/tools/dev/mergegraph/
subversion/branches/reintegrate-keep-alive/tools/examples/info.rb
- copied unchanged from r1295003, subversion/trunk/tools/examples/info.rb
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/
- copied from r1295003, subversion/trunk/tools/server-side/svnpubsub/
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/svnwcsub.tac
- copied unchanged from r1297591, subversion/trunk/tools/server-side/svnpubsub/svnwcsub.tac
Modified:
subversion/branches/reintegrate-keep-alive/ (props changed)
subversion/branches/reintegrate-keep-alive/CHANGES
subversion/branches/reintegrate-keep-alive/COMMITTERS
subversion/branches/reintegrate-keep-alive/INSTALL
subversion/branches/reintegrate-keep-alive/Makefile.in
subversion/branches/reintegrate-keep-alive/autogen.sh
subversion/branches/reintegrate-keep-alive/build/ac-macros/apache.m4
subversion/branches/reintegrate-keep-alive/build/find_python.sh
subversion/branches/reintegrate-keep-alive/build/generator/gen_vcnet_vcproj.py
subversion/branches/reintegrate-keep-alive/build/generator/gen_win.py
subversion/branches/reintegrate-keep-alive/build/generator/templates/neon.vcxproj.ezt
subversion/branches/reintegrate-keep-alive/build/generator/templates/serf.vcxproj.ezt
subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_config.vcxproj.ezt
subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_locale.vcxproj.ezt
subversion/branches/reintegrate-keep-alive/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/reintegrate-keep-alive/build/generator/templates/zlib.vcxproj.ezt
subversion/branches/reintegrate-keep-alive/build/run_tests.py
subversion/branches/reintegrate-keep-alive/build/win32/make_dist.py
subversion/branches/reintegrate-keep-alive/build/win32/vc6-build.bat.in
subversion/branches/reintegrate-keep-alive/configure.ac
subversion/branches/reintegrate-keep-alive/get-deps.sh
subversion/branches/reintegrate-keep-alive/notes/api-errata/1.7/ra001.txt
subversion/branches/reintegrate-keep-alive/notes/subversion-design.html
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/File.cpp
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/INSTALL
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/core.i
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/include/svn_types.swg
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/Base.pm (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/Client.pm (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/Core.pm (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/Delta.pm (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/Fs.pm (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/Ra.pm (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/Repos.pm (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/Wc.pm (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/t/0use.t (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/t/1repos.t (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/t/2fs.t (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/t/3client.t (contents, props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/t/4pool.t (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/t/5delta-compat.t (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/perl/native/t/5delta.t (props changed)
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/python/svn/repos.py
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/python/tests/client.py
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/python/tests/repository.py
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/python/tests/wc.py
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/ruby/svn/core.rb
subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/ruby/test/util.rb
subversion/branches/reintegrate-keep-alive/subversion/include/private/svn_auth_private.h
subversion/branches/reintegrate-keep-alive/subversion/include/private/svn_cache.h
subversion/branches/reintegrate-keep-alive/subversion/include/private/svn_cmdline_private.h
subversion/branches/reintegrate-keep-alive/subversion/include/private/svn_mutex.h
subversion/branches/reintegrate-keep-alive/subversion/include/private/svn_ra_private.h
subversion/branches/reintegrate-keep-alive/subversion/include/private/svn_repos_private.h
subversion/branches/reintegrate-keep-alive/subversion/include/private/svn_wc_private.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_checksum.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_client.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_config.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_delta.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_editor.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_error.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_fs.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_io.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_ra_svn.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_repos.h
subversion/branches/reintegrate-keep-alive/subversion/include/svn_wc.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/add.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/checkout.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/client.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/commit.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/commit_util.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/copy.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/delete.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/deprecated.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/diff.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/externals.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/merge.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/mergeinfo.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/prop_commands.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/repos_diff.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/status.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/switch.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/update.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_client/util.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_delta/compat.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_delta/editor.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_delta/svndiff.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_delta/text_delta.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_delta/xdelta.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs/fs-loader.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs/fs-loader.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_base/fs.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_base/notes/structure
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/caching.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/fs.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/fs.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/structure
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/temp_serializer.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_fs_fs/tree.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra/ra_loader.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra/ra_loader.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_neon/commit.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_neon/log.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_neon/merge.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_neon/session.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_neon/util.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_serf/commit.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_serf/locks.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_serf/serf.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_serf/update.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_serf/util.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_svn/client.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_svn/editorp.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_svn/marshal.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/commit.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/dump.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/fs-wrap.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/hooks.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/log.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/replay.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/reporter.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/repos.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/repos.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_repos/rev_hunt.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/auth.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/cache-memcache.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/checksum.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/deprecated.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/gpg_agent.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/io.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/macos_keychain.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/mergeinfo.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/simple_providers.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/skel.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/sqlite.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/stream.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/svn_base64.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/svn_mutex.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/svn_string.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/utf.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_subr/win32_crypto.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/adm_crawler.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/adm_ops.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/deprecated.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/diff_editor.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/entries.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/externals.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/props.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/status.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/update_editor.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/util.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/wc_db.c
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/wc_db.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/wc_db_private.h
subversion/branches/reintegrate-keep-alive/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/reintegrate-keep-alive/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/reintegrate-keep-alive/subversion/mod_dav_svn/dav_svn.h
subversion/branches/reintegrate-keep-alive/subversion/mod_dav_svn/liveprops.c
subversion/branches/reintegrate-keep-alive/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/reintegrate-keep-alive/subversion/mod_dav_svn/repos.c
subversion/branches/reintegrate-keep-alive/subversion/po/de.po
subversion/branches/reintegrate-keep-alive/subversion/po/fr.po
subversion/branches/reintegrate-keep-alive/subversion/po/zh_CN.po
subversion/branches/reintegrate-keep-alive/subversion/svn/cat-cmd.c
subversion/branches/reintegrate-keep-alive/subversion/svn/cl.h
subversion/branches/reintegrate-keep-alive/subversion/svn/diff-cmd.c
subversion/branches/reintegrate-keep-alive/subversion/svn/list-cmd.c
subversion/branches/reintegrate-keep-alive/subversion/svn/log-cmd.c
subversion/branches/reintegrate-keep-alive/subversion/svn/main.c
subversion/branches/reintegrate-keep-alive/subversion/svn/proplist-cmd.c
subversion/branches/reintegrate-keep-alive/subversion/svn/status.c
subversion/branches/reintegrate-keep-alive/subversion/svnadmin/main.c
subversion/branches/reintegrate-keep-alive/subversion/svndumpfilter/main.c
subversion/branches/reintegrate-keep-alive/subversion/svnlook/main.c
subversion/branches/reintegrate-keep-alive/subversion/svnrdump/dump_editor.c
subversion/branches/reintegrate-keep-alive/subversion/svnserve/main.c
subversion/branches/reintegrate-keep-alive/subversion/svnserve/serve.c
subversion/branches/reintegrate-keep-alive/subversion/svnversion/main.c
subversion/branches/reintegrate-keep-alive/subversion/tests/README
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/README
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/authz_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/basic_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/commit_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/copy_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/davautocheck.sh
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/depth_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/diff_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/externals_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/info_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/lock_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/log_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/merge_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/patch_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/special_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/stat_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svntest/__init__.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svntest/actions.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svntest/main.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/svntest/verify.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/switch_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/update_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/reintegrate-keep-alive/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/reintegrate-keep-alive/subversion/tests/libsvn_subr/checksum-test.c
subversion/branches/reintegrate-keep-alive/subversion/tests/libsvn_subr/spillbuf-test.c
subversion/branches/reintegrate-keep-alive/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/reintegrate-keep-alive/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/reintegrate-keep-alive/subversion/tests/libsvn_wc/wc-incomplete-tester.c
subversion/branches/reintegrate-keep-alive/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
subversion/branches/reintegrate-keep-alive/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/reintegrate-keep-alive/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/reintegrate-keep-alive/tools/client-side/detach.py
subversion/branches/reintegrate-keep-alive/tools/client-side/mergeinfo-sanitizer.py
subversion/branches/reintegrate-keep-alive/tools/client-side/svnmucc/svnmucc.c
subversion/branches/reintegrate-keep-alive/tools/dev/merge-graph.py (contents, props changed)
subversion/branches/reintegrate-keep-alive/tools/dev/unix-build/Makefile.svn
subversion/branches/reintegrate-keep-alive/tools/dev/which-error.py
subversion/branches/reintegrate-keep-alive/tools/dev/windows-build/Makefile
subversion/branches/reintegrate-keep-alive/tools/diff/diff.c
subversion/branches/reintegrate-keep-alive/tools/dist/backport.pl
subversion/branches/reintegrate-keep-alive/tools/dist/release.py
subversion/branches/reintegrate-keep-alive/tools/examples/get-location-segments.py
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpredumpfilter.py
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/svnpubsub/client.py
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/svnpubsub/server.py
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/svntweet.py
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/svnwcsub.py
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/test.conf
subversion/branches/reintegrate-keep-alive/tools/server-side/svnpubsub/watcher.py
Propchange: subversion/branches/reintegrate-keep-alive/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 6 17:50:23 2012
@@ -57,4 +57,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1234907-1239494
+/subversion/trunk:1234907-1295003,1295006-1297591
Modified: subversion/branches/reintegrate-keep-alive/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/CHANGES?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/CHANGES (original)
+++ subversion/branches/reintegrate-keep-alive/CHANGES Tue Mar 6 17:50:23 2012
@@ -17,6 +17,10 @@ http://svn.apache.org/repos/asf/subversi
* 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)
- Client-side bugfixes:
*
@@ -29,7 +33,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)
@@ -38,10 +42,33 @@ http://svn.apache.org/repos/asf/subversi
*
+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
-(XX XXX 2012, from /branches/1.7.x)
+(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)
@@ -55,11 +82,33 @@ http://svn.apache.org/repos/asf/subversi
* 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 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
Modified: subversion/branches/reintegrate-keep-alive/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/COMMITTERS?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/COMMITTERS [UTF-8] (original)
+++ subversion/branches/reintegrate-keep-alive/COMMITTERS [UTF-8] Tue Mar 6 17:50:23 2012
@@ -137,7 +137,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 +154,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)
Modified: subversion/branches/reintegrate-keep-alive/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/INSTALL?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/INSTALL (original)
+++ subversion/branches/reintegrate-keep-alive/INSTALL Tue Mar 6 17:50:23 2012
@@ -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/reintegrate-keep-alive/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/Makefile.in?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/Makefile.in (original)
+++ subversion/branches/reintegrate-keep-alive/Makefile.in Tue Mar 6 17:50:23 2012
@@ -497,7 +497,7 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
$$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;
Modified: subversion/branches/reintegrate-keep-alive/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/autogen.sh?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/autogen.sh (original)
+++ subversion/branches/reintegrate-keep-alive/autogen.sh Tue Mar 6 17:50:23 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/reintegrate-keep-alive/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/ac-macros/apache.m4?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/ac-macros/apache.m4 (original)
+++ subversion/branches/reintegrate-keep-alive/build/ac-macros/apache.m4 Tue Mar 6 17:50:23 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/reintegrate-keep-alive/build/find_python.sh
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/find_python.sh?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/find_python.sh (original)
+++ subversion/branches/reintegrate-keep-alive/build/find_python.sh Tue Mar 6 17:50:23 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/reintegrate-keep-alive/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/generator/gen_vcnet_vcproj.py?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/reintegrate-keep-alive/build/generator/gen_vcnet_vcproj.py Tue Mar 6 17:50:23 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/reintegrate-keep-alive/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/generator/gen_win.py?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/generator/gen_win.py (original)
+++ subversion/branches/reintegrate-keep-alive/build/generator/gen_win.py Tue Mar 6 17:50:23 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 = []
Modified: subversion/branches/reintegrate-keep-alive/build/generator/templates/neon.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/generator/templates/neon.vcxproj.ezt?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/generator/templates/neon.vcxproj.ezt (original)
+++ subversion/branches/reintegrate-keep-alive/build/generator/templates/neon.vcxproj.ezt Tue Mar 6 17:50:23 2012
@@ -33,7 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/reintegrate-keep-alive/build/generator/templates/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/generator/templates/serf.vcxproj.ezt?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/generator/templates/serf.vcxproj.ezt (original)
+++ subversion/branches/reintegrate-keep-alive/build/generator/templates/serf.vcxproj.ezt Tue Mar 6 17:50:23 2012
@@ -34,7 +34,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_config.vcxproj.ezt?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_config.vcxproj.ezt Tue Mar 6 17:50:23 2012
@@ -33,6 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_locale.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_locale.vcxproj.ezt?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_locale.vcxproj.ezt (original)
+++ subversion/branches/reintegrate-keep-alive/build/generator/templates/svn_locale.vcxproj.ezt Tue Mar 6 17:50:23 2012
@@ -34,6 +34,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CLRSupport>false</CLRSupport>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/reintegrate-keep-alive/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/generator/templates/vcnet_vcxproj.ezt?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/reintegrate-keep-alive/build/generator/templates/vcnet_vcxproj.ezt Tue Mar 6 17:50:23 2012
@@ -33,6 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'" Label="Configuration">
<ConfigurationType>[config_type]</ConfigurationType>
<UseDebugLibraries>[is configs.name "Debug"]true[else]false[end]</UseDebugLibraries>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/reintegrate-keep-alive/build/generator/templates/zlib.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/generator/templates/zlib.vcxproj.ezt?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/generator/templates/zlib.vcxproj.ezt (original)
+++ subversion/branches/reintegrate-keep-alive/build/generator/templates/zlib.vcxproj.ezt Tue Mar 6 17:50:23 2012
@@ -33,7 +33,7 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
- <PlatformToolset>v100</PlatformToolset>
+ <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/reintegrate-keep-alive/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/run_tests.py?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/run_tests.py (original)
+++ subversion/branches/reintegrate-keep-alive/build/run_tests.py Tue Mar 6 17:50:23 2012
@@ -43,7 +43,6 @@ separated list of test numbers; the defa
'''
# A few useful constants
-LINE_LENGTH = 45
SVN_VER_MINOR = 8
import os, re, subprocess, sys, imp
@@ -72,6 +71,38 @@ class TextColors:
cls.SUCCESS = ''
+def _get_term_width():
+ 'Attempt to discern the width of the terminal'
+ # This may not work on all platforms, in which case the default of 80
+ # characters is used. Improvements welcomed.
+
+ def ioctl_GWINSZ(fd):
+ try:
+ import fcntl, termios, struct, os
+ cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))
+ except:
+ return None
+ return cr
+
+ cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
+ if not cr:
+ try:
+ fd = os.open(os.ctermid(), os.O_RDONLY)
+ cr = ioctl_GWINSZ(fd)
+ os.close(fd)
+ except:
+ pass
+ if not cr:
+ try:
+ cr = (env['LINES'], env['COLUMNS'])
+ except:
+ cr = None
+ if not cr:
+ # Default
+ cr = (25, 80)
+ return int(cr[1])
+
+
class TestHarness:
'''Test harness for Subversion tests.
'''
@@ -511,14 +542,17 @@ class TestHarness:
progabs = os.path.abspath(os.path.join(self.srcdir, prog))
old_cwd = os.getcwd()
+ line_length = _get_term_width()
+ dots_needed = line_length \
+ - len(test_info) \
+ - len('Running tests in ') \
+ - len('success')
try:
os.chdir(progdir)
if progbase[-3:] == '.py':
- failed = self._run_py_test(progabs, test_nums,
- (LINE_LENGTH - len(test_info)))
+ failed = self._run_py_test(progabs, test_nums, dots_needed)
else:
- failed = self._run_c_test(prog, test_nums,
- (LINE_LENGTH - len(test_info)))
+ failed = self._run_c_test(prog, test_nums, dots_needed)
except:
os.chdir(old_cwd)
raise
Modified: subversion/branches/reintegrate-keep-alive/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/win32/make_dist.py?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/win32/make_dist.py (original)
+++ subversion/branches/reintegrate-keep-alive/build/win32/make_dist.py Tue Mar 6 17:50:23 2012
@@ -209,6 +209,8 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(blddir)s/svnserve/svnserve.pdb'),
File('%(blddir)s/svnversion/svnversion.exe'),
File('%(blddir)s/svnversion/svnversion.pdb'),
+ File('%(blddir)s/svnrdump/svnrdump.exe'),
+ File('%(blddir)s/svnrdump/svnrdump.pdb'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'),
File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.exe'),
Modified: subversion/branches/reintegrate-keep-alive/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/build/win32/vc6-build.bat.in?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/build/win32/vc6-build.bat.in (original)
+++ subversion/branches/reintegrate-keep-alive/build/win32/vc6-build.bat.in Tue Mar 6 17:50:23 2012
@@ -136,6 +136,7 @@ copy src-%DIR%\Release\subversion\svndum
copy src-%DIR%\Release\subversion\svnlook\svnlook.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin
+copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so svn-win32-%VER%\httpd
copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so svn-win32-%VER%\httpd
copy svn-win32-%VER%\bin\intl.dll "%APACHEDIR%\bin"
Modified: subversion/branches/reintegrate-keep-alive/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/configure.ac?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/configure.ac (original)
+++ subversion/branches/reintegrate-keep-alive/configure.ac Tue Mar 6 17:50:23 2012
@@ -1134,7 +1134,7 @@ AS_HELP_STRING([--enable-gprof],
PYTHON="`$abs_srcdir/build/find_python.sh`"
if test -z "$PYTHON"; then
- AC_MSG_WARN([Python 2.4 or later is required to run the testsuite])
+ AC_MSG_WARN([Python 2.5 or later is required to run the testsuite])
AC_MSG_WARN([or to use the Subversion Python bindings])
AC_MSG_WARN([])
AC_MSG_WARN([If you have a suitable Python installed, but not on the])
Modified: subversion/branches/reintegrate-keep-alive/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/get-deps.sh?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/get-deps.sh (original)
+++ subversion/branches/reintegrate-keep-alive/get-deps.sh Tue Mar 6 17:50:23 2012
@@ -23,15 +23,15 @@
# get-deps.sh -- download the dependencies useful for building Subversion
#
-APR=apr-1.4.5
-APR_UTIL=apr-util-1.3.12
+APR=apr-1.4.6
+APR_UTIL=apr-util-1.4.1
NEON=neon-0.29.6
-SERF=serf-0.7.2
-ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.7.8
+SERF=serf-1.0.1
+ZLIB=zlib-1.2.6
+SQLITE_VERSION=3.7.10
SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
-HTTPD=httpd-2.2.21
+HTTPD=httpd-2.2.22
APR_ICONV=apr-iconv-1.2.1
BASEDIR=`pwd`
Modified: subversion/branches/reintegrate-keep-alive/notes/api-errata/1.7/ra001.txt
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/notes/api-errata/1.7/ra001.txt?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/notes/api-errata/1.7/ra001.txt (original)
+++ subversion/branches/reintegrate-keep-alive/notes/api-errata/1.7/ra001.txt Tue Mar 6 17:50:23 2012
@@ -3,7 +3,7 @@ API ERRATA -- $Id$
Root Cause of Errata:
Library(s) Affected: libsvn_ra, RA servers (svnserve, mod_dav_svn)
Function(s) Affected: svn_delta_editor_t
- New Behavior in: 1.7 (default), 1.4 (client optional)
+ New Behavior in: 1.8 (default), 1.4 (client optional)
Related Issues: #2932, #3628
Modified: subversion/branches/reintegrate-keep-alive/notes/subversion-design.html
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/notes/subversion-design.html?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/notes/subversion-design.html (original)
+++ subversion/branches/reintegrate-keep-alive/notes/subversion-design.html Tue Mar 6 17:50:23 2012
@@ -2340,7 +2340,10 @@ write/Makefile:6
<p>Once you've done this, read Jim Blandy's own structural overview,
which explains how nodes and revisions are organized (among other
things) in the filesystem implementation:
- <tt class="filename">subversion/libsvn_fs/structure</tt>.</p>
+ <tt class="filename">subversion/libsvn_fs_base/notes/structure</tt>.
+ (Some details in that document are specific to the BDB-based
+ filesystem implementation. Details specific to FSFS are recorded in
+ <tt class="filename">subversion/libsvn_fs_fs/structure</tt>.)</p>
<p>Finally, read the well-documented API in
<tt class="filename">subversion/include/svn_fs.h</tt>.</p>
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/ClientContext.cpp?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/ClientContext.cpp Tue Mar 6 17:50:23 2012
@@ -111,7 +111,7 @@ ClientContext::~ClientContext()
/* Helper function to make sure that we don't keep dangling pointers in ctx.
Note that this function might be called multiple times if getContext()
is called on the same pool.
-
+
The use of this function assumes a proper subpool behavior by its user,
(read: SVNClient) usually per request.
*/
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/File.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/File.cpp?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/File.cpp (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/File.cpp Tue Mar 6 17:50:23 2012
@@ -82,7 +82,7 @@ const char *File::getAbsPath()
/* We don't remove the local ref for jabsolutePath here, because
JNIStringHolder expects that ref to be valid for the life of
the object, which in this case is allocated on the stack.
-
+
So we just "leak" the reference, and it will get cleaned up when
we eventually exit back to Java-land. */
env->DeleteLocalRef(clazz);
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.cpp?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.cpp Tue Mar 6 17:50:23 2012
@@ -829,10 +829,11 @@ jbyteArray SVNClient::propertyGet(const
return NULL;
apr_hash_t *props;
- SVN_JNI_ERR(svn_client_propget3(&props, name,
+ SVN_JNI_ERR(svn_client_propget4(&props, name,
intPath.c_str(), pegRevision.revision(),
revision.revision(), NULL, svn_depth_empty,
- NULL, ctx, subPool.getPool()),
+ NULL, ctx, subPool.getPool(),
+ subPool.getPool()),
NULL);
apr_hash_index_t *hi;
@@ -935,7 +936,7 @@ void SVNClient::diff(const char *target1
OutputStream &outputStream, svn_depth_t depth,
StringArray &changelists,
bool ignoreAncestry, bool noDiffDelete, bool force,
- bool showCopiesAsAdds)
+ bool showCopiesAsAdds, bool ignoreProps)
{
SVN::Pool subPool(pool);
const char *c_relToDir = relativeToDir ?
@@ -971,7 +972,8 @@ void SVNClient::diff(const char *target1
noDiffDelete,
showCopiesAsAdds,
force,
- FALSE,
+ ignoreProps,
+ FALSE, /* use_git_diff_format */
SVN_APR_LOCALE_CHARSET,
outputStream.getStream(subPool),
NULL /* error file */,
@@ -997,7 +999,8 @@ void SVNClient::diff(const char *target1
noDiffDelete,
showCopiesAsAdds,
force,
- FALSE,
+ ignoreProps,
+ FALSE, /* use_git_diff_format */
SVN_APR_LOCALE_CHARSET,
outputStream.getStream(subPool),
NULL /* error stream */,
@@ -1013,11 +1016,11 @@ void SVNClient::diff(const char *target1
const char *relativeToDir, OutputStream &outputStream,
svn_depth_t depth, StringArray &changelists,
bool ignoreAncestry, bool noDiffDelete, bool force,
- bool showCopiesAsAdds)
+ bool showCopiesAsAdds, bool ignoreProps)
{
diff(target1, revision1, target2, revision2, NULL, relativeToDir,
outputStream, depth, changelists, ignoreAncestry, noDiffDelete, force,
- showCopiesAsAdds);
+ showCopiesAsAdds, ignoreProps);
}
void SVNClient::diff(const char *target, Revision &pegRevision,
@@ -1025,11 +1028,12 @@ void SVNClient::diff(const char *target,
const char *relativeToDir, OutputStream &outputStream,
svn_depth_t depth, StringArray &changelists,
bool ignoreAncestry, bool noDiffDelete, bool force,
- bool showCopiesAsAdds)
+ bool showCopiesAsAdds, bool ignoreProps)
{
diff(target, startRevision, NULL, endRevision, &pegRevision,
relativeToDir, outputStream, depth, changelists,
- ignoreAncestry, noDiffDelete, force, showCopiesAsAdds);
+ ignoreAncestry, noDiffDelete, force, showCopiesAsAdds,
+ ignoreProps);
}
void
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.h?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/SVNClient.h Tue Mar 6 17:50:23 2012
@@ -177,13 +177,13 @@ class SVNClient :public SVNBase
const char *relativeToDir, OutputStream &outputStream,
svn_depth_t depth, StringArray &changelists,
bool ignoreAncestry, bool noDiffDelete, bool force,
- bool showCopiesAsAdds);
+ bool showCopiesAsAdds, bool ignoreProps);
void diff(const char *target, Revision &pegevision,
Revision &startRevision, Revision &endRevision,
const char *relativeToDir, OutputStream &outputStream,
svn_depth_t depth, StringArray &changelists,
bool ignoreAncestry, bool noDiffDelete, bool force,
- bool showCopiesAsAdds);
+ bool showCopiesAsAdds, bool ignoreProps);
void diffSummarize(const char *target1, Revision &revision1,
const char *target2, Revision &revision2,
svn_depth_t depth, StringArray &changelists,
@@ -212,7 +212,7 @@ class SVNClient :public SVNBase
OutputStream &outputStream, svn_depth_t depth,
StringArray &changelists,
bool ignoreAncestry, bool noDiffDelete, bool force,
- bool showCopiesAsAdds);
+ bool showCopiesAsAdds, bool ignoreProps);
Path m_lastPath;
ClientContext context;
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Tue Mar 6 17:50:23 2012
@@ -1171,12 +1171,12 @@ JNIEXPORT void JNICALL Java_org_apache_s
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZ
+Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZZ
(JNIEnv *env, jobject jthis, jstring jtarget1, jobject jrevision1,
jstring jtarget2, jobject jrevision2, jstring jrelativeToDir,
jobject jstream, jobject jdepth, jobject jchangelists,
jboolean jignoreAncestry, jboolean jnoDiffDeleted, jboolean jforce,
- jboolean jcopiesAsAdds)
+ jboolean jcopiesAsAdds, jboolean jignoreProps)
{
JNIEntry(SVNClient, diff);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1217,16 +1217,16 @@ Java_org_apache_subversion_javahl_SVNCli
EnumMapper::toDepth(jdepth), changelists,
jignoreAncestry ? true:false,
jnoDiffDeleted ? true:false, jforce ? true:false,
- jcopiesAsAdds ? true:false);
+ jcopiesAsAdds ? true:false, jignoreProps ? true:false);
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZ
+Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_io_OutputStream_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZZ
(JNIEnv *env, jobject jthis, jstring jtarget, jobject jpegRevision,
jobject jstartRevision, jobject jendRevision, jstring jrelativeToDir,
jobject jstream, jobject jdepth, jobject jchangelists,
jboolean jignoreAncestry, jboolean jnoDiffDeleted, jboolean jforce,
- jboolean jcopiesAsAdds)
+ jboolean jcopiesAsAdds, jboolean jignoreProps)
{
JNIEntry(SVNClient, diff);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1267,7 +1267,7 @@ Java_org_apache_subversion_javahl_SVNCli
dataOut, EnumMapper::toDepth(jdepth), changelists,
jignoreAncestry ? true:false,
jnoDiffDeleted ? true:false, jforce ? true:false,
- jcopiesAsAdds ? true:false);
+ jcopiesAsAdds ? true:false, jignoreProps ? true:false);
}
JNIEXPORT void JNICALL
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Tue Mar 6 17:50:23 2012
@@ -521,13 +521,14 @@ public interface ISVNClient
* @param force diff even on binary files
* @param copiesAsAdds if set, copied files will be shown in their
* entirety, not as diffs from their sources
+ * @param ignoreProps don't show property diffs
* @throws ClientException
*/
void diff(String target1, Revision revision1, String target2,
Revision revision2, String relativeToDir, OutputStream outStream,
Depth depth, Collection<String> changelists,
boolean ignoreAncestry, boolean noDiffDeleted, boolean force,
- boolean copiesAsAdds)
+ boolean copiesAsAdds, boolean ignoreProps)
throws ClientException;
void diff(String target1, Revision revision1, String target2,
@@ -552,6 +553,7 @@ public interface ISVNClient
* @param force diff even on binary files
* @param copiesAsAdds if set, copied files will be shown in their
* entirety, not as diffs from their sources
+ * @param ignoreProps don't show property diffs
* @throws ClientException
*/
void diff(String target, Revision pegRevision, Revision startRevision,
@@ -559,7 +561,7 @@ public interface ISVNClient
OutputStream outStream,
Depth depth, Collection<String> changelists,
boolean ignoreAncestry, boolean noDiffDeleted, boolean force,
- boolean copiesAsAdds)
+ boolean copiesAsAdds, boolean ignoreProps)
throws ClientException;
void diff(String target, Revision pegRevision, Revision startRevision,
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Tue Mar 6 17:50:23 2012
@@ -278,7 +278,7 @@ public class SVNClient implements ISVNCl
OutputStream stream = new FileOutputStream(outFileName);
diff(target1, revision1, target2, revision2, relativeToDir,
stream, depth, changelists, ignoreAncestry, noDiffDeleted,
- force, copiesAsAdds);
+ force, copiesAsAdds, false);
} catch (FileNotFoundException ex) {
throw ClientException.fromException(ex);
}
@@ -289,7 +289,8 @@ public class SVNClient implements ISVNCl
OutputStream stream, Depth depth,
Collection<String> changelists,
boolean ignoreAncestry, boolean noDiffDeleted,
- boolean force, boolean copiesAsAdds)
+ boolean force, boolean copiesAsAdds,
+ boolean ignoreProps)
throws ClientException;
public void diff(String target, Revision pegRevision,
@@ -304,7 +305,7 @@ public class SVNClient implements ISVNCl
OutputStream stream = new FileOutputStream(outFileName);
diff(target, pegRevision, startRevision, endRevision,
relativeToDir, stream, depth, changelists, ignoreAncestry,
- noDiffDeleted, force, copiesAsAdds);
+ noDiffDeleted, force, copiesAsAdds, false);
} catch (FileNotFoundException ex) {
throw ClientException.fromException(ex);
}
@@ -315,7 +316,8 @@ public class SVNClient implements ISVNCl
String relativeToDir, OutputStream stream,
Depth depth, Collection<String> changelists,
boolean ignoreAncestry, boolean noDiffDeleted,
- boolean force, boolean copiesAsAdds)
+ boolean force, boolean copiesAsAdds,
+ boolean ignoreProps)
throws ClientException;
public native void diffSummarize(String target1, Revision revision1,
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Tue Mar 6 17:50:23 2012
@@ -148,10 +148,10 @@ public class BasicTests extends SVNTests
CommitItemStateFlags.Add);
Set<String> urls = new HashSet<String>(1);
urls.add(thisTest.getUrl() + "/Y");
- try
+ try
{
tempclient.mkdir(urls, false, null, new ConstMsg("log_msg"), null);
- }
+ }
catch(JNIError e)
{
return; // Test passes!
@@ -3142,12 +3142,12 @@ public class BasicTests extends SVNTests
// check the status of the working copy
thisTest.checkStatus();
-
+
// now edit the propval directly in the repository
long baseRev = 2L;
client.propertySetRemote(thisTest.getUrl()+"/A/D/G/rho", baseRev, PROP, NEWVALUE,
new ConstMsg("edit prop"), false, null, null);
-
+
// update the WC and verify that the property was changed
client.update(thisTest.getWCPathSet(), Revision.HEAD, Depth.infinity, false, false,
false, false);
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Tue Mar 6 17:50:23 2012
@@ -520,7 +520,7 @@ public class WC
item.reposLastCmtAuthor,
status.getReposLastCmtAuthor());
Assert.assertNotNull("URL for path " + item.myPath
- + " should not be null",
+ + " should not be null",
status.getUrl());
}
}
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/INSTALL?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/INSTALL (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/INSTALL Tue Mar 6 17:50:23 2012
@@ -80,7 +80,7 @@ Step 1: Install a suitable version of S
--with-python=/path/to/correct/python/binary
- to the configure script. You need Python 2.4 or above.
+ to the configure script. You need Python 2.5 or above.
If you plan to build the Perl bindings, and have a system
with more than one version of perl installed, you may need
@@ -109,7 +109,7 @@ Step 2: Build and Install Subversion.
python executable you used to configure SWIG as above. If it does not then
you can specify the correct path by adding PYTHON=/path/to/python or
PERL=/path/to/perl onto the command line for configure. For example:
- ./configure PYTHON=/usr/bin/python2.4 PERL=/usr/bin/perl5.8.0
+ ./configure PYTHON=/usr/bin/python2.5 PERL=/usr/bin/perl5.8.0
If Subversion's ./configure finds a SWIG that it's happy with, then
it will build special glue libraries to link svn to the swig bindings:
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/core.i
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/core.i?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/core.i (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/core.i Tue Mar 6 17:50:23 2012
@@ -698,6 +698,7 @@ svn_swig_pl_set_current_pool (apr_pool_t
%authprompt_callback_typemap(ssl_server_trust)
%authprompt_callback_typemap(ssl_client_cert)
%authprompt_callback_typemap(ssl_client_cert_pw)
+%authprompt_callback_typemap(gnome_keyring_unlock)
/* -----------------------------------------------------------------------
* For all the various functions that set a callback baton create a reference
@@ -781,6 +782,34 @@ svn_swig_pl_set_current_pool (apr_pool_t
%include svn_mergeinfo_h.swg
%include svn_io_h.swg
+
+
+#ifdef SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC
+%inline %{
+/* Helper function to set the gnome-keyring unlock prompt function. This
+ * C function accepts an auth baton, a function and a prompt baton, but
+ * the below callback_typemap uses both the function and the prompt
+ * baton, so the resulting binding has just two arguments: The auth
+ * baton and the prompt function.
+ * The prompt function should again have two arguments: The keyring name
+ * (string) and a pool (except for the ruby version, which doesn't have
+ * the pool argument). It should return the entered password (string).
+ * This binding generated for this function generates a reference to the
+ * prompt function that was passed into this. The caller should store
+ * that reference somewhere, to prevent the function from being garbage
+ * collected...
+ */
+static void svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t *ab,
+ svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func,
+ void *prompt_baton) {
+ svn_auth_set_parameter(ab, SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC,
+ prompt_func);
+ svn_auth_set_parameter(ab, SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON,
+ prompt_baton);
+}
+%}
+#endif
+
#if defined(SWIGPERL) || defined(SWIGRUBY)
%include svn_md5_h.swg
#endif
Modified: subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/include/svn_containers.swg
URL: http://svn.apache.org/viewvc/subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/include/svn_containers.swg?rev=1297604&r1=1297603&r2=1297604&view=diff
==============================================================================
--- subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/include/svn_containers.swg (original)
+++ subversion/branches/reintegrate-keep-alive/subversion/bindings/swig/include/svn_containers.swg Tue Mar 6 17:50:23 2012
@@ -482,6 +482,16 @@
svn_wc_parse_externals_description3()
*/
+#ifdef SWIGPYTHON
+%typemap(argout) apr_array_header_t **externals_p {
+ %append_output
+ (svn_swig_py_pointerlist_to_list(*$1, $descriptor(svn_wc_external_item2_t *),
+ _global_py_pool));
+ if (PyErr_Occurred()) {
+ SWIG_fail;
+ }
+}
+#endif
#ifdef SWIGRUBY
%typemap(argout) apr_array_header_t **externals_p {
%append_output(svn_swig_rb_apr_array_to_array_external_item2(*$1));
@@ -825,8 +835,8 @@
#ifdef SWIGPYTHON
%typemap(argout) apr_array_header_t **RANGELIST {
%append_output
- (svn_swig_py_rangelist_to_list(*$1, $descriptor(svn_merge_range_t *),
- _global_py_pool));
+ (svn_swig_py_pointerlist_to_list(*$1, $descriptor(svn_merge_range_t *),
+ _global_py_pool));
if (PyErr_Occurred()) {
SWIG_fail;
}
@@ -873,3 +883,20 @@
$descriptor(svn_auth_provider_object_t *)));
}
#endif
+
+#ifdef SWIGPYTHON
+%typemap(argout) apr_array_header_t **providers {
+ %append_output
+ (svn_swig_py_pointerlist_to_list(*$1, $descriptor(svn_auth_provider_object_t *),
+ _global_py_pool));
+ if (PyErr_Occurred()) {
+ SWIG_fail;
+ }
+}
+#endif
+
+#ifdef SWIGRUBY
+%typemap(argout) apr_array_header_t **providers {
+ %append_output(svn_swig_rb_apr_array_to_array_auth_provider_object(*$1));
+}
+#endif