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/10/21 04:00:47 UTC
svn commit: r1400556 [1/29] - in /subversion/branches/ev2-export: ./ build/
build/ac-macros/ build/generator/ build/generator/templates/ build/hudson/
contrib/client-side/emacs/ contrib/client-side/svn-push/
contrib/client-side/svnmerge/ contrib/hook-s...
Author: hwright
Date: Sun Oct 21 02:00:31 2012
New Revision: 1400556
URL: http://svn.apache.org/viewvc?rev=1400556&view=rev
Log:
On the ev2-export branch:
Bring up-to-date with trunk.
Added:
subversion/branches/ev2-export/build/ac-macros/macosx.m4
- copied unchanged from r1400553, subversion/trunk/build/ac-macros/macosx.m4
subversion/branches/ev2-export/build/transform_config_hw.py
- copied unchanged from r1400553, subversion/trunk/build/transform_config_hw.py
subversion/branches/ev2-export/subversion/bindings/javahl/native/ImportFilterCallback.cpp
- copied unchanged from r1400553, subversion/trunk/subversion/bindings/javahl/native/ImportFilterCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/ImportFilterCallback.h
- copied unchanged from r1400553, subversion/trunk/subversion/bindings/javahl/native/ImportFilterCallback.h
subversion/branches/ev2-export/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
- copied unchanged from r1400553, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
subversion/branches/ev2-export/subversion/include/private/svn_pseudo_md5.h
- copied unchanged from r1400553, subversion/trunk/subversion/include/private/svn_pseudo_md5.h
subversion/branches/ev2-export/subversion/libsvn_client/iprops.c
- copied unchanged from r1400553, subversion/trunk/subversion/libsvn_client/iprops.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/inherited_props.c
- copied unchanged from r1400553, subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/util_error.c
- copied unchanged from r1400553, subversion/trunk/subversion/libsvn_ra_serf/util_error.c
subversion/branches/ev2-export/subversion/libsvn_subr/pseudo_md5.c
- copied unchanged from r1400553, subversion/trunk/subversion/libsvn_subr/pseudo_md5.c
subversion/branches/ev2-export/subversion/libsvn_subr/sysinfo.c
- copied unchanged from r1400553, subversion/trunk/subversion/libsvn_subr/sysinfo.c
subversion/branches/ev2-export/subversion/libsvn_subr/sysinfo.h
- copied unchanged from r1400553, subversion/trunk/subversion/libsvn_subr/sysinfo.h
subversion/branches/ev2-export/subversion/libsvn_wc/tree_conflict_editor.c
- copied unchanged from r1400553, subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
subversion/branches/ev2-export/subversion/mod_dav_svn/reports/inherited-props.c
- copied unchanged from r1400553, subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c
subversion/branches/ev2-export/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stderr
- copied unchanged from r1400553, subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stderr
subversion/branches/ev2-export/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
- copied unchanged from r1400553, subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
subversion/branches/ev2-export/subversion/tests/cmdline/iprop_authz_tests.py
- copied unchanged from r1400553, subversion/trunk/subversion/tests/cmdline/iprop_authz_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/iprop_tests.py
- copied unchanged from r1400553, subversion/trunk/subversion/tests/cmdline/iprop_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_automatic_tests.py
- copied unchanged from r1400553, subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/wc_tests.py
- copied unchanged from r1400553, subversion/trunk/subversion/tests/cmdline/wc_tests.py
subversion/branches/ev2-export/tools/client-side/svn-bench/ (props changed)
- copied from r1400553, subversion/trunk/tools/client-side/svn-bench/
subversion/branches/ev2-export/tools/hook-scripts/persist-ephemeral-txnprops.py
- copied unchanged from r1400553, subversion/trunk/tools/hook-scripts/persist-ephemeral-txnprops.py
subversion/branches/ev2-export/tools/server-side/fsfs-reorg.c
- copied unchanged from r1400553, subversion/trunk/tools/server-side/fsfs-reorg.c
subversion/branches/ev2-export/tools/server-side/svnpubsub/irkerbridge.py
- copied unchanged from r1400553, subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py
subversion/branches/ev2-export/tools/server-side/svnpubsub/rc.d/svnpubsub
- copied unchanged from r1400553, subversion/trunk/tools/server-side/svnpubsub/rc.d/svnpubsub
subversion/branches/ev2-export/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd
- copied unchanged from r1400553, subversion/trunk/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd
subversion/branches/ev2-export/tools/server-side/svnpubsub/rc.d/svnwcsub
- copied unchanged from r1400553, subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub
subversion/branches/ev2-export/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd
- copied unchanged from r1400553, subversion/trunk/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd
Removed:
subversion/branches/ev2-export/build/strip-po-charset.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_symmetric_tests.py
Modified:
subversion/branches/ev2-export/ (props changed)
subversion/branches/ev2-export/CHANGES
subversion/branches/ev2-export/COMMITTERS
subversion/branches/ev2-export/INSTALL
subversion/branches/ev2-export/Makefile.in
subversion/branches/ev2-export/NOTICE
subversion/branches/ev2-export/aclocal.m4
subversion/branches/ev2-export/build.conf
subversion/branches/ev2-export/build/ac-macros/apache.m4
subversion/branches/ev2-export/build/ac-macros/berkeley-db.m4
subversion/branches/ev2-export/build/ac-macros/serf.m4
subversion/branches/ev2-export/build/ac-macros/sqlite.m4
subversion/branches/ev2-export/build/generator/gen_base.py
subversion/branches/ev2-export/build/generator/gen_make.py
subversion/branches/ev2-export/build/generator/gen_vcnet_vcproj.py
subversion/branches/ev2-export/build/generator/gen_win.py
subversion/branches/ev2-export/build/generator/templates/build_locale.ezt
subversion/branches/ev2-export/build/generator/templates/build_zlib.ezt
subversion/branches/ev2-export/build/generator/templates/makefile.ezt
subversion/branches/ev2-export/build/generator/templates/serf.vcproj.ezt
subversion/branches/ev2-export/build/generator/templates/serf.vcxproj.ezt
subversion/branches/ev2-export/build/generator/templates/svn_config.vcproj.ezt
subversion/branches/ev2-export/build/generator/templates/svn_config.vcxproj.ezt
subversion/branches/ev2-export/build/generator/templates/svn_locale.vcproj.ezt
subversion/branches/ev2-export/build/generator/templates/svn_locale.vcxproj.ezt
subversion/branches/ev2-export/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/ev2-export/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/ev2-export/build/hudson/README (props changed)
subversion/branches/ev2-export/build/run_tests.py
subversion/branches/ev2-export/configure.ac
subversion/branches/ev2-export/contrib/client-side/emacs/dsvn.el
subversion/branches/ev2-export/contrib/client-side/emacs/psvn.el
subversion/branches/ev2-export/contrib/client-side/svn-push/svn-push.c
subversion/branches/ev2-export/contrib/client-side/svnmerge/svnmerge.py
subversion/branches/ev2-export/contrib/hook-scripts/enforcer/enforcer
subversion/branches/ev2-export/contrib/server-side/fsfsfixer/fix-repo
subversion/branches/ev2-export/gen-make.py
subversion/branches/ev2-export/get-deps.sh
subversion/branches/ev2-export/notes/api-changes-1.7.txt (props changed)
subversion/branches/ev2-export/notes/api-errata/1.8/fs001.txt (props changed)
subversion/branches/ev2-export/notes/authz_policy.txt
subversion/branches/ev2-export/notes/diff-data-flows.txt (props changed)
subversion/branches/ev2-export/notes/directory-index/dirindex.py
subversion/branches/ev2-export/notes/directory-index/schema.sql
subversion/branches/ev2-export/notes/merge-tracking/func-spec.html
subversion/branches/ev2-export/notes/obliterate/design-audit.html (props changed)
subversion/branches/ev2-export/notes/obliterate/design-authz.html (props changed)
subversion/branches/ev2-export/notes/obliterate/design-repos.html (props changed)
subversion/branches/ev2-export/notes/obliterate/design-wc.html (props changed)
subversion/branches/ev2-export/notes/obliterate/plan-milestones.html (props changed)
subversion/branches/ev2-export/notes/ra-serf-testing.txt (props changed)
subversion/branches/ev2-export/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt (props changed)
subversion/branches/ev2-export/notes/wc_node_walkers.txt (props changed)
subversion/branches/ev2-export/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/ChangelistCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/CommitCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/CommitMessage.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/CreateJ.h
subversion/branches/ev2-export/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/InfoCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/ListCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/OutputStream.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/PatchCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/ProplistCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/ev2-export/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/SVNRepos.h
subversion/branches/ev2-export/subversion/bindings/javahl/native/StatusCallback.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
subversion/branches/ev2-export/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/ev2-export/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/ev2-export/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/ev2-export/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/branches/ev2-export/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/ev2-export/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
subversion/branches/ev2-export/subversion/bindings/swig/core.i
subversion/branches/ev2-export/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/ev2-export/subversion/bindings/swig/include/svn_types.swg
subversion/branches/ev2-export/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/branches/ev2-export/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/ (props changed)
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/Client.pm
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/Core.pm
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/Fs.pm
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/Repos.pm
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/Wc.pm
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/0use.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/1repos.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/2fs.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/3client.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/4pool.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/5delta-compat.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/5delta.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/6ra.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/7editor.t
subversion/branches/ev2-export/subversion/bindings/swig/perl/native/t/8lock.t
subversion/branches/ev2-export/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/ev2-export/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/ev2-export/subversion/bindings/swig/python/svn/delta.py
subversion/branches/ev2-export/subversion/bindings/swig/python/tests/core.py
subversion/branches/ev2-export/subversion/bindings/swig/python/tests/pool.py
subversion/branches/ev2-export/subversion/bindings/swig/svn_delta.i
subversion/branches/ev2-export/subversion/bindings/swig/svn_wc.i
subversion/branches/ev2-export/subversion/include/private/svn_cache.h
subversion/branches/ev2-export/subversion/include/private/svn_client_private.h
subversion/branches/ev2-export/subversion/include/private/svn_cmdline_private.h
subversion/branches/ev2-export/subversion/include/private/svn_dav_protocol.h
subversion/branches/ev2-export/subversion/include/private/svn_debug.h
subversion/branches/ev2-export/subversion/include/private/svn_dep_compat.h
subversion/branches/ev2-export/subversion/include/private/svn_eol_private.h
subversion/branches/ev2-export/subversion/include/private/svn_fs_util.h
subversion/branches/ev2-export/subversion/include/private/svn_log.h
subversion/branches/ev2-export/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/ev2-export/subversion/include/private/svn_ra_private.h
subversion/branches/ev2-export/subversion/include/private/svn_skel.h
subversion/branches/ev2-export/subversion/include/private/svn_sqlite.h
subversion/branches/ev2-export/subversion/include/private/svn_string_private.h
subversion/branches/ev2-export/subversion/include/private/svn_subr_private.h
subversion/branches/ev2-export/subversion/include/private/svn_wc_private.h
subversion/branches/ev2-export/subversion/include/svn_client.h
subversion/branches/ev2-export/subversion/include/svn_config.h
subversion/branches/ev2-export/subversion/include/svn_dav.h
subversion/branches/ev2-export/subversion/include/svn_delta.h
subversion/branches/ev2-export/subversion/include/svn_diff.h
subversion/branches/ev2-export/subversion/include/svn_error_codes.h
subversion/branches/ev2-export/subversion/include/svn_fs.h
subversion/branches/ev2-export/subversion/include/svn_io.h
subversion/branches/ev2-export/subversion/include/svn_mergeinfo.h
subversion/branches/ev2-export/subversion/include/svn_opt.h
subversion/branches/ev2-export/subversion/include/svn_path.h
subversion/branches/ev2-export/subversion/include/svn_props.h
subversion/branches/ev2-export/subversion/include/svn_ra.h
subversion/branches/ev2-export/subversion/include/svn_ra_svn.h
subversion/branches/ev2-export/subversion/include/svn_repos.h
subversion/branches/ev2-export/subversion/include/svn_string.h
subversion/branches/ev2-export/subversion/include/svn_types.h
subversion/branches/ev2-export/subversion/include/svn_version.h
subversion/branches/ev2-export/subversion/include/svn_wc.h
subversion/branches/ev2-export/subversion/include/svn_xml.h
subversion/branches/ev2-export/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/branches/ev2-export/subversion/libsvn_client/add.c
subversion/branches/ev2-export/subversion/libsvn_client/cat.c
subversion/branches/ev2-export/subversion/libsvn_client/cleanup.c
subversion/branches/ev2-export/subversion/libsvn_client/client.h
subversion/branches/ev2-export/subversion/libsvn_client/commit.c
subversion/branches/ev2-export/subversion/libsvn_client/commit_util.c
subversion/branches/ev2-export/subversion/libsvn_client/copy.c
subversion/branches/ev2-export/subversion/libsvn_client/ctx.c
subversion/branches/ev2-export/subversion/libsvn_client/deprecated.c
subversion/branches/ev2-export/subversion/libsvn_client/diff.c
subversion/branches/ev2-export/subversion/libsvn_client/externals.c
subversion/branches/ev2-export/subversion/libsvn_client/merge.c
subversion/branches/ev2-export/subversion/libsvn_client/mergeinfo.c
subversion/branches/ev2-export/subversion/libsvn_client/mergeinfo.h
subversion/branches/ev2-export/subversion/libsvn_client/prop_commands.c
subversion/branches/ev2-export/subversion/libsvn_client/ra.c
subversion/branches/ev2-export/subversion/libsvn_client/relocate.c
subversion/branches/ev2-export/subversion/libsvn_client/repos_diff.c
subversion/branches/ev2-export/subversion/libsvn_client/revisions.c
subversion/branches/ev2-export/subversion/libsvn_client/switch.c
subversion/branches/ev2-export/subversion/libsvn_client/update.c
subversion/branches/ev2-export/subversion/libsvn_delta/compat.c
subversion/branches/ev2-export/subversion/libsvn_delta/editor.c
subversion/branches/ev2-export/subversion/libsvn_delta/svndiff.c
subversion/branches/ev2-export/subversion/libsvn_delta/text_delta.c
subversion/branches/ev2-export/subversion/libsvn_diff/diff_file.c
subversion/branches/ev2-export/subversion/libsvn_diff/parse-diff.c
subversion/branches/ev2-export/subversion/libsvn_fs/fs-loader.c
subversion/branches/ev2-export/subversion/libsvn_fs/fs-loader.h
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/bdb-err.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/changes-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/copies-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/locks-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/node-origins-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/nodes-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/reps-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/rev-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/strings-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/txn-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/bdb/uuids-table.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/dag.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/fs.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/lock.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/trail.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/tree.c
subversion/branches/ev2-export/subversion/libsvn_fs_base/uuid.h
subversion/branches/ev2-export/subversion/libsvn_fs_fs/caching.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/dag.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/dag.h
subversion/branches/ev2-export/subversion/libsvn_fs_fs/fs.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/fs.h
subversion/branches/ev2-export/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/ev2-export/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/ev2-export/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/ev2-export/subversion/libsvn_fs_fs/structure
subversion/branches/ev2-export/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/temp_serializer.h
subversion/branches/ev2-export/subversion/libsvn_fs_fs/tree.c
subversion/branches/ev2-export/subversion/libsvn_fs_fs/tree.h
subversion/branches/ev2-export/subversion/libsvn_fs_util/fs-util.c
subversion/branches/ev2-export/subversion/libsvn_ra/compat.c
subversion/branches/ev2-export/subversion/libsvn_ra/deprecated.c
subversion/branches/ev2-export/subversion/libsvn_ra/editor.c
subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.c
subversion/branches/ev2-export/subversion/libsvn_ra/ra_loader.h
subversion/branches/ev2-export/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/ev2-export/subversion/libsvn_ra_local/split_url.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/commit.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/options.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/property.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/ev2-export/subversion/libsvn_ra_serf/replay.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/sb_bucket.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/serf.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/update.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/util.c
subversion/branches/ev2-export/subversion/libsvn_ra_serf/xml.c
subversion/branches/ev2-export/subversion/libsvn_ra_svn/client.c
subversion/branches/ev2-export/subversion/libsvn_ra_svn/editorp.c
subversion/branches/ev2-export/subversion/libsvn_ra_svn/marshal.c
subversion/branches/ev2-export/subversion/libsvn_ra_svn/protocol
subversion/branches/ev2-export/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/ev2-export/subversion/libsvn_repos/authz.c
subversion/branches/ev2-export/subversion/libsvn_repos/commit.c
subversion/branches/ev2-export/subversion/libsvn_repos/delta.c
subversion/branches/ev2-export/subversion/libsvn_repos/deprecated.c
subversion/branches/ev2-export/subversion/libsvn_repos/dump.c
subversion/branches/ev2-export/subversion/libsvn_repos/fs-wrap.c
subversion/branches/ev2-export/subversion/libsvn_repos/hooks.c
subversion/branches/ev2-export/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/ev2-export/subversion/libsvn_repos/log.c
subversion/branches/ev2-export/subversion/libsvn_repos/replay.c
subversion/branches/ev2-export/subversion/libsvn_repos/reporter.c
subversion/branches/ev2-export/subversion/libsvn_repos/repos.c
subversion/branches/ev2-export/subversion/libsvn_repos/repos.h
subversion/branches/ev2-export/subversion/libsvn_repos/rev_hunt.c
subversion/branches/ev2-export/subversion/libsvn_subr/auth.c
subversion/branches/ev2-export/subversion/libsvn_subr/base64.c
subversion/branches/ev2-export/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/ev2-export/subversion/libsvn_subr/cache-memcache.c
subversion/branches/ev2-export/subversion/libsvn_subr/cache_config.c
subversion/branches/ev2-export/subversion/libsvn_subr/cmdline.c
subversion/branches/ev2-export/subversion/libsvn_subr/config.c
subversion/branches/ev2-export/subversion/libsvn_subr/config_file.c
subversion/branches/ev2-export/subversion/libsvn_subr/debug.c
subversion/branches/ev2-export/subversion/libsvn_subr/deprecated.c
subversion/branches/ev2-export/subversion/libsvn_subr/dirent_uri.c
subversion/branches/ev2-export/subversion/libsvn_subr/eol.c
subversion/branches/ev2-export/subversion/libsvn_subr/error.c
subversion/branches/ev2-export/subversion/libsvn_subr/gpg_agent.c
subversion/branches/ev2-export/subversion/libsvn_subr/io.c
subversion/branches/ev2-export/subversion/libsvn_subr/log.c
subversion/branches/ev2-export/subversion/libsvn_subr/mergeinfo.c
subversion/branches/ev2-export/subversion/libsvn_subr/named_atomic.c
subversion/branches/ev2-export/subversion/libsvn_subr/nls.c
subversion/branches/ev2-export/subversion/libsvn_subr/opt.c
subversion/branches/ev2-export/subversion/libsvn_subr/opt.h
subversion/branches/ev2-export/subversion/libsvn_subr/path.c
subversion/branches/ev2-export/subversion/libsvn_subr/simple_providers.c
subversion/branches/ev2-export/subversion/libsvn_subr/skel.c
subversion/branches/ev2-export/subversion/libsvn_subr/sqlite.c
subversion/branches/ev2-export/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
subversion/branches/ev2-export/subversion/libsvn_subr/string.c
subversion/branches/ev2-export/subversion/libsvn_subr/subst.c
subversion/branches/ev2-export/subversion/libsvn_subr/temp_serializer.c
subversion/branches/ev2-export/subversion/libsvn_subr/utf.c
subversion/branches/ev2-export/subversion/libsvn_subr/utf_validate.c
subversion/branches/ev2-export/subversion/libsvn_subr/version.c
subversion/branches/ev2-export/subversion/libsvn_subr/win32_crypto.c
subversion/branches/ev2-export/subversion/libsvn_wc/adm_files.c
subversion/branches/ev2-export/subversion/libsvn_wc/adm_ops.c
subversion/branches/ev2-export/subversion/libsvn_wc/cleanup.c
subversion/branches/ev2-export/subversion/libsvn_wc/conflicts.c
subversion/branches/ev2-export/subversion/libsvn_wc/conflicts.h
subversion/branches/ev2-export/subversion/libsvn_wc/copy.c
subversion/branches/ev2-export/subversion/libsvn_wc/crop.c
subversion/branches/ev2-export/subversion/libsvn_wc/deprecated.c
subversion/branches/ev2-export/subversion/libsvn_wc/entries.c
subversion/branches/ev2-export/subversion/libsvn_wc/externals.c
subversion/branches/ev2-export/subversion/libsvn_wc/info.c
subversion/branches/ev2-export/subversion/libsvn_wc/lock.c
subversion/branches/ev2-export/subversion/libsvn_wc/merge.c
subversion/branches/ev2-export/subversion/libsvn_wc/node.c
subversion/branches/ev2-export/subversion/libsvn_wc/props.c
subversion/branches/ev2-export/subversion/libsvn_wc/status.c
subversion/branches/ev2-export/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/ev2-export/subversion/libsvn_wc/update_editor.c
subversion/branches/ev2-export/subversion/libsvn_wc/upgrade.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/ev2-export/subversion/libsvn_wc/wc-queries.sql
subversion/branches/ev2-export/subversion/libsvn_wc/wc.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_private.h
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_util.c
subversion/branches/ev2-export/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/ev2-export/subversion/libsvn_wc/workqueue.c
subversion/branches/ev2-export/subversion/libsvn_wc/workqueue.h
subversion/branches/ev2-export/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/ev2-export/subversion/mod_dav_svn/activity.c
subversion/branches/ev2-export/subversion/mod_dav_svn/dav_svn.h
subversion/branches/ev2-export/subversion/mod_dav_svn/deadprops.c
subversion/branches/ev2-export/subversion/mod_dav_svn/liveprops.c
subversion/branches/ev2-export/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/ev2-export/subversion/mod_dav_svn/posts/create_txn.c
subversion/branches/ev2-export/subversion/mod_dav_svn/reports/file-revs.c
subversion/branches/ev2-export/subversion/mod_dav_svn/reports/replay.c
subversion/branches/ev2-export/subversion/mod_dav_svn/reports/update.c
subversion/branches/ev2-export/subversion/mod_dav_svn/repos.c
subversion/branches/ev2-export/subversion/mod_dav_svn/version.c
subversion/branches/ev2-export/subversion/po/de.po
subversion/branches/ev2-export/subversion/po/pl.po
subversion/branches/ev2-export/subversion/po/zh_CN.po
subversion/branches/ev2-export/subversion/svn/cl.h
subversion/branches/ev2-export/subversion/svn/conflict-callbacks.c
subversion/branches/ev2-export/subversion/svn/file-merge.c
subversion/branches/ev2-export/subversion/svn/help-cmd.c
subversion/branches/ev2-export/subversion/svn/log-cmd.c
subversion/branches/ev2-export/subversion/svn/main.c
subversion/branches/ev2-export/subversion/svn/merge-cmd.c
subversion/branches/ev2-export/subversion/svn/mergeinfo-cmd.c
subversion/branches/ev2-export/subversion/svn/move-cmd.c
subversion/branches/ev2-export/subversion/svn/notify.c
subversion/branches/ev2-export/subversion/svn/propedit-cmd.c
subversion/branches/ev2-export/subversion/svn/propget-cmd.c
subversion/branches/ev2-export/subversion/svn/proplist-cmd.c
subversion/branches/ev2-export/subversion/svn/props.c
subversion/branches/ev2-export/subversion/svn/resolve-cmd.c
subversion/branches/ev2-export/subversion/svn/status-cmd.c
subversion/branches/ev2-export/subversion/svn/switch-cmd.c
subversion/branches/ev2-export/subversion/svn/tree-conflicts.c
subversion/branches/ev2-export/subversion/svn/update-cmd.c
subversion/branches/ev2-export/subversion/svn_private_config.hw
subversion/branches/ev2-export/subversion/svnadmin/main.c
subversion/branches/ev2-export/subversion/svndumpfilter/main.c
subversion/branches/ev2-export/subversion/svnlook/main.c
subversion/branches/ev2-export/subversion/svnmucc/svnmucc.c
subversion/branches/ev2-export/subversion/svnrdump/load_editor.c
subversion/branches/ev2-export/subversion/svnrdump/svnrdump.c
subversion/branches/ev2-export/subversion/svnserve/main.c
subversion/branches/ev2-export/subversion/svnserve/serve.c
subversion/branches/ev2-export/subversion/svnserve/server.h
subversion/branches/ev2-export/subversion/svnsync/main.c
subversion/branches/ev2-export/subversion/svnversion/main.c
subversion/branches/ev2-export/subversion/svnversion/svnversion.1
subversion/branches/ev2-export/subversion/tests/cmdline/basic_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/commit_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/copy_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/davautocheck.sh
subversion/branches/ev2-export/subversion/tests/cmdline/depth_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/getopt_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
subversion/branches/ev2-export/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/ev2-export/subversion/tests/cmdline/log_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/patch_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/prop_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/resolve_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/schedule_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/special_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/stat_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/svntest/actions.py
subversion/branches/ev2-export/subversion/tests/cmdline/svntest/main.py
subversion/branches/ev2-export/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/ev2-export/subversion/tests/cmdline/tree_conflict_tests.txt (props changed)
subversion/branches/ev2-export/subversion/tests/cmdline/update_tests.py
subversion/branches/ev2-export/subversion/tests/libsvn_client/client-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_delta/vdelta_1.txt (props changed)
subversion/branches/ev2-export/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/auth-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/cache-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/checksum-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/compat-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/named_atomic-test-proc.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/skel-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_subr/string-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/db-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/ev2-export/subversion/tests/libsvn_wc/utils.c
subversion/branches/ev2-export/tools/buildbot/master/public_html/index.html (props changed)
subversion/branches/ev2-export/tools/buildbot/master/public_html/robots.txt (props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
subversion/branches/ev2-export/tools/buildbot/slaves/win32-xp-VS2005/config.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat (contents, props changed)
subversion/branches/ev2-export/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat (contents, props changed)
subversion/branches/ev2-export/tools/dev/benchmarks/suite1/run.bat (contents, props changed)
subversion/branches/ev2-export/tools/dev/gdb-py/svndbg/printers.py
subversion/branches/ev2-export/tools/dev/svnraisetreeconflict/main.c
subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn
subversion/branches/ev2-export/tools/dist/backport.pl
subversion/branches/ev2-export/tools/dist/make-deps-tarball.sh (contents, props changed)
subversion/branches/ev2-export/tools/dist/nightly.sh
subversion/branches/ev2-export/tools/dist/release.py
subversion/branches/ev2-export/tools/server-side/ (props changed)
subversion/branches/ev2-export/tools/server-side/svn-rep-sharing-stats.c
subversion/branches/ev2-export/tools/server-side/svnauthz-validate.c
subversion/branches/ev2-export/tools/server-side/svnpubsub/README.txt (contents, props changed)
subversion/branches/ev2-export/tools/server-side/svnpubsub/commit-hook.py
subversion/branches/ev2-export/tools/server-side/svnpubsub/example.conf
subversion/branches/ev2-export/tools/server-side/svnpubsub/rc.d/svnpubsub.debian
subversion/branches/ev2-export/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
subversion/branches/ev2-export/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
subversion/branches/ev2-export/tools/server-side/svnpubsub/svnpubsub/client.py
subversion/branches/ev2-export/tools/server-side/svnpubsub/svnpubsub/server.py
subversion/branches/ev2-export/tools/server-side/svnpubsub/svnwcsub.py
subversion/branches/ev2-export/win-tests.py
Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Oct 21 02:00:31 2012
@@ -37,6 +37,7 @@ subversion_msvc.plg
subversion_vcnet.sln
subversion_vcnet.ncb
subversion_vcnet.suo
+subversion_vcnet.v11.suo
subversion_vcnet.sdf
subversion_vcnet.opensdf
mkmf.log
Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
Merged /subversion/branches/inheritable-props:r1297080-1395089
Merged /subversion/trunk:r1359961-1400553
Merged /subversion/branches/10Gb:r1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
Modified: subversion/branches/ev2-export/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/CHANGES?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/CHANGES (original)
+++ subversion/branches/ev2-export/CHANGES Sun Oct 21 02:00:31 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,7 @@ 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)
+ * remove extraneous externals output from 'svn status -q' (issue #1935)
* 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)
@@ -25,8 +26,14 @@ http://svn.apache.org/repos/asf/subversi
* 'svn diff' can compare arbitrary files and directories (r1310291, et al)
* ra_serf avoids re-downloading content present in pristine store (r1333936)
* 'svn mergeinfo' now honors the --revision (-r) option (issue #4199)
- * new --search and --isearch options for 'svn log' (r1354666, -830)
+ * 'svn mergeinfo' now shows a summary graph by default (issue #4239)
+ * new --search and --search-and options for 'svn log' (r1354666, -83518)
* new built-in interactive text conflict merge tool (r1357864, et al)
+ * new 'svn --version --verbose' option shows runtime environment info
+ * new 'svnadmin freeze' subcommand (r1376228)
+ * 'svndumpfilter' now supports --delta dumpfiles (r1351009, -3745)
+ * client version info now reported to commit hooks (issue #4124)
+ * 'svn merge' now uses reintegrate mode automatically when needed
- Client-side bugfixes:
*
@@ -45,7 +52,92 @@ http://svn.apache.org/repos/asf/subversi
* fix inconsistent handling of log revs without changed paths (issue #3694)
- Bindings:
- *
+ * star-imports in swig-py only import 'svn_*' symbols (r1303375)
+
+
+Version 1.7.7
+(09 Oct 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.7
+ User-visible changes
+ - Client- and server-side bugfixes:
+ * fix memory read bug (r137614)
+ * update Chinese translation
+
+ - Client-side bugfixes:
+ * fix issues with applying Git patch files (r1374800, et al)
+ * fix status does not descend into dir externals after upgrade (issue #4016)
+ * fix file externals don't update with old mod_dav_svn (issue #4224)
+ * fix external diff tool duplicates Index: lines with 'svn diff' (r1380697)
+ * fix GNOME keyring library fails with very old glib (r1378847)
+ * fix unknown password stores in config file cause error (r1375052)
+ * fix assertions in ra_serf running against server root (r1365519, et al)
+ * fix ra_serf checkout/export aborts early on Windows (issue #4174)
+
+ - Server-side bugfixes:
+ * fix an assert with SVNAutoVersioning in mod_dav_svn (issue #4231)
+ * fix unbounded memory use with SVNPathAuthz short_circuit (r1387943)
+ * fix svndumpfilter exclude --targets requires leading slash (issue #4234)
+ * fix connection ttl for memcache should be 50 seconds (r1391641)
+ * stabilize order of paths in dumpfiles with APR 1.4.6 (r1344864, et al)
+
+ Developer-visible changes:
+ - General:
+ * print "All tests successful" at the end of 'make check' (r1375089)
+ * fix sandbox violation in a test (r1371282)
+ * fix tests fail when running within a format 30 WC (r1391188, et al)
+ * fix return value of svn_client_update4() incorrect (r1380295)
+ * fix make check summary missing test failures (r1390965)
+ * fix build does not fail when apache httpd is not available (r1374198)
+
+ - Bindings:
+ * fix swig-pl build fails with swig 2.0.7 and newer. (r1389658)
+ * fix swig-py runtime problems with swig 2.0.5 and newer (r1351117)
+
+
+Version 1.7.6
+(15 Aug 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.6
+
+ User-visible changes:
+ - Client- and server-side bugfixes:
+
+ - Client-side bugfixes:
+ * Fix "svn status -u --depth empty FILE" (r1348822, r1349215)
+ * Fix example output of 'svn help status' (issue #3962)
+ * svn propset of svn:eol-style might not notice related text changes (r1353572)
+ * sort output of 'svn propget -R' (r1355699)
+ * sort output of 'svn proplist' (r1355698)
+ * sort output of 'svn status' (r1341012)
+ * avoid a filestat per working copy find operation (r1340556)
+ * optimize 'svn upgrade' performance on large working copies (r1342984)
+ * allow 'file:///C:\repos' style arguments on Windows, like 1.6 (r1346765)
+ * fix ra_serf against Subversion 1.2 servers (r1349367)
+ * fix 'svn upgrade' on working copies with certain tree conflicts (r1345482)
+ * avoid workqueue references to system temp dir (r1367854)
+ * allow non-existant canonical paths (r1367853)
+ * fix 'svn revert --depth files' to operate on files (r1365554)
+ * fix ra_serf XML namespace handling against malicious server (r1337441)
+ * fix relocate with server-relative externals (issue 4216)
+ * change two asserts into errors for TortoiseSVN (r1368128, r1368065)
+ * don't attempt to anchor an operation outside a wc root (r1361341)
+
+ - Server-side bugfixes:
+ * partial sync drops properties when converting to adds (issue #4184)
+ * replaying a copy and delete of an unreadable child fails (issue #4121)
+ * allow svnlook to operate on r0 (r1362508)
+ * make FSFS revision files independent of APR hash order (r1367498)
+
+ - Other tool improvements and bugfixes:
+ * move mod_dontdothat to install-tools (r1307177)
+
+ Developer-visible changes:
+ - General:
+ * fix running tests against httpd 2.4 (r1291594)
+ * use constant struct initialisers for C89 compatibility (r1352068)
+
+ - Bindings:
+ * JavaHL: Don't assert on some invalid input (r1354626, r1354652)
+ * JavaHL: Add missing new in 1.7 notifications (r1351772)
Version 1.7.5
@@ -440,6 +532,20 @@ the 1.6 release: http://subversion.apac
* fixed setting binary properties in JavaHL (issue #3770)
* fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
+Version 1.6.19
+(10 Sep 2012, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.19
+
+ - Client-side bugfixes:
+ * handle missing svn:date reported by svnserve gracefully (r1306111)
+
+ - Server-side bugfixes:
+ * fix possible server hang if a hook script fails to start (r1330410)
+ * fix write-through proxy commit regression introduced in 1.6.17 (r1088602)
+ * partial sync drops properties when converting to adds (issue #4184)
+
+ - Developer-visible changes:
+ * fix the testsuite to avoid FAILs on APR hash order (r1230714, et al)
Version 1.6.18
(29 Mar 2012, from /branches/1.6.x)
Modified: subversion/branches/ev2-export/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/COMMITTERS?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/COMMITTERS [UTF-8] (original)
+++ subversion/branches/ev2-export/COMMITTERS [UTF-8] Sun Oct 21 02:00:31 2012
@@ -39,7 +39,7 @@ Blanket commit access:
pburba Paul Burba <pb...@collab.net>
glasser David Glasser <gl...@davidglasser.net>
lgo Lieven Govaerts <lg...@mobsol.be>
- hwright Hyrum Wright <hy...@wandisco.com>
+ hwright Hyrum Wright <hy...@hyrumwright.org>
vgeorgescu Vlad Georgescu <vg...@gmail.com>
kameshj Kamesh Jayachandran <ka...@collab.net>
markphip Mark Phippard <mp...@collab.net>
@@ -55,7 +55,7 @@ Blanket commit access:
jwhitlock Jeremy Whitlock <jc...@gmail.com>
sbutler Stephen Butler <sb...@elego.de>
dannas Daniel Näslund <da...@dannas.name>
- stefan2 Stefan Fuhrmann <st...@alice-dsl.de>
+ stefan2 Stefan Fuhrmann <st...@wandisco.com>
jcorvel Johan Corveleyn <jc...@gmail.com>
trent Trent Nelson <tr...@snakebite.org>
@@ -82,6 +82,7 @@ Partial committers who have asked to be
kon Kalle Olavi Niemitalo <ko...@iki.fi> (psvn.el)
rassilon Bill Tutt <bi...@tutts.org> (Win32, COM, issue-1003-dev br.)
pll Paul lussier <p....@comcast.net> (releases)
+ rdonch Роман Донченко <dp...@corrigendum.ru> (Swig-Python b.)
Commit access for specific areas:
@@ -94,7 +95,6 @@ Commit access for specific areas:
joeswatosh Joe Swatosh <jo...@gmail.com> (Swig-Ruby b.)
jrvernooij Jelmer Vernooij <je...@samba.org> (Python bindings)
sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python b.)
- rdonch Роман Донченко <dp...@corrigendum.ru> (Swig-Python b.)
vmpn Vladimir Berezniker <vm...@hitechman.com> (JavaHL bindings)
Packages:
Modified: subversion/branches/ev2-export/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/INSTALL?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/INSTALL (original)
+++ subversion/branches/ev2-export/INSTALL Sun Oct 21 02:00:31 2012
@@ -96,29 +96,23 @@ I. INTRODUCTION
These diff streams are used everywhere -- over the network,
in the repository, and in the client's working copy.
- * libserf or libneon (OPTIONAL for client)
+ * libserf (OPTIONAL for client)
- The Serf and Neon libraries both allow the Subversion client
- to send HTTP requests. This is necessary if you want your
- client to access a repository served by the Apache HTTP
- server. There is an alternate 'svnserve' server as well,
- though, and clients automatically know how to speak the
- svnserve protocol. Thus it's not strictly necessary for your
- client to be able to speak HTTP... though we still recommend
- that your client be built to speak both HTTP and svnserve
- protocols. Your client can be compiled against either
- libserf or libneon (or both), as they offer competing
- implementations.
+ The Serf library allows the Subversion client to send HTTP
+ requests. This is necessary if you want your client to access
+ a repository served by the Apache HTTP server. There is an
+ alternate 'svnserve' server as well, though, and clients
+ automatically know how to speak the svnserve protocol.
+ Thus it's not strictly necessary for your client to be able
+ to speak HTTP... though we still recommend that your client
+ be built to speak both HTTP and svnserve protocols.
* OpenSSL (OPTIONAL for client and server)
OpenSSL enables your client to access SSL-encrypted https://
- URLs (using libserf or libneon) in addition to unencrypted
- http:// URLs. To use SSL with Subversion's WebDAV server,
- Apache needs to be compiled with OpenSSL as well.
-
- The Neon library can use the GnuTLS library as an alternative
- to OpenSSL.
+ URLs (using libserf) in addition to unencrypted http:// URLs.
+ To use SSL with Subversion's WebDAV server, Apache needs to be
+ compiled with OpenSSL as well.
* Berkeley DB (OPTIONAL for client and server)
@@ -177,10 +171,10 @@ I. INTRODUCTION
team has created a script that downloads the minimal prerequisite
libraries (Apache Portable Runtime, Sqlite, and Zlib). The script,
'get-deps.sh', is available in the same directory as this file.
- When run, it will place 'apr', 'apr-util', 'serf', 'neon',
- 'zlib', and 'sqlite-amalgamation' directories directly into your
- unpacked Subversion distribution, where they will be automatically
- configured and built by Subversion's build process.
+ When run, it will place 'apr', 'apr-util', 'serf', 'zlib', and
+ 'sqlite-amalgamation' directories directly into your unpacked Subversion
+ distribution, where they will be automatically configured and built by
+ Subversion's build process.
Note: there are optional dependencies (such as openssl, swig, and httpd)
which get-deps.sh does not download and Subversion does not attempt to
@@ -313,44 +307,22 @@ I. INTRODUCTION
newer. The autogen.sh script knows about that.
- 5. An HTTP client library: serf or neon. (OPTIONAL)
+ 5. Serf library 1.1 or newer (http://code.google.com/p/serf/) (OPTIONAL)
If you want your client to be able to speak to an Apache
server (via a http:// or https:// URL), you must link against
- at least one of these libraries. Though optional, we strongly
- recommend this.
+ serf. Though optional, we strongly recommend this.
- (If you link against both, Subversion will use ra_serf by
- default. Add "http-library = neon" to the [global] section of
- your ~/.subversion/servers file to use ra_neon instead.)
-
- 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
- serf is installed in a non-standard place, you should use
+ In order to use ra_serf, you must install serf, and run Subversion's
+ ./configure with the argument --with-serf. If serf is installed in a
+ non-standard place, you should use
--with-serf=/path/to/serf/install
- instead.
-
- For more information on serf and Subversion's ra_serf, see
- the file subversion/libsvn_ra_serf/README.
-
- b. Neon library 0.25 through 0.29 (http://www.webdav.org/neon/)
-
- In order to use ra_neon, you must install neon, and run
- Subversion's ./configure with the argument --with-neon.
- Subversion's configuration mechanism should then detect the
- installed Neon. If it does not, you may need to set the
- LDFLAGS environment variable when you run "./configure", or
- specify Neon's location by passing the "--with-neon="
- option to "./configure". Look for the "neon-config" script
- in a "bin/" subdirectory of the target of "--with-neon".
- For example, if you pass "--with-neon=/usr/local/myneon/",
- then there should be a file
- "/usr/local/myneon/bin/neon-config".
+ instead.
+ For more information on serf and Subversion's ra_serf, see the file
+ subversion/libsvn_ra_serf/README.
6. OpenSSL (OPTIONAL)
@@ -358,28 +330,19 @@ I. INTRODUCTION
### finding OpenSSL, but we may need more docco here. and w.r.t
### zlib.
- The Serf and Neon libraries have support for SSL encryption by
- relying on the OpenSSL library.
+ The Serf library has support for SSL encryption by relying on the
+ OpenSSL library.
a. Using OpenSSL on the client through Serf
- b. Using OpenSSL on the client through Neon
-
- When Neon is created with this dependency, then the Subversion
- client inherits the ability to support SSL connections. Neon
- also has support for sending compressed data using the zlib
- library which a Subversion client can take advantage of.
-
- On Unix systems, to build Neon with OpenSSL, you need OpenSSL
+ On Unix systems, to build Serf with OpenSSL, you need OpenSSL
installed on your system, and you must add "--with-ssl" as a
"./configure" parameter. If your OpenSSL installation is hard
- for Neon to find, you may need to use "--with-libs=/path/to/lib"
+ for Serf to find, you may need to use "--with-libs=/path/to/lib"
in addition. In particular, on Red Hat (but not Fedora Core) it
is necessary to specify "--with-libs=/usr/kerberos" for OpenSSL
to be found. You can also specify a path to the zlib library
- using "--with-libs". Consult the Neon documentation for more
- information on how to use these parameters and versions of
- libraries you need.
+ using "--with-libs".
Under Windows, you can specify the paths to these libraries by
passing the options --with-zlib and --with-openssl to gen-make.py.
@@ -651,7 +614,6 @@ II. INSTALLATION
db*.i386.rpm (Version 4.0.14 or greater; version 4.3.27 or
4.2.52 is preferred however)
expat (Comes with RedHat)
- neon (Version 0.25.5)
After downloading, install it (as root user):
@@ -683,7 +645,7 @@ II. INSTALLATION
# rm -f /usr/local/lib/libsvn*
# rm -f /usr/local/lib/libapr*
# rm -f /usr/local/lib/libexpat*
- # rm -f /usr/local/lib/libneon*
+ # rm -f /usr/local/lib/libserf*
Start the process by running "autogen.sh":
@@ -845,15 +807,10 @@ II. INSTALLATION
* 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
+ * Awk (from http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
needed to compile Apache or APR. Note that this is the actual awk
program, not an installer - just rename it to awk.exe and it is
ready to use.
- * Neon 0.26.1 or higher, downloaded from
- http://www.webdav.org/neon/neon-0.26.1.tar.gz which is required
- for building the client components. Neon is included in the zip file
- distribution. (0.25.0+ compiles, but does not properly support all
- HTTP auth types.)
* Apache apr, apr-util, and optionally apr-iconv libraries, version
0.9.12 or later. Included in both the Subversion dependencies ZIP file
and the Apache 2 source zip. If you are building from a Subversion
@@ -907,7 +864,7 @@ II. INSTALLATION
E.2 Notes
- The Neon library supports secure connections with OpenSSL and
+ The Serf library supports secure connections with OpenSSL and
on-the-wire compression with zlib. If you want to use the
secure connections feature, you should pass the option
"--with-openssl" to the gen-make.py script. See Section I.11 for
@@ -955,9 +912,8 @@ II. INSTALLATION
server dso modules and are using Visual Studio 6. You must build
and install it from source if you are not using Visual Studio 6 and
want to build and/or test the server modules.
- * If you checked out Subversion from the repository then extract neon
- into SVN\src-trunk\neon, the zip file source distribution includes
- neon.
+ * If you checked out Subversion from the repository then install the serf
+ sources into SVN\src-trunk\serf.
* If you want BDB backend support, extract the Berkeley DB files
into SVN\src-trunk\db4-win32. It's a good idea to add
SVN\src-trunk\db4-win32\bin to your PATH, so that Subversion can find
Modified: subversion/branches/ev2-export/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/Makefile.in?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/Makefile.in (original)
+++ subversion/branches/ev2-export/Makefile.in Sun Oct 21 02:00:31 2012
@@ -250,6 +250,7 @@ INSTALL_INCLUDE = $(INSTALL) -m 644
INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_LOCALE = $(INSTALL_DATA)
+INSTALL_APACHE_MODS = @INSTALL_APACHE_MODS@
### this isn't correct yet
INSTALL_SWIG_PY = $(INSTALL_LIB)
@@ -280,6 +281,19 @@ INSTALL_EXTRA_SWIG_PY=\
compileall.compile_dir("$(DESTDIR)$(swig_pydir_extra)", 1, \
"$(swig_pydir_extra)");'
+# export an env variable so that the tests can run without being installed
+TEST_SHLIB_VAR_SWIG_PY=\
+ if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
+ for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \
+ if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
+ @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+ else \
+ @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+ fi; \
+ done; \
+ export @SVN_APR_SHLIB_PATH_VAR@; \
+ fi;
+
# The path to generated and complementary source files for the SWIG
# bindings.
SWIG_PL_DIR = $(abs_builddir)/subversion/bindings/swig/perl
@@ -310,6 +324,19 @@ INSTALL_EXTRA_SWIG_RB=\
$(INSTALL_DATA) "$$i" $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
done
+# export an env variable so that the tests can run without being installed
+TEST_SHLIB_VAR_SWIG_RB=\
+ if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
+ for d in $(SWIG_PY_DIR)/libsvn_swig_rb $(SWIG_PY_DIR)/../../../libsvn_*; do \
+ if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
+ @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+ else \
+ @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+ fi; \
+ done; \
+ export @SVN_APR_SHLIB_PATH_VAR@; \
+ fi;
+
APXS = @APXS@
PYTHON = @PYTHON@
@@ -790,6 +817,7 @@ copy-swig-py: autogen-swig-py $(SWIG_PY_
swig-py: autogen-swig-py copy-swig-py
check-swig-py: swig-py
+ $(TEST_SHLIB_VAR_SWIG_PY) \
cd $(SWIG_PY_DIR); \
$(PYTHON) $(SWIG_PY_SRC_DIR)/tests/run_all.py
@@ -812,6 +840,7 @@ extraclean-swig-py: clean-swig-py
swig-rb: autogen-swig-rb
check-swig-rb: swig-rb svnserve
+ $(TEST_SHLIB_VAR_SWIG_RB) \
cd $(SWIG_RB_DIR); \
$(RUBY) -I $(SWIG_RB_SRC_DIR) \
$(SWIG_RB_SRC_DIR)/test/run-test.rb \
Modified: subversion/branches/ev2-export/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/NOTICE?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/NOTICE (original)
+++ subversion/branches/ev2-export/NOTICE Sun Oct 21 02:00:31 2012
@@ -16,3 +16,8 @@ see: build/install-sh
This product includes software developed by Markus Kuhn under a permissive
license, see LICENSE.
+This software contains code derived from the RSA Data Security
+Inc. MD5 Message-Digest Algorithm, including various
+modifications by Spyglass Inc., Carnegie Mellon University, and
+Bell Communications Research, Inc (Bellcore).
+
Modified: subversion/branches/ev2-export/aclocal.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/aclocal.m4?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/aclocal.m4 (original)
+++ subversion/branches/ev2-export/aclocal.m4 Sun Oct 21 02:00:31 2012
@@ -46,6 +46,7 @@ sinclude(build/ac-macros/sqlite.m4)
sinclude(build/ac-macros/swig.m4)
sinclude(build/ac-macros/zlib.m4)
sinclude(build/ac-macros/kwallet.m4)
+sinclude(build/ac-macros/macosx.m4)
# Include the libtool macros
sinclude(build/libtool.m4)
Modified: subversion/branches/ev2-export/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build.conf?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/build.conf (original)
+++ subversion/branches/ev2-export/build.conf Sun Oct 21 02:00:31 2012
@@ -64,9 +64,9 @@ test-scripts =
bdb-test-scripts =
-swig-python-opts = -python -classic
-swig-perl-opts = -perl -nopm -noproxy
-swig-ruby-opts = -ruby
+swig-python-opts = $(CPPFLAGS) -python -classic
+swig-perl-opts = $(CPPFLAGS) -perl -nopm -noproxy
+swig-ruby-opts = $(CPPFLAGS) -ruby
swig-languages = python perl ruby
swig-dirs =
subversion/bindings/swig/python
@@ -83,6 +83,27 @@ swig-checkout-files = common.swg swigrun
#
# BUILD TARGETS
#
+# Target parameters:
+# description - optional build target description
+# type - the target type, defines how to build it
+# when - the name of an autoconf-substed variable that muset be
+# defined to either "true" or "false", that determines
+# whether this target should be built and installed.
+# path - relative path to target sources
+# sources - explicit list of target sources
+# install - the installation group/type
+# manpages - the man pages associated with this target
+# libs - libraries that this target depends on
+# nonlibs - dependencies that are not linked into the target
+# lang - bindings for language $(lang)
+# msvc-libs - additional libraries to link with on Windows
+# msvc-export - additional list of files to expose in dsp/vc(x)proj
+# msvc-static - visual studio target produces only a static lib
+# add-deps - expands to additional autoconf-defined dependencies
+# add-install-deps - like add-deps, but for the install step
+# external-lib - expands to additional autoconf-defined libs
+# external-project - visual studio project to depend on
+#
# The subversion command-line client
[svn]
@@ -296,7 +317,8 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_subr
libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic
-msvc-libs = advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib
+msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
+ crypt32.lib version.lib psapi.lib
msvc-export =
svn_auth.h svn_base64.h svn_cache_config.h svn_checksum.h svn_cmdline.h
svn_compat.h svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h
@@ -326,6 +348,7 @@ msvc-export = svn_wc.h private\svn_wc_pr
# Subversion plugin for Apache's mod_dav
[mod_dav_svn]
description = Subversion plug-in for the Apache DAV module
+when = INSTALL_APACHE_MODS
type = apache-mod
path = subversion/mod_dav_svn
sources = *.c reports/*.c posts/*.c
@@ -336,6 +359,7 @@ msvc-libs = mod_dav.lib libhttpd.lib
[mod_authz_svn]
description = Subversion path-based authorization module for Apache
+when = INSTALL_APACHE_MODS
type = apache-mod
path = subversion/mod_authz_svn
nonlibs = mod_dav_svn apr aprutil
@@ -345,6 +369,7 @@ msvc-libs = libhttpd.lib
[mod_dontdothat]
description = Apache Httpd module to block certain kinds of Apache Subversion requests
+when = INSTALL_APACHE_MODS
type = apache-mod
path = tools/server-side/mod_dontdothat
nonlibs = mod_dav_svn apr aprutil
@@ -1155,7 +1180,7 @@ libs = __ALL__
ra-local-test
svndiff-test vdelta-test
entries-dump atomic-ra-revprop-change wc-lock-tester wc-incomplete-tester
- diff diff3 diff4
+ diff diff3 diff4 fsfs-reorg svn-bench
client-test
conflict-data-test db-test pristine-store-test entries-compat-test
op-depth-test dirent_uri-test wc-queries-test
@@ -1204,6 +1229,13 @@ libs = __JAVAHL__ javahl-tests javahl-co
# ----------------------------------------------------------------------------
# Contrib and tools
+[fsfs-reorg]
+type = exe
+path = tools/server-side
+sources = fsfs-reorg.c
+install = tools
+libs = libsvn_delta libsvn_subr apr
+
[diff]
type = exe
path = tools/diff
@@ -1225,6 +1257,13 @@ sources = diff4.c
install = tools
libs = libsvn_diff libsvn_subr apriconv apr
+[svn-bench]
+type = exe
+path = tools/client-side/svn-bench
+install = tools
+libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr libsvn_delta
+ apriconv apr
+
[svnauthz-validate]
description = Authz config file validator
type = exe
Modified: subversion/branches/ev2-export/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/apache.m4?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/apache.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/apache.m4 Sun Oct 21 02:00:31 2012
@@ -128,6 +128,7 @@ AC_ARG_WITH(apache-libexecdir,
APACHE_LIBEXECDIR="$withval"
])
+INSTALL_APACHE_MODS=false
if test -n "$APXS" && test "$APXS" != "no"; then
APXS_CC="`$APXS -q CC`"
APACHE_INCLUDES="$APACHE_INCLUDES -I$APXS_INCLUDE"
@@ -140,6 +141,7 @@ if test -n "$APXS" && test "$APXS" != "n
BUILD_APACHE_RULE=apache-mod
INSTALL_APACHE_RULE=install-mods-shared
+ INSTALL_APACHE_MODS=true
case $host in
*-*-cygwin*)
@@ -157,6 +159,7 @@ AC_SUBST(APXS)
AC_SUBST(APACHE_LDFLAGS)
AC_SUBST(APACHE_INCLUDES)
AC_SUBST(APACHE_LIBEXECDIR)
+AC_SUBST(INSTALL_APACHE_MODS)
# there aren't any flags that interest us ...
#if test -n "$APXS" && test "$APXS" != "no"; then
Modified: subversion/branches/ev2-export/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/berkeley-db.m4?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/berkeley-db.m4 Sun Oct 21 02:00:31 2012
@@ -175,13 +175,24 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
svn_check_berkeley_db_minor=$2
svn_check_berkeley_db_patch=$3
- # Extract only the -ldb.* flag from the libs supplied by apu-config
- # Otherwise we get bit by the fact that expat might not be built yet
- # Or that it resides in a non-standard location which we would have
- # to compensate with using something like -R`$apu_config --prefix`/lib.
- #
- if test -z "$SVN_DB_LIBS"; then
- SVN_DB_LIBS=["`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`"]
+ if test -z "$SVN_DB_LIBS"; then
+ # We pass --dbm-libs here since Debian has modified apu-config not
+ # to return -ldb unless --dbm-libs is passed. This may also produce
+ # extra output beyond -ldb but since we're only filtering for -ldb
+ # it won't matter to us. However, --dbm-libs was added to apu-config
+ # in 1.3.8 so it's possible the version we have doesn't support it
+ # so fallback without it if we get an error.
+ svn_db_libs_prefiltered=["`$apu_config --libs --dbm-libs`"]
+ if test $? -ne 0; then
+ svn_db_libs_prefiltered=["`$apu_config --libs`"]
+ fi
+
+ # Extract only the -ldb.* flag from the libs supplied by apu-config
+ # Otherwise we get bit by the fact that expat might not be built yet
+ # Or that it resides in a non-standard location which we would have
+ # to compensate with using something like -R`$apu_config --prefix`/lib.
+ #
+ SVN_DB_LIBS=["`echo \"$svn_db_libs_prefiltered\" | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`"]
fi
CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS"
Modified: subversion/branches/ev2-export/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/serf.m4?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/serf.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/serf.m4 Sun Oct 21 02:00:31 2012
@@ -19,50 +19,101 @@ dnl ====================================
dnl
dnl SVN_LIB_SERF(min_major_num, min_minor_num, min_micro_num)
dnl
-dnl Check configure options and assign variables related to
-dnl the serf library.
+dnl Search for a suitable version of serf. min_major_num,
+dnl min_minor_num, and min_micro_num are used to determine
+dnl if the serf library is at least that version.
+dnl
+dnl If a --with-serf option (no argument) or --with-serf=yes
+dnl option is passed, then a search for serf on the system will be
+dnl performed with pkg-config. If --with-serf=yes was actually passed
+dnl then we error if we can't actually find serf.
+dnl
+dnl If a --with-serf=PREFIX option is passed search for a suitable
+dnl serf installed on the system under that PREFIX. We will
+dnl error if we can't find serf.
+dnl
+dnl If a --with-serf=no option is passed then no search will be
+dnl conducted.
+dnl
+dnl If the search for serf fails, set svn_lib_serf to no, otherwise set
+dnl it to yes.
dnl
AC_DEFUN(SVN_LIB_SERF,
[
serf_found=no
+ serf_required=no
+ serf_skip=no
serf_check_major="$1"
serf_check_minor="$2"
serf_check_patch="$3"
+ serf_check_version="$1.$2.$3"
AC_ARG_WITH(serf,AS_HELP_STRING([--with-serf=PREFIX],
- [Serf HTTP client library]),
+ [Serf HTTP client library (enabled by default if found)]),
[
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; 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"
- AC_CHECK_HEADERS(serf.h,[
- save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
- AC_CHECK_LIB($serf_major, serf_context_create,[
- AC_TRY_COMPILE([
+ serf_required=yes
+ elif test "$withval" = "no" ; then
+ serf_skip=yes
+ else
+ SVN_SERF_PREFIX_CONFIG()
+ fi
+ ])
+
+ if test "$serf_skip" = "no" ; then
+ if test "$serf_found" = "no" ; then
+ SVN_SERF_PKG_CONFIG()
+ fi
+
+ AC_MSG_CHECKING([was serf enabled])
+ if test "$serf_found" = "yes"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ SVN_DOWNLOAD_SERF()
+ if test "$serf_required" = "yes"; then
+ AC_MSG_ERROR([Serf was explicitly enabled but an appropriate version was not found.])
+ fi
+ fi
+ fi
+
+ svn_lib_serf=$serf_found
+
+ AC_SUBST(SVN_SERF_INCLUDES)
+ AC_SUBST(SVN_SERF_LIBS)
+])
+
+dnl SVN_SERF_PREFIX_CONFIG()
+dnl Use user provided prefix to try and detect and configure serf
+AC_DEFUN(SVN_SERF_PREFIX_CONFIG,
+[
+ AC_MSG_NOTICE([serf library configuration via prefix])
+ serf_required=yes
+ serf_prefix=$withval
+ 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"
+ AC_CHECK_HEADERS(serf.h,[
+ save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ AC_CHECK_LIB($serf_major, serf_context_create,[
+ AC_TRY_COMPILE([
#include <stdlib.h>
#include "serf.h"
],[
#if ! SERF_VERSION_AT_LEAST($serf_check_major, $serf_check_minor, $serf_check_patch)
-#error Serf version too old: need $serf_check_major.$serf_check_minor.$serf_check_patch
+#error Serf version too old: need $serf_check_version
#endif
-], [serf_found=yes], [AC_MSG_WARN([Serf version too old: need $serf_check_major.$serf_check_minor.$serf_check_patch])
- serf_found=no])], ,
- $SVN_APRUTIL_LIBS $SVN_APR_LIBS -lz)
- LDFLAGS="$save_ldflags"])
- CPPFLAGS="$save_cppflags"
- test $serf_found = yes && break
- done
- fi
- ])
+], [serf_found=yes], [AC_MSG_WARN([Serf version too old: need $serf_check_version])
+ serf_found=no])], ,
+ $SVN_APRUTIL_LIBS $SVN_APR_LIBS -lz)
+ LDFLAGS="$save_ldflags"])
+ CPPFLAGS="$save_cppflags"
+ test $serf_found = yes && break
+ done
if test $serf_found = "yes"; then
SVN_SERF_INCLUDES="-I$serf_prefix/include/$serf_major"
@@ -73,9 +124,45 @@ AC_DEFUN(SVN_LIB_SERF,
LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
fi
fi
+])
- svn_lib_serf=$serf_found
+dnl SVN_SERF_PKG_CONFIG()
+dnl Use pkg-config to try and detect and configure serf
+AC_DEFUN(SVN_SERF_PKG_CONFIG,
+[
+ AC_MSG_NOTICE([serf library configuration via pkg-config])
+ if test -n "$PKG_CONFIG"; then
+ for serf_major in serf-2 serf-1; do
+ AC_MSG_CHECKING([for $serf_major library])
+ if $PKG_CONFIG $serf_major --exists; then
+ AC_MSG_RESULT([yes])
+ AC_MSG_CHECKING([serf library version])
+ SERF_VERSION=`$PKG_CONFIG $serf_major --modversion`
+ AC_MSG_RESULT([$SERF_VERSION])
+ AC_MSG_CHECKING([serf version is suitable])
+ if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version; then
+ AC_MSG_RESULT([yes])
+ serf_found=yes
+ SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e 's/-D[^ ]*//g'`]
+ SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs`
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([Serf version too old: need $serf_check_version])
+ fi
+ else
+ AC_MSG_RESULT([no])
+ fi
+ done
+ fi
+])
- AC_SUBST(SVN_SERF_INCLUDES)
- AC_SUBST(SVN_SERF_LIBS)
+dnl SVN_DOWNLOAD_SERF()
+dnl no serf found, print out a message telling the user what to do
+AC_DEFUN(SVN_DOWNLOAD_SERF,
+[
+ echo ""
+ echo "An appropriate version of serf could not be found, so libsvn_ra_serf"
+ echo "will not be built. If you want to build libsvn_ra_serf, please"
+ echo "install serf $serf_check_version or newer."
+ echo ""
])
Modified: subversion/branches/ev2-export/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/ac-macros/sqlite.m4?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/ev2-export/build/ac-macros/sqlite.m4 Sun Oct 21 02:00:31 2012
@@ -189,10 +189,15 @@ AC_DEFUN(SVN_SQLITE_FILE_CONFIG,
SQLITE_VERSION_OKAY
#endif],
[AC_MSG_RESULT([amalgamation found and is okay])
+ _SVN_SQLITE_DSO_LIBS
AC_DEFINE(SVN_SQLITE_INLINE, 1,
[Defined if svn should use the amalgamated version of sqlite])
SVN_SQLITE_INCLUDES="-I`dirname $sqlite_amalg`"
- SVN_SQLITE_LIBS="-ldl -lpthread"
+ if test -n "$svn_sqlite_dso_ldflags"; then
+ SVN_SQLITE_LIBS="$svn_sqlite_dso_ldflags -lpthread"
+ else
+ SVN_SQLITE_LIBS="-lpthread"
+ fi
svn_lib_sqlite="yes"],
[AC_MSG_RESULT([unsupported amalgamation SQLite version])])
fi
@@ -244,3 +249,50 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
echo ""
AC_MSG_ERROR([Subversion requires SQLite])
])
+
+dnl _SVN_SQLITE_DSO_LIBS() dnl Find additional libraries that the
+dnl sqlite amalgamation code should link in order to load
+dnl shared libraries. Copied from build/libtool.m4
+AC_DEFUN(_SVN_SQLITE_DSO_LIBS,
+[
+ case $host_os in
+ beos* | mingw* | pw32* | cegcc* | cygwin*)
+ svn_sqlite_dso_ldflags=
+ ;;
+
+ darwin*)
+ # if libdl is installed we need to link against it
+ AC_CHECK_LIB([dl], [dlopen],
+ [lt_cv_dlopen="dlopen" svn_sqlite_dso_ldflags="-ldl"],[
+ svn_sqlite_dso_ldflags=
+ ])
+ ;;
+
+ *)
+ AC_CHECK_FUNC([shl_load],
+ [svn_sqlite_dso_ldflags=],
+ [AC_CHECK_LIB([dld], [shl_load],
+ [svn_sqlite_dso_ldflags="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [svn_sqlite_dso_ldflags=],
+ [AC_CHECK_LIB([dl], [dlopen],
+ [svn_sqlite_dso_ldflags="-ldl"],
+ [AC_CHECK_LIB([svld], [dlopen],
+ [svn_sqlite_dso_ldflags="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+ [svn_sqlite_dso_ldflags="-ldld"])
+ ])
+ ])
+ ])
+ ])
+ ])
+ ;;
+ esac
+
+ AC_MSG_CHECKING([additional libraries for sqlite])
+ if test -n "$svn_sqlite_dso_ldflags"; then
+ AC_MSG_RESULT(${svn_sqlite_dso_ldflags})
+ else
+ AC_MSG_RESULT(none)
+ fi
+])
Modified: subversion/branches/ev2-export/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/generator/gen_base.py?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/generator/gen_base.py (original)
+++ subversion/branches/ev2-export/build/generator/gen_base.py Sun Oct 21 02:00:31 2012
@@ -300,15 +300,16 @@ for _dt in dep_types:
globals()[_dt] = _dt
class DependencyNode:
- def __init__(self, filename):
+ def __init__(self, filename, when = None):
self.filename = filename
+ self.when = when
def __str__(self):
return self.filename
class ObjectFile(DependencyNode):
- def __init__(self, filename, compile_cmd = None):
- DependencyNode.__init__(self, filename)
+ def __init__(self, filename, compile_cmd = None, when = None):
+ DependencyNode.__init__(self, filename, when)
self.compile_cmd = compile_cmd
self.source_generated = 0
@@ -362,6 +363,7 @@ class Target(DependencyNode):
self.name = name
self.gen_obj = gen_obj
self.desc = options.get('description')
+ self.when = options.get('when')
self.path = options.get('path', '')
self.add_deps = options.get('add-deps', '')
self.add_install_deps = options.get('add-install-deps', '')
@@ -434,7 +436,7 @@ class TargetLinked(Target):
else:
raise GenError('ERROR: unknown file extension on ' + src)
- ofile = ObjectFile(objname, self.compile_cmd)
+ ofile = ObjectFile(objname, self.compile_cmd, self.when)
# object depends upon source
self.gen_obj.graph.add(DT_OBJECT, ofile, SourceFile(src, reldir))
@@ -554,7 +556,7 @@ class TargetI18N(Target):
else:
raise GenError('ERROR: unknown file extension on ' + src)
- ofile = ObjectFile(objname, self.compile_cmd)
+ ofile = ObjectFile(objname, self.compile_cmd, self.when)
# object depends upon source
self.gen_obj.graph.add(DT_OBJECT, ofile, SourceFile(src, reldir))
@@ -699,7 +701,8 @@ class TargetJavaHeaders(TargetJava):
class_pkg_list = self.package.split('.')
class_pkg = build_path_join(*class_pkg_list)
class_file = ObjectFile(build_path_join(self.classes, class_pkg,
- class_name + self.objext))
+ class_name + self.objext),
+ self.when)
class_file.source_generated = 1
class_file.class_name = class_name
hfile = HeaderFile(class_header, self.package + '.' + class_name,
@@ -759,7 +762,7 @@ class TargetJavaClasses(TargetJava):
else:
raise GenError('ERROR: unknown file extension on "' + src + '"')
- ofile = ObjectFile(objname, self.compile_cmd)
+ ofile = ObjectFile(objname, self.compile_cmd, self.when)
sfile = SourceFile(src, reldir)
sfile.sourcepath = sourcepath
@@ -1126,6 +1129,10 @@ class IncludeDependencyInfo:
# of <>/"" convention.
return hdrs
+class FileInfo:
+ def __init__(self, filename, when):
+ self.filename = filename
+ self.when = when
def _sorted_files(graph, area):
"Given a list of targets, sort them based on their dependencies."
@@ -1163,9 +1170,9 @@ def _sorted_files(graph, area):
s = graph.get_sources(DT_LINK, t.name)
for d in s:
if d not in targets:
- files.append(d.filename)
+ files.append(FileInfo(d.filename, d.when))
else:
- files.append(t.filename)
+ files.append(FileInfo(t.filename, t.when))
# don't consider this target any more
targets.remove(t)
Modified: subversion/branches/ev2-export/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/generator/gen_make.py?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/generator/gen_make.py (original)
+++ subversion/branches/ev2-export/build/generator/gen_make.py Sun Oct 21 02:00:31 2012
@@ -289,6 +289,7 @@ class Generator(gen_base.GeneratorBase):
add_deps=target_ob.add_deps,
objects=objects,
deps=deps,
+ when=target_ob.when,
)
data.target.append(ezt_target)
@@ -375,11 +376,11 @@ class Generator(gen_base.GeneratorBase):
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)
+ dirname, fname = build_path_splitfile(file.filename)
base, ext = os.path.splitext(fname)
name = base.replace('mod_', '')
- return _eztdata(fullname=file, dirname=dirname,
- name=name, filename=fname)
+ return _eztdata(fullname=file.filename, dirname=dirname,
+ name=name, filename=fname, when=file.when)
if area == 'apache-mod':
data.areas.append(ezt_area)
@@ -396,7 +397,8 @@ class Generator(gen_base.GeneratorBase):
# ### 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
+ apache_files = [gen_base.FileInfo(t.filename, t.when)
+ for t in inst_targets
if isinstance(t, gen_base.TargetApacheMod)]
files = [f for f in files if f not in apache_files]
@@ -404,9 +406,9 @@ class Generator(gen_base.GeneratorBase):
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)
- ezt_file = _eztdata(dirname=dirname, fullname=file,
- filename=fname)
+ dirname, fname = build_path_splitfile(file.filename)
+ ezt_file = _eztdata(dirname=dirname, fullname=file.filename,
+ filename=fname, when=file.when)
if area == 'locale':
lang, objext = os.path.splitext(fname)
installdir = '$(DESTDIR)$(%sdir)/%s/LC_MESSAGES' % (area_var, lang)
@@ -456,6 +458,7 @@ class Generator(gen_base.GeneratorBase):
for objname, sources in obj_deps:
dep = _eztdata(name=str(objname),
+ when=objname.when,
deps=list(map(str, sources)),
cmd=objname.compile_cmd,
source=str(sources[0]))
Modified: subversion/branches/ev2-export/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/build/generator/gen_vcnet_vcproj.py?rev=1400556&r1=1400555&r2=1400556&view=diff
==============================================================================
--- subversion/branches/ev2-export/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/ev2-export/build/generator/gen_vcnet_vcproj.py Sun Oct 21 02:00:31 2012
@@ -138,14 +138,14 @@ class Generator(gen_win.WinGeneratorBase
key=lambda t: t[0]):
sql.append(_eztdata(header=hdrfile.replace('/', '\\'),
source=sqlfile[0].replace('/', '\\'),
- dependencies=[x.replace('/', '\\') for x in sqlfile[1:]],
- svn_python=sys.executable))
+ dependencies=[x.replace('/', '\\') for x in sqlfile[1:]]))
# apr doesn't supply vcproj files, the user must convert them
# manually before loading the generated solution
self.move_proj_file(self.projfilesdir,
'svn_config' + self.vcproj_extension,
(
+ ('svn_python', sys.executable),
('sql', sql),
('project_guid', self.makeguid('__CONFIG__')),
)