You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pr...@apache.org on 2013/06/05 11:22:51 UTC
svn commit: r1489765 [1/22] - in /subversion/branches/verify-keep-going: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
contrib/hook-scripts/ contrib/server-side/fsfsfixer/
contrib/server-side/fsfsfixer/fixer/ notes/ subversion/...
Author: prabhugs
Date: Wed Jun 5 09:22:43 2013
New Revision: 1489765
URL: http://svn.apache.org/r1489765
Log:
Merging r1465587 through r1488969 from trunk to verify-keep-going branch.
Added:
subversion/branches/verify-keep-going/.ycm_extra_conf.py
- copied unchanged from r1488969, subversion/trunk/.ycm_extra_conf.py
subversion/branches/verify-keep-going/subversion/libsvn_ra_svn/deprecated.c
- copied unchanged from r1488969, subversion/trunk/subversion/libsvn_ra_svn/deprecated.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf8proc/
- copied from r1488969, subversion/trunk/subversion/libsvn_subr/utf8proc/
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf8proc.c
- copied unchanged from r1488969, subversion/trunk/subversion/libsvn_subr/utf8proc.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf8proc/LICENSE
- copied unchanged from r1488969, subversion/trunk/subversion/libsvn_subr/utf8proc/LICENSE
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf8proc/README
- copied unchanged from r1488969, subversion/trunk/subversion/libsvn_subr/utf8proc/README
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf8proc/utf8proc.c.inline
- copied unchanged from r1488969, subversion/trunk/subversion/libsvn_subr/utf8proc/utf8proc.c.inline
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf8proc/utf8proc.h
- copied unchanged from r1488969, subversion/trunk/subversion/libsvn_subr/utf8proc/utf8proc.h
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf8proc/utf8proc_data.c.inline
- copied unchanged from r1488969, subversion/trunk/subversion/libsvn_subr/utf8proc/utf8proc_data.c.inline
subversion/branches/verify-keep-going/subversion/svn/deprecated.c
- copied unchanged from r1488969, subversion/trunk/subversion/svn/deprecated.c
subversion/branches/verify-keep-going/subversion/tests/cmdline/upgrade_tests_data/changelist_upgrade_1_6.tar.bz2
- copied unchanged from r1488969, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/changelist_upgrade_1_6.tar.bz2
subversion/branches/verify-keep-going/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot.tar.bz2
- copied unchanged from r1488969, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot.tar.bz2
subversion/branches/verify-keep-going/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2
- copied unchanged from r1488969, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2
subversion/branches/verify-keep-going/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root.tar.bz2
- copied unchanged from r1488969, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root.tar.bz2
subversion/branches/verify-keep-going/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.tar.bz2
- copied unchanged from r1488969, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.tar.bz2
subversion/branches/verify-keep-going/subversion/tests/diacritical.txt
- copied unchanged from r1488969, subversion/trunk/subversion/tests/diacritical.txt
subversion/branches/verify-keep-going/tools/dev/build-svn-deps-win.pl
- copied unchanged from r1488969, subversion/trunk/tools/dev/build-svn-deps-win.pl
subversion/branches/verify-keep-going/tools/dev/remove-trailing-whitespace.sh
- copied unchanged from r1488969, subversion/trunk/tools/dev/remove-trailing-whitespace.sh
subversion/branches/verify-keep-going/tools/examples/walk-config-auth.py
- copied unchanged from r1488969, subversion/trunk/tools/examples/walk-config-auth.py
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/revprop-change-hook.py
- copied unchanged from r1488969, subversion/trunk/tools/server-side/svnpubsub/revprop-change-hook.py
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/svnpubsub/util.py
- copied unchanged from r1488969, subversion/trunk/tools/server-side/svnpubsub/svnpubsub/util.py
Removed:
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/notes/
Modified:
subversion/branches/verify-keep-going/ (props changed)
subversion/branches/verify-keep-going/CHANGES
subversion/branches/verify-keep-going/COMMITTERS
subversion/branches/verify-keep-going/INSTALL
subversion/branches/verify-keep-going/Makefile.in
subversion/branches/verify-keep-going/build.conf
subversion/branches/verify-keep-going/build/ac-macros/apache.m4
subversion/branches/verify-keep-going/build/ac-macros/compiler.m4
subversion/branches/verify-keep-going/build/ac-macros/kwallet.m4
subversion/branches/verify-keep-going/build/ac-macros/sqlite.m4
subversion/branches/verify-keep-going/build/generator/gen_base.py
subversion/branches/verify-keep-going/build/generator/gen_make.py
subversion/branches/verify-keep-going/build/generator/gen_win.py
subversion/branches/verify-keep-going/build/generator/templates/build-outputs.mk.ezt
subversion/branches/verify-keep-going/build/run_tests.py
subversion/branches/verify-keep-going/configure.ac
subversion/branches/verify-keep-going/contrib/hook-scripts/check-mime-type.pl
subversion/branches/verify-keep-going/contrib/hook-scripts/detect-merge-conflicts.sh
subversion/branches/verify-keep-going/contrib/hook-scripts/svn-keyword-check.pl
subversion/branches/verify-keep-going/contrib/server-side/fsfsfixer/fix-repo
subversion/branches/verify-keep-going/contrib/server-side/fsfsfixer/fixer/find_good_id.py
subversion/branches/verify-keep-going/contrib/server-side/fsfsfixer/fixer/fix-rev.py
subversion/branches/verify-keep-going/contrib/server-side/fsfsfixer/fixer/fixer_config.py
subversion/branches/verify-keep-going/gen-make.py
subversion/branches/verify-keep-going/get-deps.sh (contents, props changed)
subversion/branches/verify-keep-going/notes/dump-load-format.txt
subversion/branches/verify-keep-going/subversion/bindings/ctypes-python/setup.py
subversion/branches/verify-keep-going/subversion/bindings/ctypes-python/test/svntypes.py
subversion/branches/verify-keep-going/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/verify-keep-going/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/verify-keep-going/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ConflictVersion.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/verify-keep-going/subversion/bindings/swig/core.i
subversion/branches/verify-keep-going/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/verify-keep-going/subversion/bindings/swig/include/svn_types.swg
subversion/branches/verify-keep-going/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/branches/verify-keep-going/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
subversion/branches/verify-keep-going/subversion/bindings/swig/perl/native/Client.pm
subversion/branches/verify-keep-going/subversion/bindings/swig/perl/native/Core.pm
subversion/branches/verify-keep-going/subversion/bindings/swig/perl/native/t/3client.t
subversion/branches/verify-keep-going/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/verify-keep-going/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/verify-keep-going/subversion/bindings/swig/python/tests/checksum.py
subversion/branches/verify-keep-going/subversion/bindings/swig/python/tests/core.py
subversion/branches/verify-keep-going/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/branches/verify-keep-going/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
subversion/branches/verify-keep-going/subversion/bindings/swig/ruby/test/greek_tree.rb
subversion/branches/verify-keep-going/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/verify-keep-going/subversion/bindings/swig/ruby/test/test_delta.rb
subversion/branches/verify-keep-going/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/verify-keep-going/subversion/bindings/swig/ruby/test/util.rb
subversion/branches/verify-keep-going/subversion/bindings/swig/ruby/test/windows_util.rb
subversion/branches/verify-keep-going/subversion/bindings/swig/svn_client.i
subversion/branches/verify-keep-going/subversion/include/mod_authz_svn.h
subversion/branches/verify-keep-going/subversion/include/private/svn_cache.h
subversion/branches/verify-keep-going/subversion/include/private/svn_client_private.h
subversion/branches/verify-keep-going/subversion/include/private/svn_diff_tree.h
subversion/branches/verify-keep-going/subversion/include/private/svn_fs_private.h
subversion/branches/verify-keep-going/subversion/include/private/svn_mutex.h
subversion/branches/verify-keep-going/subversion/include/private/svn_ra_svn_private.h
subversion/branches/verify-keep-going/subversion/include/private/svn_sqlite.h
subversion/branches/verify-keep-going/subversion/include/private/svn_string_private.h
subversion/branches/verify-keep-going/subversion/include/private/svn_subr_private.h
subversion/branches/verify-keep-going/subversion/include/private/svn_utf_private.h
subversion/branches/verify-keep-going/subversion/include/private/svn_wc_private.h
subversion/branches/verify-keep-going/subversion/include/svn_auth.h
subversion/branches/verify-keep-going/subversion/include/svn_client.h
subversion/branches/verify-keep-going/subversion/include/svn_compat.h
subversion/branches/verify-keep-going/subversion/include/svn_config.h
subversion/branches/verify-keep-going/subversion/include/svn_dav.h
subversion/branches/verify-keep-going/subversion/include/svn_error.h
subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h
subversion/branches/verify-keep-going/subversion/include/svn_fs.h
subversion/branches/verify-keep-going/subversion/include/svn_hash.h
subversion/branches/verify-keep-going/subversion/include/svn_io.h
subversion/branches/verify-keep-going/subversion/include/svn_path.h
subversion/branches/verify-keep-going/subversion/include/svn_props.h
subversion/branches/verify-keep-going/subversion/include/svn_ra_svn.h
subversion/branches/verify-keep-going/subversion/include/svn_repos.h
subversion/branches/verify-keep-going/subversion/include/svn_string.h
subversion/branches/verify-keep-going/subversion/include/svn_subst.h
subversion/branches/verify-keep-going/subversion/include/svn_types.h
subversion/branches/verify-keep-going/subversion/include/svn_utf.h
subversion/branches/verify-keep-going/subversion/include/svn_version.h
subversion/branches/verify-keep-going/subversion/include/svn_wc.h
subversion/branches/verify-keep-going/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/branches/verify-keep-going/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/verify-keep-going/subversion/libsvn_client/add.c
subversion/branches/verify-keep-going/subversion/libsvn_client/cat.c
subversion/branches/verify-keep-going/subversion/libsvn_client/commit_util.c
subversion/branches/verify-keep-going/subversion/libsvn_client/copy.c
subversion/branches/verify-keep-going/subversion/libsvn_client/copy_foreign.c
subversion/branches/verify-keep-going/subversion/libsvn_client/ctx.c
subversion/branches/verify-keep-going/subversion/libsvn_client/delete.c
subversion/branches/verify-keep-going/subversion/libsvn_client/deprecated.c
subversion/branches/verify-keep-going/subversion/libsvn_client/diff.c
subversion/branches/verify-keep-going/subversion/libsvn_client/export.c
subversion/branches/verify-keep-going/subversion/libsvn_client/externals.c
subversion/branches/verify-keep-going/subversion/libsvn_client/import.c
subversion/branches/verify-keep-going/subversion/libsvn_client/iprops.c
subversion/branches/verify-keep-going/subversion/libsvn_client/list.c
subversion/branches/verify-keep-going/subversion/libsvn_client/log.c
subversion/branches/verify-keep-going/subversion/libsvn_client/merge.c
subversion/branches/verify-keep-going/subversion/libsvn_client/mergeinfo.c
subversion/branches/verify-keep-going/subversion/libsvn_client/patch.c
subversion/branches/verify-keep-going/subversion/libsvn_client/prop_commands.c
subversion/branches/verify-keep-going/subversion/libsvn_client/ra.c
subversion/branches/verify-keep-going/subversion/libsvn_client/repos_diff.c
subversion/branches/verify-keep-going/subversion/libsvn_client/status.c
subversion/branches/verify-keep-going/subversion/libsvn_client/switch.c
subversion/branches/verify-keep-going/subversion/libsvn_client/update.c
subversion/branches/verify-keep-going/subversion/libsvn_delta/compose_delta.c
subversion/branches/verify-keep-going/subversion/libsvn_delta/editor.c
subversion/branches/verify-keep-going/subversion/libsvn_delta/path_driver.c
subversion/branches/verify-keep-going/subversion/libsvn_delta/svndiff.c
subversion/branches/verify-keep-going/subversion/libsvn_delta/text_delta.c
subversion/branches/verify-keep-going/subversion/libsvn_diff/diff_file.c
subversion/branches/verify-keep-going/subversion/libsvn_diff/diff_memory.c
subversion/branches/verify-keep-going/subversion/libsvn_diff/parse-diff.c
subversion/branches/verify-keep-going/subversion/libsvn_fs/fs-loader.c
subversion/branches/verify-keep-going/subversion/libsvn_fs/fs-loader.h
subversion/branches/verify-keep-going/subversion/libsvn_fs_base/fs.c
subversion/branches/verify-keep-going/subversion/libsvn_fs_fs/caching.c
subversion/branches/verify-keep-going/subversion/libsvn_fs_fs/fs.c
subversion/branches/verify-keep-going/subversion/libsvn_fs_fs/fs.h
subversion/branches/verify-keep-going/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/verify-keep-going/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/verify-keep-going/subversion/libsvn_fs_fs/tree.c
subversion/branches/verify-keep-going/subversion/libsvn_ra/editor.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_local/split_url.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_serf/commit.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/verify-keep-going/subversion/libsvn_ra_serf/serf.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_serf/update.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_serf/util.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_serf/xml.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_svn/client.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_svn/cram.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_svn/editorp.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_svn/internal_auth.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_svn/marshal.c
subversion/branches/verify-keep-going/subversion/libsvn_ra_svn/protocol
subversion/branches/verify-keep-going/subversion/libsvn_repos/authz.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/commit.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/delta.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/fs-wrap.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/hooks.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/log.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/replay.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/reporter.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/repos.c
subversion/branches/verify-keep-going/subversion/libsvn_repos/repos.h
subversion/branches/verify-keep-going/subversion/libsvn_repos/rev_hunt.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/ (props changed)
subversion/branches/verify-keep-going/subversion/libsvn_subr/adler32.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/auth.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/auth.h
subversion/branches/verify-keep-going/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/cache-memcache.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/cache.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/cache.h
subversion/branches/verify-keep-going/subversion/libsvn_subr/cmdline.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/compat.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/config.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/config_auth.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/config_file.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/config_impl.h
subversion/branches/verify-keep-going/subversion/libsvn_subr/deprecated.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/dirent_uri.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/eol.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/error.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/hash.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/io.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/mergeinfo.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/nls.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/path.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/prompt.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/pseudo_md5.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/simple_providers.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/sqlite.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/sqlite3wrapper.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/ssl_client_cert_providers.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/ssl_server_trust_providers.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/stream.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/string.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/subst.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/temp_serializer.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/types.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf_validate.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/utf_width.c
subversion/branches/verify-keep-going/subversion/libsvn_subr/version.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/adm_crawler.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/adm_ops.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/conflicts.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/conflicts.h
subversion/branches/verify-keep-going/subversion/libsvn_wc/copy.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/diff_editor.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/diff_local.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/entries.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/merge.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/props.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/questions.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/status.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/translate.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/update_editor.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/upgrade.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/verify-keep-going/subversion/libsvn_wc/wc.h
subversion/branches/verify-keep-going/subversion/libsvn_wc/wc_db.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/wc_db.h
subversion/branches/verify-keep-going/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/wc_db_private.h
subversion/branches/verify-keep-going/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/workqueue.c
subversion/branches/verify-keep-going/subversion/libsvn_wc/workqueue.h
subversion/branches/verify-keep-going/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/activity.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/dav_svn.h
subversion/branches/verify-keep-going/subversion/mod_dav_svn/liveprops.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/lock.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/posts/create_txn.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/reports/inherited-props.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/reports/replay.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/reports/update.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/repos.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/util.c
subversion/branches/verify-keep-going/subversion/mod_dav_svn/version.c
subversion/branches/verify-keep-going/subversion/po/de.po
subversion/branches/verify-keep-going/subversion/po/sv.po
subversion/branches/verify-keep-going/subversion/svn/cl-conflicts.c
subversion/branches/verify-keep-going/subversion/svn/cl-conflicts.h
subversion/branches/verify-keep-going/subversion/svn/cl.h
subversion/branches/verify-keep-going/subversion/svn/conflict-callbacks.c
subversion/branches/verify-keep-going/subversion/svn/copy-cmd.c
subversion/branches/verify-keep-going/subversion/svn/diff-cmd.c
subversion/branches/verify-keep-going/subversion/svn/file-merge.c
subversion/branches/verify-keep-going/subversion/svn/info-cmd.c
subversion/branches/verify-keep-going/subversion/svn/list-cmd.c
subversion/branches/verify-keep-going/subversion/svn/log-cmd.c
subversion/branches/verify-keep-going/subversion/svn/merge-cmd.c
subversion/branches/verify-keep-going/subversion/svn/mergeinfo-cmd.c
subversion/branches/verify-keep-going/subversion/svn/notify.c
subversion/branches/verify-keep-going/subversion/svn/propedit-cmd.c
subversion/branches/verify-keep-going/subversion/svn/props.c
subversion/branches/verify-keep-going/subversion/svn/propset-cmd.c
subversion/branches/verify-keep-going/subversion/svn/resolve-cmd.c
subversion/branches/verify-keep-going/subversion/svn/svn.c
subversion/branches/verify-keep-going/subversion/svn/util.c
subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
subversion/branches/verify-keep-going/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/verify-keep-going/subversion/svnlook/svnlook.c
subversion/branches/verify-keep-going/subversion/svnmucc/svnmucc.c
subversion/branches/verify-keep-going/subversion/svnrdump/dump_editor.c
subversion/branches/verify-keep-going/subversion/svnrdump/load_editor.c
subversion/branches/verify-keep-going/subversion/svnrdump/svnrdump.c
subversion/branches/verify-keep-going/subversion/svnserve/cyrus_auth.c
subversion/branches/verify-keep-going/subversion/svnserve/serve.c
subversion/branches/verify-keep-going/subversion/svnserve/server.h
subversion/branches/verify-keep-going/subversion/svnserve/svnserve.c
subversion/branches/verify-keep-going/subversion/tests/cmdline/authz_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/autoprop_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/basic_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/blame_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/cat_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/commit_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/copy_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/depth_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/diff_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/export_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/externals_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/import_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/info_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/iprop_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/lock_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/log_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/merge_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/move_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/patch_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/prop_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/revert_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/stat_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnauthz_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/svneditor.bat
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/svntest/actions.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/svntest/main.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/update_tests.py
subversion/branches/verify-keep-going/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/verify-keep-going/subversion/tests/libsvn_client/client-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_delta/random-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_delta/range-index-test.h
subversion/branches/verify-keep-going/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/ (props changed)
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/auth-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/cache-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/checksum-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/compat-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/config-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/config-test.cfg
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/error-code-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/error-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/path-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/revision-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/string-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/subst_translate-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_subr/utf-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_wc/db-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/verify-keep-going/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/branches/verify-keep-going/subversion/tests/svn_test.h
subversion/branches/verify-keep-going/tools/buildbot/slaves/bb-openbsd/svnclean.sh
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-xp-VS2005/config.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat
subversion/branches/verify-keep-going/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat
subversion/branches/verify-keep-going/tools/client-side/svn-bench/null-export-cmd.c
subversion/branches/verify-keep-going/tools/client-side/svn-bench/null-log-cmd.c
subversion/branches/verify-keep-going/tools/client-side/svn-bench/svn-bench.c
subversion/branches/verify-keep-going/tools/dev/aprerr.txt
subversion/branches/verify-keep-going/tools/dev/benchmarks/suite1/benchmark.py
subversion/branches/verify-keep-going/tools/dev/fsfs-access-map.c
subversion/branches/verify-keep-going/tools/dev/fsfs-reorg.c
subversion/branches/verify-keep-going/tools/dev/unix-build/Makefile.svn
subversion/branches/verify-keep-going/tools/dev/which-error.py
subversion/branches/verify-keep-going/tools/dist/_gnupg.py
subversion/branches/verify-keep-going/tools/dist/backport.pl
subversion/branches/verify-keep-going/tools/dist/make-deps-tarball.sh (contents, props changed)
subversion/branches/verify-keep-going/tools/dist/release.py
subversion/branches/verify-keep-going/tools/hook-scripts/control-chars.py
subversion/branches/verify-keep-going/tools/hook-scripts/mailer/mailer.py
subversion/branches/verify-keep-going/tools/hook-scripts/validate-files.py
subversion/branches/verify-keep-going/tools/server-side/fsfs-stats.c
subversion/branches/verify-keep-going/tools/server-side/mod_dontdothat/mod_dontdothat.c
subversion/branches/verify-keep-going/tools/server-side/svnauthz.c
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/commit-hook.py
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/irkerbridge.py
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/svnpubsub/client.py
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/svnpubsub/server.py
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/svntweet.py
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/svnwcsub.py
subversion/branches/verify-keep-going/tools/server-side/svnpubsub/watcher.py
subversion/branches/verify-keep-going/win-tests.py
Propchange: subversion/branches/verify-keep-going/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 5 09:22:43 2013
@@ -52,3 +52,4 @@ serf
gtest
.git
.gitignore
+compile_commands.json
Propchange: subversion/branches/verify-keep-going/
------------------------------------------------------------------------------
Merged /subversion/branches/wc-collate-path:r1402685-1407641,1407643-1480384
Merged /subversion/trunk:r1465587-1488969
Merged /subversion/branches/cache-server:r1458643-1476567
Modified: subversion/branches/verify-keep-going/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/CHANGES?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/CHANGES (original)
+++ subversion/branches/verify-keep-going/CHANGES Wed Jun 5 09:22:43 2013
@@ -1,71 +1,410 @@
-Version 1.8.0
-(?? ??? 2011, from /branches/1.8.x)
-http://svn.apache.org/repos/asf/subversion/tags/1.8.0
+Version 1.9.0
+(?? ??? 20??, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.0
User-visible changes:
- General:
- *
- Major new features:
- * inheritable properties (r1395109)
- * GPG agent support. (r1151069)
- * fsfs: Packing of revision property shards (issue #3944)
- * explicit handling of local moves/renames (issue #3631, #4232)
- * new more detailed conflict storage
- * use svn_ra_serf as our new http library.
- * automatic merge avoids explicit reintegration merges.
- Minor new features and improvements:
- * new 'svnadmin load --revision' load filtering support (issue #3734)
+ * new 'diff-ignore-content-type' runtime configuration option.
+
+ - Client-side bugfixes:
+
+ - Server-side bugfixes:
+
+ - Other tool improvements and bugfixes:
+
+ Developer-visible changes:
+ - General:
+
+ - API changes:
+
+ - Bindings:
+
+
+Version 1.8.0
+(18 Jun 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.0
+
+ User-visible changes:
+ - General:
+ * require serf as client-side http library (neon support removed) (r1349694)
+ * deprecate the Berkeley DB FS backend (libsvn_fs_base) (r1464985 et al)
+
+ - Major new features:
+ * working copy records moves as first-class operation (issue #3631, #4232)
+ * merge uses reintegrate mode automatically when needed (r1369896 et al)
+ * FSFS: Packing of revision property shards (issue #3944)
+ * support inheritable properties (r1395109)
+ * repository can suggest config for autoprops and ignores (r1401908)
+ * support gpg-agent for password caching (r1151069)
+ * authz rules can be stored inside the repository (r1424780)
+
+ - Minor new features and improvements (client-side):
+ * doubled svn:// protocol throughput (r1325899)
+ * optimize file/dir truename checks on Windows (r1435527)
* new 'commit --include-externals' option (related to issues #1167, #3563)
- * new '--include-externals' option for 'svn list' (issue #4225)
+ * new --include-externals option for 'svn list' (issue #4225)
* 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)
- * 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 --ignore-properties option for 'svn diff' (r1239553, -617)
* new --properties-only option for 'svn diff' (r1336110)
* new --patch-compatible option for 'svn diff' (r1239561)
* new --no-diff-added option for 'svn diff' (r1433958)
- * new SvnPubSub distributed commit hooks (tools/server-side/svnpubsub)
+ * new w/c subtree duplication tool (tools/client-side/detach.py)
+ * new mergeinfo fixup tool (tools/client-side/mergeinfo-sanitizer.py)
* '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)
* 'svn mergeinfo' now shows a summary graph by default (issue #4239)
* new --search and --search-and options for 'svn log' (r1354666, -83518)
+ * 'svn log' reports the node kind even for pre-1.6 revision files (r1242958)
+ * sort path list generated by "svn log -v --xml" (r1299323)
* new built-in interactive text conflict merge tool (r1357864, et al)
- * new 'svn --version --verbose' option shows runtime environment info
+ * 'svn --version' shows build system info (r1368662)
+ * 'svn --version --verbose' shows runtime environment info (r1370813 et al)
+ * 'svn' is now non-interactive when not run in a terminal device (r1424037)
+ * 'svn propset' checks spelling of reserved property names (r1470781)
+ * improve working copy performance on network disks (issue #4176)
+ * support for custom keyword definitions in svn:keywords (issue #890)
+ * svn:ignore __pycache__ directories by default (r1150073)
+ * 'svn diff --git' include copyfrom revision in "copied" headers (r1155279)
+ * svn:mergeinfo related operations now use much less memory (r1149519 et al)
+ * get list of supported schemes for RA libraries (r1148134)
+ * 'svn checkout' skips file externals from other repositories (r1153110)
+ * 'svn resolve' exits non-zero if conflicts could not be resolved (r1150439)
+ * let HTTPv2-aware clients fetch v2-style resources (r1161202)
+ * 'svn status' with better NLS support (r1157537, -682)
+ * better tracking of shallow-yet-complete merges (issues #4056, #4057)
+ * make 'svn status --quiet' w/ externals quieter still (issue #1935)
+ * ensure that conflict paths are shown relative-ized (r1337520)
+ * improve performance of local multi-target deletions (r1195873)
+ * various interactive conflict resolver improvements in 'svn' (r1440421 etc)
+ * improved tree diff implementation for diff and merge (r1440599 et al)
+ * tree conflicts on directories detected better during merges (issue #3150)
+ * allow reverting unmodified copies with 'svn remove' (r1442611)
+ * make 'svn diff' with mixed URL and local path targets work (r1442640)
+ * make 'svn patch' re-add deleted directories if needed (r1445333)
+ * make repos-wc diffs fully ancestry-aware (r1445904)
+ * 'svn diff --git' now implies 'svn diff --show-copies-as-adds' (r1446279)
+ * 'svn diff --show-copies-as-adds' now implies --notice-ancestry (r1446279)
+ * improved tree-conflict detection for 'svn switch' (r1449413, r1450582)
+ * allow up to 8 revision number digits in 'svn status -v' output (r1428637)
+ * show node kind (file or dir) in tree conflict descriptions (r1429907)
+ * restore deleted switched paths upon next update (issue #4295)
+ * add support for copying paths from foreign repositories (issue #3590)
+ * fix merge -cA,B with --accept option aborts if rA conflicts (issue #4238)
+ * 'svn resolve' interactive support; no longer requires --accept (r1336929)
+ * notify when removing externals leaves behind modified files (r1366021)
+ * new 'http-max-connections' configuration option for serf (r1421559)
+ * new 'http-bulk-updates' configuration option for serf (r1421490)
+ * 'svn cleanup' now runs SQLite "vacuum" to reclaim space (r1418459)
+ * 'svn info' displays repository-relative URL (r1415365)
+ * fix serf memory leak on checkout (issue #4194)
+ * detect duplicate paths setting svn:externals (issue #4227)
+ * make ra_serf work over HTTP/1.0 proxies (issue #3979)
+ * make ra_serf accept gzip compression for all responses (r1407454)
+ * double ra_serf performance for checkout and export (r1407545)
+ * improve network and disk i/o interleaving in ra_serf (r1407934)
+ * avoid assert in ra_serf when REPORT response was truncated (r1407935)
+ * rewrite ra_serf XML parser (r1409259 et al)
+ * ra_serf can create transaction with inline txnprops (r1375167)
+ * partially fix replace+propset of locked file fails over DAV (issue #3674)
+ * fix ra_serf doesn't handle bad baseline error from server (issue #4127)
+ * decreased default http timeout for ra_serf (issue #3968)
+ * prevent ra_serf from corrupting the working copy (issue #3993)
+ * ra_serf transmits property changes inline to reduce requests (r1378927)
+ * allow client to avoid SSL certificate prompts (issue #2410)
+ * improve interactive resolution of property conflicts (r1387678 et al)
+ * make ra_serf raise an error upon delta-base mismatch (issue #4235)
+ * tune ra_svn transmit buffer handling (r1391788)
+ * make 'svnrdump' work with serf (issue #4116)
+ * fix 'svnrdump' on path below repository root (issue #4101)
+ * support ipv6 in URLs (e.g. http://[::1]/svn/repos) (r1454047)
+ * conflict resolver now iterates paths in a sorted order (r1461820)
+ * mod_dav_svn does keyword expansion with 'kw=1' query arg (r1466055)
+ * add support for custom keyword definitions (issue #890)
+
+ - Minor new features and improvements (server-side):
+ * improve performance of config file parsing (r1344347 et al)
+ * new 'svnadmin load --revision' load filtering support (issue #3734)
+ * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
+ * 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 SvnPubSub distributed commit hooks (tools/server-side/svnpubsub)
+ * new light-weight benchmarking client (tools/client-side/svn-bench)
+ * svndumpfilter dependency analysis (tools/server-side/svnpredumpfilter.py)
+ * new automatic working copy updater (tools/server-side/svnpubsub)
* new 'svnadmin freeze' subcommand (r1376228)
* 'svndumpfilter' now supports --delta dumpfiles (r1351009, -3745)
- * new '--drop-all-emtpy-revs' option for 'svndumpfilter' (issue #3681)
+ * new --drop-all-emtpy-revs option for 'svndumpfilter' (issue #3681)
* client version info now reported to commit hooks (issue #4124)
- * 'svn merge' now uses reintegrate mode automatically when needed
- * 'svn' is now non-interactive when not run in a terminal device (r1424037)
- * 'svn propset' checks spelling of reserved property names.
- * improve working copy performance on network disks (issue #4176)
- * repos suggested config via svn:auto-props and svn:global-ignores (r1401908)
+ * txn name now reported to post-commit hooks (r1240856)
+ * support for server-side keyword expansion in mod_dav_svn (r1466055)
+ * FSFS now able to cache revision properties (r1326307)
+ * FSFS cache for changed-paths increases 'svn log' performance (r1378358)
+ * FSFS cache mergeinfo requested during 'log -g' (r1395439)
+ * many FSFS caching improvements (r1390435, r1390447)
+ * directory and property deltification option in FSFS (issue #4084)
+ * fine-grained control deltification behavior via fsfs.conf (r1311476)
+ * FSFS de-duplication ("rep sharing") now works within a revision (r1397773)
+ * FSFS de-duplication now works for properties as well (r1243312)
+ * read FSFS data using fewer fopen calls (issue #3372)
+ * 'svnadmin verify' will now check meta data (issues #3956, #4211)
+ * 'svnadmin verify' now checks for issue #4129 style corruption (r1304656)
+ * new --client-speed option for svnserve (r1391788)
+ * new --single-threaded option in svnserve (r1296018)
+ * hook script templates are now marked as executable (r1153414)
+ * error out on non-canonical fspaths in the authz file (r1166111)
+ * improve path lookup performance in FSFS (r1442088)
+ * svnserve now logs explicit path and reason for authz failures (r1446542)
+ * validate offsets from rep-cache to prevent FSFS corruption (issue #4277)
+ * new AuthzSVNGroupsFile option to store authz groups separately (r1438407)
+ * new 'SVNAllowBulkUpdates prefer' option for mod_dav_svn (r1417642, et al)
+ * new 'SVNMasterVersion' option for mod_dav_svn (r1398962)
+ * added virtual-host support to 'svnserve' (r1401296)
+ * new fsfs-stats tool which prints FSFS repository stats (r1410995)
+ * new fsfs-reorg tool to optimize FSFS packing (r1383214, r1385395)
+ * new --compatible-version option for 'svnadmin create' (r1407279 )
+ * new --ignore-properties option for 'svnlook diff' (r1407905)
+ * new --properties-only option for 'svnlook diff' (r1407905)
+ * new --diff-cmd option for 'svnlook diff' (r1413449)
+ * allow leading "r"'s in http: ?p= and ?r= query parameters (r1221463)
+ * faster 'svn ls' for large directories (r1296627)
+ * mod_dav_svn now advertises supported POST types (r1375123)
+ * mod_dav_svn can create transaction with inline txnprops (r1375167)
+ * run start-commit hook after transaction creation (r1376201)
+ * avoid byte-for-byte comparison where it can be avoided (r1390641)
+ * various server-side performance improvements for 'log -g' (r1395442 et al)
+ * allow up to 10Gbit throughput with svnserve (r1391788)
+ * install mod_dontdothat correctly (r1454450)
+ * svnadmin verify can now verify transactions (r1462353)
+ * FSFS verifies revisions as they are added (r1462409)
- Client-side bugfixes:
- *
+ * fix inconsistent 'svn log' output for empty revisions (issue #3964)
+ * fix mis-ordered text output of 'svn log --diff' on Windows (r1220783)
+ * fix 'svn log --diff' on moved file (issue #4153).
+ * fix 'svn revert' of 'svn move' (issue #876)
+ * fix file externals wrongly "resurrecting" a deleted file (#4017)
+ * fix reporting of corrupted 1.6 w/cs by 'svn upgrade' (r1182904, -9)
+ * fix bug caused by URI-decoding local merge source paths (r1210539)
+ * fix properties out of sync with repos after merge and revert (issue #4305)
+ * fix merge of replacement on local delete fails (issue #4011)
+ * fix replacements on deletes produce wrong tree conflicts (issue #3806)
+ * made ra_serf handle location headers that are not RFC-compliant (r1443906)
+ * merge no longer errors out after resolving all conflicts (issue #4316)
+ * fix svn blame mis-categorizing file type as binary (issue #2089)
+ * fix externals not removed when working copy is made shallow (issue #3741)
+ * fix update under add with not-present parent (issue #4111)
+ * fix revert of files with svn:needs-lock under copied dirs (r1343168)
+ * fix repos->wc diff of local copied/moved-here directories (r1341927)
+ * fix repos->wc diff of local copied/moved-here files (r1341544)
+ * fix "svn diff -cN PATH" where PATH was deleted in rN (r1338708)
+ * fix dependency on APR hash order in several logic paths (r1338350 et al)
+ * fix path inconsistencies in 'svn diff' output (r1338291)
+ * fix misleading error message printed by 'svn switch' (issue #2337)
+ * fix bug in mergeinfo recording during foreign-repos merge (r1430310)
+ * fix spurious merge conflicts for binary files with keywords (issue #4221)
+ * fix patching symlinks with 'svn patch' (issue #4273)
+ * make 'svn switch' refresh lock information (issue #3376)
+ * fix 'svn diff' output doesn't apply as patch without fuzz (issue #3362)
+ * fix mergeinfo recording for multiple-revision-range merge (issue #4306)
+ * fix diffs shown by 'show-diff' conflict prompt option (r1438879)
+ * don't print an update summary header with no content (r1439480)
+ * make 'svn rm' remove externals registrations below its targets (r1361256)
+ * fix crashes in ra_serf where AVG 2012 Surf-Shield is in use (issue #4175)
+ * don't raise conflicts on identical binary files (issue #4128)
+ * improve error messages when wc.db missing (issue #4118)
+ * fix 'svn diff' showing wrong text change (issue #4270)
+ * fix 'svn diff -rN' failing to show local replace (issue #3797)
+ * fix 'svn diff' showing wrong revision (issue #4010)
+ * fix 'svn merge' showing spurious notifications (issue #2910)
+ * parse '.@HEAD' correctly (issue #3606)
+ * fix 'svn revert' after conflict in sparse working copy (issue #4168)
+ * fix bug in global/per-server config handling in serf (r1421516)
+ * properly display errors from serf (r1398742)
+ * fix crash in ra_serf (r1408291)
+ * fixed svnmucc propset and propdel on repository root (issue #3663)
+ * fix 'svn info' output with ancient svnserve servers (pre-1.2) (r1409732)
+ * ra_serf shows error message for 408 Request Timeout response (r1410983)
+ * fix handling of "\ No newline ..." in diff/patch (r1411723, r1412382)
+ * allow infinite http timeout in ra_serf (r1411976)
+ * using unknown svn: property names now requires --force (issue #4261)
+ * fix handling of case insensitive configuration files (r1215089)
+ * properly handle errors during password caching (r1380695)
+ * fix svnversion output not always a number (issue #4226)
+ * fix conflict resolver losing executable bit of a file (r1391019)
+ * fix redundant notifications when merging with ra_serf (issue #3802)
+ * fix 'svn add --force /path/to/wcroot' should work (issue #4241)
+ * fix file permissions changed after commit (issue #4331)
+ * improve handling of http errors in ra_serf (1452792, 1452870)
+ * include checksum of missing pristines in error message (r1452800)
+ * fix an assert when merging against a replaced source (issue #4132)
+ * fix replacement in merge source has incorrect notification (issue #4138)
+ * improve performance of checkout (r1453791)
+ * fixed documentation regarding merge source (issue #3247)
+ * fix merge errors out after resolving conflicts (issue #4316)
+ * fix delete/move with file external in unversioned dir (issue #4293)
+ * fix resolving tree conflict with local node missing (r1461848)
+ * fix invalid read during diff suffix scanning (issue #4339)
+ * fix assertion when running 'svn log <SOME_URL>@PREV' (r1462134)
+ * optimize enumerating configuration options (r1464478)
+ * revert will now sleep for timestamps if using commit times (r1464769)
+ * don't allow externals to be deleted with 'svn rm' (r1464992)
+ * improved memory usage in ra_serf and ra_local (r1465280)
+ * replace some assertions with more helpful error messages (r1465975)
+ * fixed long keyword expansion truncated (issue #4349)
- Server-side bugfixes:
* SVNParentPath / repository listing now authz-filtered (r1408184)
+ * user/group names in the authz config file are case-sensitive (r1475772)
+ * limit commit runtime for nodes with very deep histories (r1224836)
+ * 'svnadmin recover' truncates rep-cache at the right point (issue #4077)
+ * fix crashes in dumpstream loading with skipped revs (r1214202, r1214216)
+ * fix 'svn log -g' incorrectly treating rename as merge (issue #4022)
+ * fix bug where fsfs file-hinting fails (issue #4320)
+ * don't leak path of repository on server's disk to clients (r1330906)
+ * remove spurious is-fresh-txn-root from empty revision files (issue #4031)
+ * fix a stdout handling problem in 'svnlook diff' (r1411971)
+ * fix erratic behaviour in 'svnlook diff' showing property diffs (r1412224)
+ * fix inconsistent authz error messages in 'svn log' in svnserve (r1292462)
+ * fix svndumpfilter for empty paths in included or excluded lists (r1294583)
+ * make fsfs packing threadsafe (r1376011)
+ * don't error out on intermittent memcached failures (r1394470)
+ * fix a ra_svn deadlock with zero-copy server option (r1465622)
- Other tool improvements and bugfixes:
- * 'svnmucc' promoted to first-class supported utility (issue #3308)
+ * 'svnmucc' promoted to first-class supported utility (issue #3308, #4279)
+ * make 'svnmucc' prompt for log messages (issue #3418)
+ * rename 'svnauthz-validate' to 'svnauthz' (issue #4284)
+ * make 'svnauthz' optionally validate user/path access (r1197588)
+ * fix mailer.py test suite problems (r1449582)
+ * fix mailer.py not showing dirs with property deletions (r1449582)
+ * make mailer.py generate Date and Message-ID headers (r1449592)
+ * new '-?' option support for 'svnmucc' (r1339428)
+ * provide the repository name to mailer.py (r1439592)
+ * add '--force-interactive' to svnmucc (r1457789)
+ * add '--trust-server-cert' to svnmucc (r1458995)
Developer-visible changes:
- General:
- * Now require Python 2.5 for tests and dev tools (r1243627)
+ * now require Python 2.5 for tests and dev tools (r1243627)
+ * now require bzip2 for tests and dev tools (r1148512)
+ * configure defaults to --without-apache-libexecdir (r1469862)
+ * support builds with APR pool debugging (r1176894)
+ * 'make extraclean' is more thorough now (r1149460)
+ * support for Serf 2 (r1147538)
+ * introduction of editor v2 (via private APIs only) (r1166332 et al)
+ * improve SQLite setup for compatibility with OS X 10.7. (r1181666)
+ * rework switch statement to accomodate OWC compiler limitations (r1204407)
+ * new --enable-sqlite-compatibility-version configure option (r1201421)
+ * make test suite LD_LIBRARY_PATH include just-built auth plugins (r1200474)
+ * packages/ directory removed, contents were outdated and unused (r1442167)
+ * rename 'makefile.ezt' to 'build-outputs.mk.ezt' (r1444822)
+ * use expensive compiler optimizations with --enable-optimize (r1445063)
+ * in Visual C++ builds, move temp files to different directory (r1446416)
+ * remove --with-ssl and --with-gssapi configure options (r1449023)
+ * require at least serf 1.2.0 as build dependency (issue #4296)
+ * fix error tracing to record file/line properly (r1331242)
+ * add --log-level argument to win-tests.py (r1335461)
+ * improve GDB pretty-printing of svn types (r1351336, r1364750, r1365035)
+ * load third-party FS modules (if --enable-runtime-module-search) (r1362434)
+ * enable running the regression tests over https (r1349699)
+ * support 'make davautocheck' on OS X (r1421583)
+ * new '--enable-gcov' configure option (r1416646)
+ * fix build with Apache HTTPD 2.5 (r1408985)
+ * allow running the test suite through a http proxy (r1410195)
+ * don't use non-constant initializers in struct variables (r1412911)
+ * allow generation of Visual Studio 2012 compatible projects (r1245152)
+ * nicer pretty-printing of Subversion data types in gdb (r1367262 et al)
+ * teach serf build on Windows to use static APR/Util and OpenSSL (r1371338)
+ * add --ssl-cert option to win-tests.py to run tests over https (r1372760)
+ * don't strip Content-Type header form .po files on Windows (r1380056)
+ * configure now script auto-detects GNOME keyring (r1387230)
+ * allow configure to detect BDB on Debian-based Linux distros (r1390633)
+ * auto-detect serf via pkg-config (r1391662)
+ * improve queries for compatability with SQLite 3.7.16 (r1455239)
+ * remove support for in-tree apr, apr-util and apr-memcache (r1456924)
+ * FSFS caching supports prefixes now (r1462436)
+ * maintainer mode now prints symbolic error codes (r1465157)
+ * don't require NLS support for kwallet support (r1466445)
+ * make Julian happy (r1413030)
- API changes:
* fix inconsistent handling of log revs without changed paths (issue #3694)
+ * deprecated SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA (r1173240)
+ * provide API to clear cached auth credentials (issue #2775)
+ * improve repository location information in various APIs (issue #4170)
+ * major rewrite of conflict storage and handling APIs (r1354973 et al)
+ * hide (deprecate) svn_wc APIs that use editors (r1243339)
+ * svn_stringbuf_ensure() allocates an extra byte for terminator (r1308966)
+ * switch and update apis are now more consistent (r1465292)
+ * deprecated svn_client_merge_reintegrate (r1466742)
+ * deprecated low level ra_svn apis (r1466907)
- Bindings:
* star-imports in swig-py only import 'svn_*' symbols (r1303375)
+ * fix compilation of Perl bindings on Mandriva 2007 (issue #2617)
+ * new JavaHL testing targets (r1182983)
+ * enable returning an error on malfunctions for JavaHL (r1366215)
+ * MacOS X build fix to cope with missing GNOME keyring (r1397844)
+ * fix swig bindings tests on MacOS X (r1397846)
+ * fix assertion failure in JavaHL error reporting (r1405922)
+ * support ruby 1.9 (r1407206)
+ * JavaHL: Include OSGI Manifest information in svn-javahl.jar (r1234864)
+ * new svn_auth_set_gnome_keyring_unlock_prompt_func function (r1241554)
+ * fix svn_txdelta window ops for python bindings (r1389054)
+ * fix build of Perl bindings with newer versions of SWIG (r1389658)
+ * add missing API functions to Perl bindings (issue #2646)
+ * add missing API functions to Python bindings (r1392038 et al)
+ * add missing API functions to JavaHL bindings (issue #4326)
+ * fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
+
+
+Version 1.7.11
+(?? ??? 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.11
+
+ User-visible changes:
+ - Other tool improvements and bugfixes:
+ * fix argument processing in contrib hook scripts (r1485350)
+
+
+Version 1.7.10
+(30 May 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.10
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * fix 'svn revert' "no such table: revert_list" spurious error (issue #4168)
+ * fix 'svn diff' doesn't show some locally added files (issue #3797)
+ * fix changelist filtering when --changelist values aren't UTF8 (r1475724)
+ * fix 'svn diff --git' shows wrong copyfrom (issue #4294)
+ * fix 'svn diff -x-w' shows wrong changes (issues #4133 and #4270, r1427278)
+ * fix 'svn blame' sometimes shows every line as modified (issue #4034)
+ * fix regression in 'svn status -u' output for externals (r1434750)
+ * fix file permissions change on commit of file with keywords (issue #4331)
+ * improve some fatal error messages (r1465975)
+ * fix externals not removed when working copy is made shallow (issue #3741)
+
+ - Server-side bugfixes:
+ * fix FSFS repository corruption due to newline in filename (issue #4340)
+ * fix svnserve exiting when a client connection is aborted (r1482759)
+ * fix svnserve memory use after clear (issue #4365)
+ * fix repository corruption on power/disk failure on Windows (r1483781)
+
+ Developer-visible changes
+ - General:
+ * make get-deps.sh compatible with Solaris /bin/sh (r1451678)
+ * fix infinite recursion bug in get-deps.sh (r1421541, r1424977)
+ * fix uninitialised output parameter of svn_fs_commit_txn() (r1461743)
+
+ - Bindings:
+ * fix JavaHL thread-safety bug (r1476359)
Version 1.7.9
@@ -609,6 +948,23 @@ the 1.6 release: http://subversion.apac
* fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
+Version 1.6.23
+(30 May 2013, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.23
+
+ User-visible changes
+ - Server-side bugfixes:
+ * fix FSFS repository corruption due to newline in filename (issue #4340)
+ * fix svnserve exiting when a client connection is aborted (r1482759)
+
+ - Other tool improvements and bugfixes:
+ * fix argument processing in contrib hook scripts (r1485350)
+
+
+Version 1.6.22
+(Not released, see changes for 1.6.23.)
+
+
Version 1.6.21
(04 Apr 2013, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.21
Modified: subversion/branches/verify-keep-going/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/COMMITTERS?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/COMMITTERS [UTF-8] (original)
+++ subversion/branches/verify-keep-going/COMMITTERS [UTF-8] Wed Jun 5 09:22:43 2013
@@ -1,4 +1,4 @@
-The following people have commit access to the Subversion sources.
+The following people have commit access to the Subversion sources.
Note that this is not a full list of Subversion's authors, however --
for that, you'd need to look over the log messages to see all the
patch contributors.
@@ -96,6 +96,7 @@ Commit access for specific areas:
jrvernooij Jelmer Vernooij <je...@samba.org> (Python bindings)
sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python b.)
vmpn Vladimir Berezniker <vm...@hitechman.com> (JavaHL bindings)
+ rschupp Roderich Schupp <ro...@gmail.com> (Swig bindings)
Packages:
@@ -186,6 +187,7 @@ giorgio_valoti Giorgio Valoti <giorgio
IS BOUNCING]
fabien Fabien Coelho <fa...@coelho.net> (po: fr)
marcelg Marcel Gosselin <ma...@polymtl.ca> (po: fr)
+ mattiase Mattias Engdegård <ma...@acm.org> (po: sv)
Experimental branches:
Modified: subversion/branches/verify-keep-going/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/INSTALL?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/INSTALL (original)
+++ subversion/branches/verify-keep-going/INSTALL Wed Jun 5 09:22:43 2013
@@ -173,12 +173,13 @@ I. INTRODUCTION
'get-deps.sh', is available in the same directory as this file.
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.
+ distribution. With the exception of sqlite-amalgamation, they will
+ still need to be configured, built and installed explicitly, and
+ Subversion's own configure script may need to be told where to find
+ them, if they were not installed in standard system locations.
Note: there are optional dependencies (such as openssl, swig, and httpd)
- which get-deps.sh does not download and Subversion does not attempt to
- configure or build.
+ which get-deps.sh does not download.
Note: Because previous builds of Subversion may have installed older
versions of these libraries, you may want to run some of the cleanup
@@ -651,7 +652,7 @@ II. INSTALLATION
This script will make sure you have all the necessary components
available to build Subversion. If any are missing, you will be
- told where to get them from. (See the 'Build Requirements' in
+ told where to get them from. (See the 'Dependency Overview' in
section I.)
Note: if the command "autoconf" on your machine does not run
Modified: subversion/branches/verify-keep-going/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/Makefile.in?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/Makefile.in (original)
+++ subversion/branches/verify-keep-going/Makefile.in Wed Jun 5 09:22:43 2013
@@ -398,7 +398,6 @@ locale-gnu-po-update:
fast-clean: doc-clean
@list='$(BUILD_DIRS)'; for i in $$list; do \
if [ -d $$i ]; then \
- echo "Cleaning $$i ..." ; \
(cd $$i && rm -f *.o *.lo *.la *.la-a *.spo *.mo && \
rm -rf .libs); \
fi \
@@ -571,6 +570,15 @@ svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_
bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
@$(MAKE) check FS_TYPE=bdb
+# Produce the clang compilation database as the compile_commands.json file
+# in the srcdir. This is used by tools such as the YouCompleteMe vim plugin
+# to know the compile flags for various source files so that analysis such
+# as syntax checking, static analysis or symbol completion can be done
+# outside the build system. To do this it uses the tool called bear:
+# https://github.com/rizsotto/Bear
+compile-commands:
+ @bear -o $(abs_srcdir)/compile_commands.json -- $(MAKE) all
+
# Create an execution coverage report from the data collected during
# all execution since the last reset.
gcov:
@@ -588,8 +596,10 @@ gcov-clean:
find . -name "*.gcda" -o -name "*.gcno" -print0 | xargs -0 rm -f --
check-clean: gcov-clean
- find subversion/tests/cmdline/svn-test-work -mindepth 1 -maxdepth 1 \
+ if [ -d subversion/tests/cmdline/svn-test-work ]; then \
+ find subversion/tests/cmdline/svn-test-work -mindepth 1 -maxdepth 1 \
-print0 | xargs -0 rm -rf --; \
+ fi
rm -rf subversion/tests/libsvn_fs/test-repo-* \
subversion/tests/libsvn_fs_base/test-repo-* \
subversion/tests/libsvn_fs_fs/test-repo-* \
@@ -628,7 +638,7 @@ doc-api: mkdir-init
# Generate API documentation for the JavaHL package.
doc-javahl:
- $(JAVADOC) -d $(top_srcdir)/doc/javadoc \
+ $(JAVADOC) -d $(abs_builddir)/doc/javadoc \
-sourcepath $(top_srcdir)/subversion/bindings/javahl/src \
-link http://java.sun.com/javase/6/docs/api/ \
org.tigris.subversion.javahl \
@@ -880,10 +890,16 @@ check-ctypes-python: ctypes-python
cd $(CTYPES_PYTHON_SRC_DIR); \
$(LT_EXECUTE) $(PYTHON) test/run_all.py
+# If any of those files exists, run ctypes' 'setup.py clean'. We don't run
+# it otherwise because it spams stdout+stderr; see r1479326.
clean-ctypes-python:
- cd $(CTYPES_PYTHON_SRC_DIR); \
- $(PYTHON) setup.py clean --all
-
+ cd $(CTYPES_PYTHON_SRC_DIR); \
+ for b in build csvn/core/functions.py svn_all.py svn_all2.py ; do \
+ if [ -e "$$b" ] ; then \
+ $(PYTHON) setup.py clean --all; \
+ break; \
+ fi; \
+ done
# manually describe a dependency, which we won't otherwise detect
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql
Modified: subversion/branches/verify-keep-going/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/build.conf?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/build.conf (original)
+++ subversion/branches/verify-keep-going/build.conf Wed Jun 5 09:22:43 2013
@@ -40,6 +40,9 @@ private-includes =
subversion/libsvn_delta/compose_delta.c
subversion/bindings/cxxhl/include/*.hpp
subversion/bindings/cxxhl/include/svncxxhl/*.hpp
+ subversion/libsvn_subr/utf8proc/utf8proc.h
+ subversion/libsvn_subr/utf8proc/utf8proc.c.inline
+ subversion/libsvn_subr/utf8proc/utf8proc_data.c.inline
private-built-includes =
subversion/svn_private_config.h
subversion/libsvn_fs_fs/rep-cache-db.h
@@ -241,7 +244,7 @@ description = Subversion Repository File
type = lib
path = subversion/libsvn_fs
install = ramod-lib
-libs = libsvn_fs_util libsvn_subr fs-libs aprutil apr
+libs = libsvn_fs_util libsvn_delta libsvn_subr fs-libs aprutil apr
# conditionally add more dependencies
add-deps = $(SVN_FS_LIB_DEPS)
add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
@@ -381,7 +384,7 @@ type = apache-mod
path = tools/server-side/mod_dontdothat
nonlibs = mod_dav_svn apr aprutil
libs = libsvn_subr xml
-install = apache-mod
+install = tools
msvc-libs = libhttpd.lib
# ----------------------------------------------------------------------------
Modified: subversion/branches/verify-keep-going/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/build/ac-macros/apache.m4?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/build/ac-macros/apache.m4 (original)
+++ subversion/branches/verify-keep-going/build/ac-macros/apache.m4 Wed Jun 5 09:22:43 2013
@@ -120,23 +120,20 @@ fi
AC_ARG_WITH(apache-libexecdir,
[AS_HELP_STRING([[--with-apache-libexecdir[=PATH]]],
- [Install Apache modules to PATH instead of Apache's
- configured modules directory; PATH "no"
- or --without-apache-libexecdir means install
- to LIBEXECDIR.])],
-[
- APACHE_LIBEXECDIR="$withval"
-])
+ [Install Apache modules to Apache's configured
+ modules directory instead of LIBEXECDIR;
+ if PATH is given, install to PATH.])],
+[APACHE_LIBEXECDIR="$withval"],[APACHE_LIBEXECDIR='no'])
INSTALL_APACHE_MODS=false
if test -n "$APXS" && test "$APXS" != "no"; then
APXS_CC="`$APXS -q CC`"
APACHE_INCLUDES="$APACHE_INCLUDES -I$APXS_INCLUDE"
- if test -z "$APACHE_LIBEXECDIR"; then
- APACHE_LIBEXECDIR="`$APXS -q libexecdir`"
- elif test "$APACHE_LIBEXECDIR" = 'no'; then
+ if test "$APACHE_LIBEXECDIR" = 'no'; then
APACHE_LIBEXECDIR="$libexecdir"
+ elif test "$APACHE_LIBEXECDIR" = 'yes'; then
+ APACHE_LIBEXECDIR="`$APXS -q libexecdir`"
fi
BUILD_APACHE_RULE=apache-mod
Modified: subversion/branches/verify-keep-going/build/ac-macros/compiler.m4
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/build/ac-macros/compiler.m4?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/build/ac-macros/compiler.m4 (original)
+++ subversion/branches/verify-keep-going/build/ac-macros/compiler.m4 Wed Jun 5 09:22:43 2013
@@ -70,6 +70,9 @@ AC_DEFUN([SVN_CC_MODE_SETUP],
CFLAGS="$CFLAGS_KEEP"
AC_SUBST(CMODEFLAGS)
AC_SUBST(CMAINTAINERFLAGS)
+
+ dnl Tell clang to not accept unknown warning flags
+ SVN_CFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
])
@@ -86,4 +89,7 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
CXXFLAGS="$CXXFLAGS_KEEP"
AC_SUBST(CXXMODEFLAGS)
AC_SUBST(CXXMAINTAINERFLAGS)
+
+ dnl Tell clang++ to not accept unknown warning flags
+ SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
])
Modified: subversion/branches/verify-keep-going/build/ac-macros/kwallet.m4
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/build/ac-macros/kwallet.m4?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/build/ac-macros/kwallet.m4 (original)
+++ subversion/branches/verify-keep-going/build/ac-macros/kwallet.m4 Wed Jun 5 09:22:43 2013
@@ -35,73 +35,69 @@ AC_DEFUN(SVN_LIB_KWALLET,
AC_MSG_RESULT([yes])
if test "$svn_enable_shared" = "yes"; then
if test "$APR_HAS_DSO" = "yes"; then
- if test "$USE_NLS" = "yes"; then
- if test -n "$PKG_CONFIG"; then
- if test "$HAVE_DBUS" = "yes"; then
- AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
- if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
- AC_MSG_RESULT([yes])
- if test "$svn_lib_kwallet" != "yes"; then
- AC_MSG_CHECKING([for kde4-config])
- KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config"
- if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then
- AC_MSG_RESULT([yes])
- else
- KDE4_CONFIG=""
- AC_MSG_RESULT([no])
- fi
+ if test -n "$PKG_CONFIG"; then
+ if test "$HAVE_DBUS" = "yes"; then
+ AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
+ if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
+ AC_MSG_RESULT([yes])
+ if test "$svn_lib_kwallet" != "yes"; then
+ AC_MSG_CHECKING([for kde4-config])
+ KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config"
+ if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then
+ AC_MSG_RESULT([yes])
else
- AC_PATH_PROG(KDE4_CONFIG, kde4-config)
+ KDE4_CONFIG=""
+ AC_MSG_RESULT([no])
fi
- if test -n "$KDE4_CONFIG"; then
- AC_MSG_CHECKING([for KWallet])
- old_CXXFLAGS="$CXXFLAGS"
- old_LDFLAGS="$LDFLAGS"
- old_LIBS="$LIBS"
- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
- if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then
- CPPFLAGS="$CPPFLAGS $d"
- fi
- done
- qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
- kde_dir="`$KDE4_CONFIG --prefix`"
- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
- LIBS="$LIBS $SVN_KWALLET_LIBS"
- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
- kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
- AC_LANG(C++)
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
+ else
+ AC_PATH_PROG(KDE4_CONFIG, kde4-config)
+ fi
+ if test -n "$KDE4_CONFIG"; then
+ AC_MSG_CHECKING([for KWallet])
+ old_CXXFLAGS="$CXXFLAGS"
+ old_LDFLAGS="$LDFLAGS"
+ old_LIBS="$LIBS"
+ for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
+ if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then
+ CPPFLAGS="$CPPFLAGS $d"
+ fi
+ done
+ qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
+ kde_dir="`$KDE4_CONFIG --prefix`"
+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
+ qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
+ SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
+ CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
+ LIBS="$LIBS $SVN_KWALLET_LIBS"
+ qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
+ kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
+ LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
+ AC_LANG(C++)
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <kwallet.h>
int main()
{KWallet::Wallet::walletList();}]])], svn_lib_kwallet="yes", svn_lib_kwallet="no")
- AC_LANG(C)
- if test "$svn_lib_kwallet" = "yes"; then
- AC_MSG_RESULT([yes])
- CXXFLAGS="$old_CXXFLAGS"
- LIBS="$old_LIBS"
- else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot find KWallet])
- fi
+ AC_LANG(C)
+ if test "$svn_lib_kwallet" = "yes"; then
+ AC_MSG_RESULT([yes])
+ CXXFLAGS="$old_CXXFLAGS"
+ LIBS="$old_LIBS"
else
- AC_MSG_ERROR([cannot find kde4-config])
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([cannot find KWallet])
fi
else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
+ AC_MSG_ERROR([cannot find kde4-config])
fi
else
- AC_MSG_ERROR([cannot find D-Bus])
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
fi
else
- AC_MSG_ERROR([cannot find pkg-config])
+ AC_MSG_ERROR([cannot find D-Bus])
fi
else
- AC_MSG_ERROR([missing support for internationalization])
+ AC_MSG_ERROR([cannot find pkg-config])
fi
else
AC_MSG_ERROR([APR does not have support for DSOs])
Modified: subversion/branches/verify-keep-going/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/build/ac-macros/sqlite.m4?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/verify-keep-going/build/ac-macros/sqlite.m4 Wed Jun 5 09:22:43 2013
@@ -243,8 +243,8 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
echo ""
echo "get the sqlite ${SQLITE_RECOMMENDED_VER} amalgamation from:"
echo " ${SQLITE_URL}"
- echo "unpack the archive using tar/gunzip and rename the"
- echo "resulting directory to:"
+ echo "unpack the archive using unzip and rename the resulting"
+ echo "directory to:"
echo "$abs_srcdir/sqlite-amalgamation"
echo ""
AC_MSG_ERROR([Subversion requires SQLite])
Modified: subversion/branches/verify-keep-going/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/build/generator/gen_base.py?rev=1489765&r1=1489764&r2=1489765&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/build/generator/gen_base.py (original)
+++ subversion/branches/verify-keep-going/build/generator/gen_base.py Wed Jun 5 09:22:43 2013
@@ -239,6 +239,49 @@ class GeneratorBase:
except: pass
os.rename(new_hdrfile, hdrfile)
+ def write_errno_table(self):
+ # ### We generate errorcode.inc at autogen.sh time (here!).
+ # ###
+ # ### Currently it's only used by maintainer-mode builds. If this
+ # ### functionality ever moves to release builds, it will have to move
+ # ### to configure-time. (But then you have to solve two problems:
+ # ### what to do on windows, and what to do on unix when Python is not
+ # ### available at configure-time.)
+ import errno
+ fd = open('subversion/libsvn_subr/errorcode.inc', 'w')
+ fd.write('/* This file was generated by build/generator/gen_base.py */\n\n')
+
+ def write_struct(name, codes):
+ fd.write('static struct {\n'
+ ' int errcode;\n'
+ ' const char *errname;\n'
+ '} %s[] = {\n' % name)
+ for num, val in sorted(codes):
+ fd.write(' { %d, "%s" },\n' % (num, val))
+ # fd.seek(-2, os.SEEK_CUR); fd.write('\n');
+ fd.write('};\n')
+
+ write_struct('svn__errno', errno.errorcode.items())
+ fd.write('\n')
+
+ # Fetch and write apr_errno.h codes.
+ aprerr = []
+ for line in open(os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])),
+ 'tools', 'dev', 'aprerr.txt')):
+ # aprerr.txt parsing duplicated in which-error.py
+ if line.startswith('#'):
+ continue
+ key, _, val = line.split()
+ aprerr += [(int(val), key)]
+ write_struct('svn__apr_errno', aprerr)
+
+ ## sanity check
+ intersection = set(errno.errorcode.keys()) & set(dict(aprerr).keys())
+ if self.errno_filter(intersection):
+ print("WARNING: errno intersects APR error codes: %r" % intersection)
+
+ def errno_filter(self, codes):
+ return codes
class DependencyGraph:
"""Record dependencies between build items.
@@ -424,10 +467,9 @@ class TargetLinked(Target):
# the specified install area depends upon this target
self.gen_obj.graph.add(DT_INSTALL, self.install, self)
- sources = sorted(_collect_paths(self.sources or '*.c' or '*.cpp', self.path))
+ sources = sorted(_collect_paths(self.sources, self.path))
- for srcs, reldir in sources:
- for src in srcs.split(" "):
+ for src, reldir in sources:
if glob.glob(src):
if src[-2:] == '.c':
objname = src[:-2] + self.objext
@@ -907,10 +949,13 @@ def _collect_paths(pats, path=None):
path (string), if specified, is a path that will be prepended to each
glob pattern before it is evaluated
- If path is none the return value is a list of filenames, otherwise
+ If path is None the return value is a list of filenames, otherwise
the return value is a list of 2-tuples. The first element in each tuple
is a matching filename and the second element is the portion of the
glob pattern which matched the file before its last forward slash (/)
+
+ If no files are found matching a pattern, then include the pattern itself
+ as a filename in the results.
"""
result = [ ]
for base_pat in pats.split():
@@ -1100,7 +1145,10 @@ class IncludeDependencyInfo:
direct_possibility_fname = os.path.normpath(os.path.join(
os.path.dirname(fname), include_param))
domain_fnames = self._domain.get(os.path.basename(include_param), [])
- if direct_possibility_fname in domain_fnames:
+ if os.sep.join(['libsvn_subr', 'error.c']) in fname \
+ and 'errorcode.inc' == include_param:
+ continue # generated by GeneratorBase.write_errno_table
+ elif direct_possibility_fname in domain_fnames:
self._upd_dep_hash(hdrs, direct_possibility_fname, type_code)
elif (len(domain_fnames) == 1
and (include_param.find(os.sep) == -1
@@ -1133,9 +1181,10 @@ class IncludeDependencyInfo:
return hdrs
class FileInfo:
- def __init__(self, filename, when):
+ def __init__(self, filename, when, target=None):
self.filename = filename
self.when = when
+ self.target = target
def _sorted_files(graph, area):
"Given a list of targets, sort them based on their dependencies."
@@ -1173,9 +1222,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(FileInfo(d.filename, d.when))
+ files.append(FileInfo(d.filename, d.when, d))
else:
- files.append(FileInfo(t.filename, t.when))
+ files.append(FileInfo(t.filename, t.when, t))
# don't consider this target any more
targets.remove(t)