subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1481041 [1/38] - in /subversion/branches/master-passphrase: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ contrib/client-side/svncopy/ contrib/hook-scripts/ contrib/server-side/fsfsfixer/ contrib/server-side/fsfsfi...
Date Fri, 10 May 2013 14:58:56 GMT
Author: cmpilato
Date: Fri May 10 14:58:47 2013
New Revision: 1481041

URL: http://svn.apache.org/r1481041
Log:
Sync the 'master-passphrase' branch up with recent (and, uh, not-so-recent)
trunk changes.  (Merged /subversion/trunk:r1451629-1481020)

Added:
    subversion/branches/master-passphrase/.ycm_extra_conf.py
      - copied unchanged from r1481020, subversion/trunk/.ycm_extra_conf.py
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/DiffOptions.cpp
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/native/DiffOptions.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/DiffOptions.h
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/native/DiffOptions.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ReposFreezeAction.cpp
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/native/ReposFreezeAction.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ReposFreezeAction.h
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/native/ReposFreezeAction.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/VersionExtended.cpp
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/native/VersionExtended.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/VersionExtended.h
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/native/VersionExtended.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_VersionExtended.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InheritedProplistCallback.java
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InheritedProplistCallback.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposFreezeAction.java
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ReposFreezeAction.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DiffOptions.java
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DiffOptions.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
      - copied unchanged from r1481020, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
    subversion/branches/master-passphrase/subversion/include/private/svn_ra_svn_private.h
      - copied unchanged from r1481020, subversion/trunk/subversion/include/private/svn_ra_svn_private.h
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/deprecated.c
      - copied unchanged from r1481020, subversion/trunk/subversion/libsvn_ra_svn/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/utf8proc/
      - copied from r1481020, subversion/trunk/subversion/libsvn_subr/utf8proc/
    subversion/branches/master-passphrase/subversion/libsvn_subr/utf8proc.c
      - copied unchanged from r1481020, subversion/trunk/subversion/libsvn_subr/utf8proc.c
    subversion/branches/master-passphrase/subversion/svn/deprecated.c
      - copied unchanged from r1481020, subversion/trunk/subversion/svn/deprecated.c
    subversion/branches/master-passphrase/subversion/tests/cmdline/legacy/
      - copied from r1481020, subversion/trunk/subversion/tests/cmdline/legacy/
    subversion/branches/master-passphrase/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot.tar.bz2
      - copied unchanged from r1481020, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot.tar.bz2
    subversion/branches/master-passphrase/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2
      - copied unchanged from r1481020, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_nonroot1_6.tar.bz2
    subversion/branches/master-passphrase/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root.tar.bz2
      - copied unchanged from r1481020, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root.tar.bz2
    subversion/branches/master-passphrase/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.tar.bz2
      - copied unchanged from r1481020, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/iprops_upgrade_root1_6.tar.bz2
    subversion/branches/master-passphrase/subversion/tests/diacritical.txt
      - copied unchanged from r1481020, subversion/trunk/subversion/tests/diacritical.txt
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/error-code-test.c
      - copied unchanged from r1481020, subversion/trunk/subversion/tests/libsvn_subr/error-code-test.c
    subversion/branches/master-passphrase/tools/dev/build-svn-deps-win.pl
      - copied unchanged from r1481020, subversion/trunk/tools/dev/build-svn-deps-win.pl
    subversion/branches/master-passphrase/tools/dev/remove-trailing-whitespace.sh
      - copied unchanged from r1481020, subversion/trunk/tools/dev/remove-trailing-whitespace.sh
    subversion/branches/master-passphrase/tools/examples/walk-config-auth.py
      - copied unchanged from r1481020, subversion/trunk/tools/examples/walk-config-auth.py
    subversion/branches/master-passphrase/tools/hook-scripts/control-chars.py
      - copied unchanged from r1481020, subversion/trunk/tools/hook-scripts/control-chars.py
Removed:
    subversion/branches/master-passphrase/subversion/tests/cmdline/utf8_tests.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/notes/
Modified:
    subversion/branches/master-passphrase/   (props changed)
    subversion/branches/master-passphrase/CHANGES
    subversion/branches/master-passphrase/COMMITTERS
    subversion/branches/master-passphrase/INSTALL
    subversion/branches/master-passphrase/Makefile.in
    subversion/branches/master-passphrase/aclocal.m4
    subversion/branches/master-passphrase/build.conf
    subversion/branches/master-passphrase/build/ac-macros/apache.m4
    subversion/branches/master-passphrase/build/ac-macros/apr.m4
    subversion/branches/master-passphrase/build/ac-macros/apr_memcache.m4
    subversion/branches/master-passphrase/build/ac-macros/aprutil.m4
    subversion/branches/master-passphrase/build/ac-macros/compiler.m4
    subversion/branches/master-passphrase/build/ac-macros/kwallet.m4
    subversion/branches/master-passphrase/build/ac-macros/sqlite.m4
    subversion/branches/master-passphrase/build/ac-macros/svn-macros.m4
    subversion/branches/master-passphrase/build/generator/gen_base.py
    subversion/branches/master-passphrase/build/generator/gen_make.py
    subversion/branches/master-passphrase/build/generator/gen_win.py
    subversion/branches/master-passphrase/build/generator/templates/build-outputs.mk.ezt
    subversion/branches/master-passphrase/build/run_tests.py
    subversion/branches/master-passphrase/build/transform_sql.py
    subversion/branches/master-passphrase/configure.ac
    subversion/branches/master-passphrase/contrib/client-side/svncopy/svncopy.pl.in
    subversion/branches/master-passphrase/contrib/hook-scripts/detect-merge-conflicts.sh
    subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fix-repo
    subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fixer/find_good_id.py
    subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fixer/fix-rev.py
    subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fixer/fixer_config.py
    subversion/branches/master-passphrase/contrib/server-side/svncutter/svncutter
    subversion/branches/master-passphrase/gen-make.py
    subversion/branches/master-passphrase/get-deps.sh   (contents, props changed)
    subversion/branches/master-passphrase/notes/ev2-callbacks-template.c
    subversion/branches/master-passphrase/notes/knobs
    subversion/branches/master-passphrase/subversion/bindings/ctypes-python/setup.py
    subversion/branches/master-passphrase/subversion/bindings/cxxhl/include/svncxxhl.hpp   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/cxxhl/include/svncxxhl/_compat.hpp   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/cxxhl/include/svncxxhl/exception.hpp   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/cxxhl/include/svncxxhl/tristate.hpp   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/cxxhl/src/exception.cpp   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/cxxhl/src/tristate.cpp   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/cxxhl/tests/test_exception.cpp   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/CreateJ.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/JNIUtil.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ListCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ListCallback.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/Pool.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ProplistCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ProplistCallback.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/SVNRepos.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/SVNRepos.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/StatusCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProplistCallback.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ConflictVersion.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/tigris/subversion/javahl/LogDate.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/RunTests.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java
    subversion/branches/master-passphrase/subversion/bindings/swig/INSTALL
    subversion/branches/master-passphrase/subversion/bindings/swig/core.i
    subversion/branches/master-passphrase/subversion/bindings/swig/include/svn_containers.swg
    subversion/branches/master-passphrase/subversion/bindings/swig/include/svn_types.swg
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/Client.pm
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/Core.pm
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/3client.t
    subversion/branches/master-passphrase/subversion/bindings/swig/python/README
    subversion/branches/master-passphrase/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/master-passphrase/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
    subversion/branches/master-passphrase/subversion/bindings/swig/python/tests/checksum.py   (contents, props changed)
    subversion/branches/master-passphrase/subversion/bindings/swig/python/tests/client.py
    subversion/branches/master-passphrase/subversion/bindings/swig/python/tests/core.py
    subversion/branches/master-passphrase/subversion/bindings/swig/python/tests/repository.py
    subversion/branches/master-passphrase/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
    subversion/branches/master-passphrase/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
    subversion/branches/master-passphrase/subversion/bindings/swig/ruby/test/test_client.rb
    subversion/branches/master-passphrase/subversion/bindings/swig/ruby/test/test_delta.rb
    subversion/branches/master-passphrase/subversion/bindings/swig/ruby/test/test_wc.rb
    subversion/branches/master-passphrase/subversion/bindings/swig/ruby/test/util.rb
    subversion/branches/master-passphrase/subversion/bindings/swig/ruby/test/windows_util.rb
    subversion/branches/master-passphrase/subversion/bindings/swig/svn_client.i
    subversion/branches/master-passphrase/subversion/include/private/svn_cache.h
    subversion/branches/master-passphrase/subversion/include/private/svn_client_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_cmdline_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_debug.h
    subversion/branches/master-passphrase/subversion/include/private/svn_dep_compat.h
    subversion/branches/master-passphrase/subversion/include/private/svn_diff_tree.h
    subversion/branches/master-passphrase/subversion/include/private/svn_editor.h
    subversion/branches/master-passphrase/subversion/include/private/svn_fs_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_io_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_ra_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_sqlite.h
    subversion/branches/master-passphrase/subversion/include/private/svn_subr_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_utf_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_wc_private.h
    subversion/branches/master-passphrase/subversion/include/svn_auth.h
    subversion/branches/master-passphrase/subversion/include/svn_checksum.h
    subversion/branches/master-passphrase/subversion/include/svn_client.h
    subversion/branches/master-passphrase/subversion/include/svn_cmdline.h
    subversion/branches/master-passphrase/subversion/include/svn_config.h
    subversion/branches/master-passphrase/subversion/include/svn_dav.h
    subversion/branches/master-passphrase/subversion/include/svn_delta.h
    subversion/branches/master-passphrase/subversion/include/svn_error.h
    subversion/branches/master-passphrase/subversion/include/svn_error_codes.h
    subversion/branches/master-passphrase/subversion/include/svn_fs.h
    subversion/branches/master-passphrase/subversion/include/svn_io.h
    subversion/branches/master-passphrase/subversion/include/svn_mergeinfo.h
    subversion/branches/master-passphrase/subversion/include/svn_path.h
    subversion/branches/master-passphrase/subversion/include/svn_pools.h
    subversion/branches/master-passphrase/subversion/include/svn_props.h
    subversion/branches/master-passphrase/subversion/include/svn_ra.h
    subversion/branches/master-passphrase/subversion/include/svn_ra_svn.h
    subversion/branches/master-passphrase/subversion/include/svn_repos.h
    subversion/branches/master-passphrase/subversion/include/svn_sorts.h
    subversion/branches/master-passphrase/subversion/include/svn_string.h
    subversion/branches/master-passphrase/subversion/include/svn_subst.h
    subversion/branches/master-passphrase/subversion/include/svn_types.h
    subversion/branches/master-passphrase/subversion/include/svn_utf.h
    subversion/branches/master-passphrase/subversion/include/svn_version.h
    subversion/branches/master-passphrase/subversion/include/svn_wc.h
    subversion/branches/master-passphrase/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
    subversion/branches/master-passphrase/subversion/libsvn_auth_kwallet/kwallet.cpp
    subversion/branches/master-passphrase/subversion/libsvn_client/add.c
    subversion/branches/master-passphrase/subversion/libsvn_client/cat.c
    subversion/branches/master-passphrase/subversion/libsvn_client/checkout.c
    subversion/branches/master-passphrase/subversion/libsvn_client/client.h
    subversion/branches/master-passphrase/subversion/libsvn_client/commit.c
    subversion/branches/master-passphrase/subversion/libsvn_client/commit_util.c
    subversion/branches/master-passphrase/subversion/libsvn_client/copy.c
    subversion/branches/master-passphrase/subversion/libsvn_client/copy_foreign.c
    subversion/branches/master-passphrase/subversion/libsvn_client/ctx.c
    subversion/branches/master-passphrase/subversion/libsvn_client/delete.c
    subversion/branches/master-passphrase/subversion/libsvn_client/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_client/diff.c
    subversion/branches/master-passphrase/subversion/libsvn_client/diff_local.c
    subversion/branches/master-passphrase/subversion/libsvn_client/diff_summarize.c
    subversion/branches/master-passphrase/subversion/libsvn_client/export.c
    subversion/branches/master-passphrase/subversion/libsvn_client/externals.c
    subversion/branches/master-passphrase/subversion/libsvn_client/import.c
    subversion/branches/master-passphrase/subversion/libsvn_client/info.c
    subversion/branches/master-passphrase/subversion/libsvn_client/iprops.c
    subversion/branches/master-passphrase/subversion/libsvn_client/list.c
    subversion/branches/master-passphrase/subversion/libsvn_client/locking_commands.c
    subversion/branches/master-passphrase/subversion/libsvn_client/log.c
    subversion/branches/master-passphrase/subversion/libsvn_client/merge.c
    subversion/branches/master-passphrase/subversion/libsvn_client/mergeinfo.c
    subversion/branches/master-passphrase/subversion/libsvn_client/mergeinfo.h
    subversion/branches/master-passphrase/subversion/libsvn_client/patch.c
    subversion/branches/master-passphrase/subversion/libsvn_client/prop_commands.c
    subversion/branches/master-passphrase/subversion/libsvn_client/ra.c
    subversion/branches/master-passphrase/subversion/libsvn_client/repos_diff.c
    subversion/branches/master-passphrase/subversion/libsvn_client/resolved.c
    subversion/branches/master-passphrase/subversion/libsvn_client/revert.c
    subversion/branches/master-passphrase/subversion/libsvn_client/status.c
    subversion/branches/master-passphrase/subversion/libsvn_client/switch.c
    subversion/branches/master-passphrase/subversion/libsvn_client/update.c
    subversion/branches/master-passphrase/subversion/libsvn_client/util.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/compat.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/compose_delta.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/editor.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/svndiff.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/text_delta.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/xdelta.c
    subversion/branches/master-passphrase/subversion/libsvn_diff/diff_file.c
    subversion/branches/master-passphrase/subversion/libsvn_diff/diff_memory.c
    subversion/branches/master-passphrase/subversion/libsvn_diff/parse-diff.c
    subversion/branches/master-passphrase/subversion/libsvn_diff/util.c
    subversion/branches/master-passphrase/subversion/libsvn_fs/access.c
    subversion/branches/master-passphrase/subversion/libsvn_fs/editor.c
    subversion/branches/master-passphrase/subversion/libsvn_fs/fs-loader.c
    subversion/branches/master-passphrase/subversion/libsvn_fs/fs-loader.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_base/bdb/changes-table.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_base/bdb/env.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_base/dag.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_base/fs.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_base/lock.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_base/revs-txns.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_base/tree.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/caching.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/fs.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/fs.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/lock.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/tree.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/tree.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_util/fs-util.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/compat.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/deprecated.h   (props changed)
    subversion/branches/master-passphrase/subversion/libsvn_ra/editor.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/ra_loader.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/ra_loader.h
    subversion/branches/master-passphrase/subversion/libsvn_ra/wrapper_template.h
    subversion/branches/master-passphrase/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_local/split_url.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/blame.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/blncache.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/commit.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/getlocationsegments.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/inherited_props.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/log.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/merge.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/mergeinfo.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/options.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/property.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/sb_bucket.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/serf.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/update.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/util.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/xml.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/client.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/cram.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/internal_auth.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/protocol
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/ra_svn.h
    subversion/branches/master-passphrase/subversion/libsvn_repos/authz.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/commit.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/delta.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/dump.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/hooks.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/load.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/log.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/replay.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/reporter.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/repos.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/repos.h
    subversion/branches/master-passphrase/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/   (props changed)
    subversion/branches/master-passphrase/subversion/libsvn_subr/auth.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/auth.h
    subversion/branches/master-passphrase/subversion/libsvn_subr/cache-inprocess.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/cache-memcache.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/cache.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/cache.h
    subversion/branches/master-passphrase/subversion/libsvn_subr/cmdline.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/compat.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/config.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/config_auth.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/config_file.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/config_impl.h
    subversion/branches/master-passphrase/subversion/libsvn_subr/config_win.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/debug.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/dso.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/error.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/hash.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/io.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/opt.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/pool.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/prompt.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/properties.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/pseudo_md5.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/simple_providers.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/sorts.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/sqlite.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/sqlite3wrapper.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/ssl_client_cert_providers.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/ssl_server_trust_providers.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/stream.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/string.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/subst.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/temp_serializer.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/types.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/username_providers.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/utf.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/utf_validate.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/utf_width.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/version.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/win32_crashrpt.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/win32_crypto.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/xml.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/adm_crawler.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/adm_files.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/adm_ops.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/ambient_depth_filter_editor.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/cleanup.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/conflicts.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/conflicts.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/copy.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/crop.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/delete.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/diff.h   (contents, props changed)
    subversion/branches/master-passphrase/subversion/libsvn_wc/diff_editor.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/diff_local.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/entries.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/externals.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/info.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/lock.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/merge.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/node.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/old-and-busted.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/props.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/questions.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/relocate.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/revert.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/status.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/token-map.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/translate.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/tree_conflicts.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/update_editor.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/upgrade.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/util.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db_pristine.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wcroot_anchor.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/workqueue.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/workqueue.h
    subversion/branches/master-passphrase/subversion/mod_authz_svn/INSTALL
    subversion/branches/master-passphrase/subversion/mod_authz_svn/mod_authz_svn.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/activity.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/master-passphrase/subversion/mod_dav_svn/deadprops.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/liveprops.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/lock.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/merge.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/posts/create_txn.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/reports/inherited-props.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/reports/log.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/reports/replay.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/reports/update.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/repos.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/util.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/version.c
    subversion/branches/master-passphrase/subversion/po/de.po
    subversion/branches/master-passphrase/subversion/po/sv.po
    subversion/branches/master-passphrase/subversion/svn/cl-conflicts.c
    subversion/branches/master-passphrase/subversion/svn/cl-conflicts.h
    subversion/branches/master-passphrase/subversion/svn/cl.h
    subversion/branches/master-passphrase/subversion/svn/client_errors.h
    subversion/branches/master-passphrase/subversion/svn/commit-cmd.c
    subversion/branches/master-passphrase/subversion/svn/conflict-callbacks.c
    subversion/branches/master-passphrase/subversion/svn/copy-cmd.c
    subversion/branches/master-passphrase/subversion/svn/diff-cmd.c
    subversion/branches/master-passphrase/subversion/svn/file-merge.c
    subversion/branches/master-passphrase/subversion/svn/help-cmd.c
    subversion/branches/master-passphrase/subversion/svn/info-cmd.c
    subversion/branches/master-passphrase/subversion/svn/list-cmd.c
    subversion/branches/master-passphrase/subversion/svn/log-cmd.c
    subversion/branches/master-passphrase/subversion/svn/merge-cmd.c
    subversion/branches/master-passphrase/subversion/svn/mergeinfo-cmd.c
    subversion/branches/master-passphrase/subversion/svn/notify.c
    subversion/branches/master-passphrase/subversion/svn/propedit-cmd.c
    subversion/branches/master-passphrase/subversion/svn/propget-cmd.c
    subversion/branches/master-passphrase/subversion/svn/props.c
    subversion/branches/master-passphrase/subversion/svn/propset-cmd.c
    subversion/branches/master-passphrase/subversion/svn/resolve-cmd.c
    subversion/branches/master-passphrase/subversion/svn/schema/info.rnc
    subversion/branches/master-passphrase/subversion/svn/status-cmd.c
    subversion/branches/master-passphrase/subversion/svn/status.c
    subversion/branches/master-passphrase/subversion/svn/svn.c
    subversion/branches/master-passphrase/subversion/svn/switch-cmd.c
    subversion/branches/master-passphrase/subversion/svn/update-cmd.c
    subversion/branches/master-passphrase/subversion/svn/util.c
    subversion/branches/master-passphrase/subversion/svnadmin/svnadmin.c
    subversion/branches/master-passphrase/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/master-passphrase/subversion/svnlook/svnlook.c
    subversion/branches/master-passphrase/subversion/svnmucc/svnmucc.c
    subversion/branches/master-passphrase/subversion/svnrdump/dump_editor.c
    subversion/branches/master-passphrase/subversion/svnrdump/load_editor.c
    subversion/branches/master-passphrase/subversion/svnrdump/svnrdump.c
    subversion/branches/master-passphrase/subversion/svnrdump/util.c
    subversion/branches/master-passphrase/subversion/svnserve/cyrus_auth.c
    subversion/branches/master-passphrase/subversion/svnserve/serve.c
    subversion/branches/master-passphrase/subversion/svnserve/server.h
    subversion/branches/master-passphrase/subversion/svnserve/svnserve.c
    subversion/branches/master-passphrase/subversion/svnsync/svnsync.c
    subversion/branches/master-passphrase/subversion/svnsync/sync.c
    subversion/branches/master-passphrase/subversion/svnversion/svnversion.c
    subversion/branches/master-passphrase/subversion/tests/cmdline/authz_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/autoprop_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/basic_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/blame_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/cat_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/commit_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/copy_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/master-passphrase/subversion/tests/cmdline/depth_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/diff_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/export_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/externals_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/info_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/iprop_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/lock_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/log_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_authz_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_automatic_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/move_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/patch_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/prop_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/revert_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/stat_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svnauthz_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svndumpfilter_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svneditor.bat
    subversion/branches/master-passphrase/subversion/tests/cmdline/svnmucc_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svntest/deeptrees.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svntest/main.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/update_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/master-passphrase/subversion/tests/libsvn_delta/random-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_delta/range-index-test.h
    subversion/branches/master-passphrase/subversion/tests/libsvn_diff/diff-diff3-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_fs_fs/fs-pack-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/auth-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/checksum-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/compat-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/config-test.cfg
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/error-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/mergeinfo-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/named_atomic-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/path-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/subst_translate-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/utf-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/conflict-data-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/utils.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/utils.h
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/wc-queries-test.c
    subversion/branches/master-passphrase/subversion/tests/svn_test_main.c
    subversion/branches/master-passphrase/tools/buildbot/slaves/bb-openbsd/svnclean.sh
    subversion/branches/master-passphrase/tools/buildbot/slaves/centos/svnclean.sh
    subversion/branches/master-passphrase/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh
    subversion/branches/master-passphrase/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
    subversion/branches/master-passphrase/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh
    subversion/branches/master-passphrase/tools/buildbot/slaves/ubuntu-x64/svnclean.sh
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/config.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat
    subversion/branches/master-passphrase/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat
    subversion/branches/master-passphrase/tools/client-side/svn-bench/client_errors.h
    subversion/branches/master-passphrase/tools/client-side/svn-bench/null-export-cmd.c
    subversion/branches/master-passphrase/tools/client-side/svn-bench/null-log-cmd.c
    subversion/branches/master-passphrase/tools/client-side/svn-bench/svn-bench.c
    subversion/branches/master-passphrase/tools/dev/aprerr.txt
    subversion/branches/master-passphrase/tools/dev/benchmarks/suite1/benchmark.py
    subversion/branches/master-passphrase/tools/dev/fsfs-access-map.c
    subversion/branches/master-passphrase/tools/dev/fsfs-reorg.c
    subversion/branches/master-passphrase/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
    subversion/branches/master-passphrase/tools/dev/unix-build/Makefile.svn
    subversion/branches/master-passphrase/tools/dev/which-error.py
    subversion/branches/master-passphrase/tools/dist/_gnupg.py
    subversion/branches/master-passphrase/tools/dist/backport.pl
    subversion/branches/master-passphrase/tools/dist/release.py
    subversion/branches/master-passphrase/tools/hook-scripts/mailer/mailer.py
    subversion/branches/master-passphrase/tools/hook-scripts/validate-files.py
    subversion/branches/master-passphrase/tools/server-side/fsfs-stats.c
    subversion/branches/master-passphrase/tools/server-side/mod_dontdothat/mod_dontdothat.c
    subversion/branches/master-passphrase/tools/server-side/svn-rep-sharing-stats.c
    subversion/branches/master-passphrase/tools/server-side/svnauthz.c
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/commit-hook.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/irkerbridge.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/svnpubsub/client.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/svnpubsub/server.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/svntweet.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/svnwcsub.py
    subversion/branches/master-passphrase/win-tests.py

Propchange: subversion/branches/master-passphrase/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 10 14:58:47 2013
@@ -52,3 +52,4 @@ serf
 gtest
 .git
 .gitignore
+compile_commands.json

Propchange: subversion/branches/master-passphrase/
------------------------------------------------------------------------------
  Merged /subversion/branches/wc-collate-path:r1402685-1407641,1407643-1480384
  Merged /subversion/branches/verify-at-commit:r1462039-1462408
  Merged /subversion/trunk:r1451629-1481020
  Merged /subversion/branches/cache-server:r1458643-1476567

Modified: subversion/branches/master-passphrase/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/CHANGES?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/CHANGES (original)
+++ subversion/branches/master-passphrase/CHANGES Fri May 10 14:58:47 2013
@@ -1,5 +1,31 @@
+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:
+
+  - Minor new features and improvements:
+    * 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
-(?? ??? 2011, from /branches/1.8.x)
+(?? ??? 2013, from /branches/1.8.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.8.0
 
  User-visible changes:
@@ -7,11 +33,18 @@ http://svn.apache.org/repos/asf/subversi
     *
 
   - 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 'commit --include-externals' option (related to issues #1167, #3563)
+    * 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)
@@ -19,11 +52,15 @@ http://svn.apache.org/repos/asf/subversi
     * 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 light-weight benchmarking client (tools/client-side/svn-bench)
+    * new w/c subtree duplication tool (tools/client-side/detach.py)
+    * new svndumpfilter dependency analysis (tools/server-side/svnpredumpfilter.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)
@@ -39,25 +76,112 @@ http://svn.apache.org/repos/asf/subversi
     * '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)
+    * support for custom keyword definitions in svn:keywords (issue #890)
+    * support for server-side keyword expansion in mod_dav_svn (r1466055)
+    * FSFS now able to cache revision properties (r1326307)
+    * 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)
+    * new --client-speed option for svnserve (r1391788)
+    * hook script templates are now marked as executable (r1153414)
+    * 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 unintended repositories (r1153110)
+    * return an error when conflicts could not be resolved (r1150439)
+    * let HTTPv2-aware clients fetch v2-style resources (r1161202)
+    * 'svn status' with better NLS support (r1157537, -682)
+    * error out on non-canonical fspaths in the authz file (r1166111)
+    * improve error messages (r1212823, r1212463)
+    * better tracking of shallow-yet-complete merges (issues #4056, #4057)
+    * improve performance of mergeinfo elision (r1208739)
+    * make 'svn status --quiet' w/ externals quieter still (issue #1935)
+    * ensure that all paths shown in 'svn status' are relative-ized (r1202425)
+    * improve performance of local multi-target deletions (r1195873)
+    * apply update ops to locally moved-away dirs (r1183358, r1185110, r1185392)
 
   - Client-side bugfixes:
-    * 
+    * fix inconsistent 'svn log' output for empty revisions (issue #3964)
+    * fix 'svn revert' of 'svn move' (issue #876)
+    * fix 'wrong 'status' of file externals "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)
 
   - Server-side bugfixes:
     * SVNParentPath / repository listing now authz-filtered (r1408184)
+    * user and 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)
 
   - Other tool improvements and bugfixes:
     * 'svnmucc' promoted to first-class supported utility (issue #3308)
+    * rename 'svnauthz-validate' to 'svnauthz' (issue #4284)
+    * make 'svnauthz' optionally validate user/path access (r1197588)
   
  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)
+    * new require httpd version 2.2.21 for builds with Apache (r1174039)
+    * 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)
 
   - API changes:
     * fix inconsistent handling of log revs without changed paths (issue #3694)
+    * new type svn_kind_t to replace svn_node_kind_t (r1181800)
+    * deprecated SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA (r1173240)
 
   - Bindings:
     * star-imports in swig-py only import 'svn_*' symbols (r1303375)
+    * fix compilation of Perl bindings on Mandriva 2007 (issue #2617)
+    * fix Python build on OpenBSD >= 5.0. (r1178846)
+    * new JavaHL testing targets (r1182983)
+
+
+Version 1.7.9
+(04 Apr 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.9
+ User-visible changes
+  - Client-side bugfixes:
+    * improved error messages about svn:date and svn:author props. (r1440620)
+    * fix local_relpath assertion (issue #4257)
+    * fix memory leak in `svn log` over svn:// (r1458341)
+    * fix incorrect authz failure when using neon http library (issue #4332)
+    * fix segfault when using kwallet (r1421103)
+    
+  - Server-side bugfixes:
+    * svnserve will log the replayed rev not the low-water rev. (r1461278)
+    * mod_dav_svn will omit some property values for activity urls (r1453780)
+    * fix an assertion in mod_dav_svn when acting as a proxy on / (issue #4272)
+    * improve memory usage when committing properties in mod_dav_svn (r1443929)
+    * fix svnrdump to load dump files with non-LF line endings (issue #4263)
+    * fix assertion when rep-cache is inaccessible (r1422100)
+    * improved logic in mod_dav_svn's implementation of lock. (r1455352)
+    * avoid executing unnecessary code in log with limit (r1459599)
+
+ Developer-visible changes:
+  - General:
+    * fix an assertion in dav_svn_get_repos_path() on Windows (r1425368)
+    * fix get-deps.sh to correctly download zlib (r13520131)
+    * doxygen docs will now ignore prefixes when producing the index (r1429201)
+    * fix get-deps.sh on freebsd (r1423646)
+
+  - Bindings:
+    * javahl status api now respects the ignoreExternals boolean (r1435361)
 
 
 Version 1.7.8
@@ -569,6 +693,23 @@ the 1.6 release:  http://subversion.apac
     * fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
 
 
+Version 1.6.21
+(04 Apr 2013, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.21
+
+ User-visible changes
+  - Server-side bugfixes:
+    * mod_dav_svn will omit some property values for activity urls (r1453780)
+    * improve memory usage when committing properties in mod_dav_svn (r1443929)
+    * fix mod_dav_svn runs pre-revprop-change twice (issue #3085)
+    * fixed: post-revprop-change errors cancel commit (issue #2990)
+    * improved logic in mod_dav_svn's implementation of lock. (r1455352)
+
+ Developer-visible changes:
+  - General:
+    * fix a compatibility issue with g++ 4.7 (r1345740)
+
+
 Version 1.6.20
 (04 Jan 2013, from /branches/1.6.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.6.20

Modified: subversion/branches/master-passphrase/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/COMMITTERS?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/COMMITTERS [UTF-8] (original)
+++ subversion/branches/master-passphrase/COMMITTERS [UTF-8] Fri May 10 14:58:47 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 <jelmer@samba.org>          (Python bindings)
           sage   Sage LaTorra <sagelt@gmail.com>             (Ctypes-Python b.)
           vmpn   Vladimir Berezniker <vmpn@hitechman.com>    (JavaHL bindings)
+       rschupp   Roderich Schupp <roderich.schupp@gmail.com> (Swig bindings)
 
   Packages:
 
@@ -186,6 +187,7 @@ giorgio_valoti   Giorgio Valoti <giorgio
                                                              IS BOUNCING]
         fabien   Fabien Coelho <fabien@coelho.net>           (po: fr)
        marcelg   Marcel Gosselin <marcel.gosselin@polymtl.ca> (po: fr)
+      mattiase   Mattias Engdegård <mattiase@acm.org>        (po: sv)
 
   Experimental branches:
 

Modified: subversion/branches/master-passphrase/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/INSTALL?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/INSTALL (original)
+++ subversion/branches/master-passphrase/INSTALL Fri May 10 14:58:47 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
@@ -243,11 +244,10 @@ I.    INTRODUCTION
       be able to find them.
 
       There are a couple of options to "./configure" that tell it where
-      to look for the APR and APR-util libraries. By default, it will first
-      look for bundled versions of APR and APR-util, and then try to locate
-      already installed versions of the libraries using the apr-config and
-      apu-config scripts. These scripts provide all the relevant information
-      for the APR and APR-util installations.
+      to look for the APR and APR-util libraries. By default it will try
+      to locate the libraries using apr-config and apu-config scripts.
+      These scripts provide all the relevant information for the APR and
+      APR-util installations.
 
       If you want to specify the location of the APR library, you can use
       the "--with-apr=" option of "./configure". It should be able to find
@@ -264,10 +264,6 @@ I.    INTRODUCTION
           $ ./configure --with-apr=/usr/local/apache2 \
             --with-apr-util=/usr/local/apache2  ...
 
-      If you want Subversion to build the APR libraries from source
-      code as part of the Subversion build process, you can put their
-      source code into the "./apr" and "./apr-util" directories.
-
       Be sure to use a native Windows SVN client (as opposed to
       Cygwin's version) so that the .dsp files get carriage-returns at
       the ends of their lines.  Otherwise Visual Studio will complain
@@ -278,9 +274,12 @@ I.    INTRODUCTION
       library's directory, to regenerate the configure scripts and
       other files required for compiling the libraries:
 
-      $ cd apr; ./buildconf; cd ..
+      $ cd apr; ./buildconf; ./configure ...; make; make install; cd ..
+
+      $ cd apr-util; ./buildconf; ./configure ...; make; make install; cd ..
 
-      $ cd apr-util; ./buildconf; cd ..
+      Configure build and install both libraries before running Subversion's
+      configure script.
 
 
       2. Zlib  (REQUIRED)
@@ -653,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
@@ -695,19 +694,6 @@ II.   INSTALLATION
       It probably means that the dynamic loader/linker can't find all
       of the libsvn_* libraries.
 
-      Note that if you commonly build with the -jN option to make and
-      have used the get-deps.sh script to fetch dependencies, the make
-      step above may fail, because we don't ensure that third party
-      libraries in our source tree will finish building before
-      subversion itself.  If you want to use -jN, use the following
-      instead:
-
-          $ ./configure
-          $ make -jN external-all
-          $ make -jN local-all
-          $ make check
-          # make install
-
 
   C.  Building under Unix in Different Directories
       --------------------------------------------
@@ -717,7 +703,7 @@ II.   INSTALLATION
 
           $ svn co https://svn.apache.org/repos/asf/subversion/trunk svn
           $ cd svn
-          $ # get any dependencies to be built in-tree, if required
+          $ # get SQLite amalgamation if required
           $ chmod +x autogen.sh
           $ ./autogen.sh
           $ mkdir ../obj

Modified: subversion/branches/master-passphrase/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/Makefile.in?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/Makefile.in (original)
+++ subversion/branches/master-passphrase/Makefile.in Fri May 10 14:58:47 2013
@@ -38,8 +38,6 @@ SVN_FS_LIB_LINK = @SVN_FS_LIB_LINK@
 SWIG_SRC_DIR = $(abs_srcdir)/subversion/bindings/swig
 SWIG_BUILD_DIR = $(abs_builddir)/subversion/bindings/swig
 
-SVN_EXTERNAL_PROJECT_SUBDIRS = @SVN_EXTERNAL_PROJECT_SUBDIRS@
-
 SCHEMA_DIR = subversion/svn/schema
 
 SVN_APR_LIBS = @SVN_APR_LIBS@
@@ -66,7 +64,6 @@ ramod_libdir = @libdir@
 bdb_libdir = @libdir@
 gnome_keyring_libdir = @libdir@
 gpg_agent_libdir = @libdir@
-gssapi_libdir = @libdir@
 kwallet_libdir = @libdir@
 serf_libdir = @libdir@
 bindir = @bindir@
@@ -373,11 +370,11 @@ ECHO_N = @ECHO_N@
 
 TESTS = $(TEST_PROGRAMS) @BDB_TEST_PROGRAMS@
 
-all: mkdir-init external-all local-all
-clean: external-clean local-clean
-distclean: external-distclean local-distclean
-extraclean: external-extraclean local-extraclean
-install: external-install local-install revision-install
+all: mkdir-init local-all
+clean: local-clean
+distclean: local-distclean
+extraclean: local-extraclean
+install: local-install revision-install
 
 @INCLUDE_OUTPUTS@
 
@@ -401,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                                                         \
@@ -574,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:
@@ -591,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-*       \
@@ -617,32 +624,6 @@ mkdir-init:
             fi;                                          \
         done
 
-# recursive targets to handle external projects (e.g. APR, Neon)
-external-all external-install:
-	@target=`echo $@ | sed s/external-//`;          \
-        list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)';         \
-        for i in $$list; do                             \
-            echo "------ making $$target in $$i";       \
-            (cd $$i && $(MAKE) $$target) || exit 1;     \
-            echo "------ completed $$target in $$i";    \
-        done;
-
-### apr-util relies on generated files in apr, so reverse the
-### list so that it is cleaned before apr. also note that Neon does
-### not have an extraclean target, so get "close" with distclean
-external-clean external-distclean external-extraclean:
-	@target=`echo $@ | sed s/external-//`;          \
-        list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)';         \
-        for i in $$list; do                             \
-            revlist="$$i $$revlist";                    \
-        done;                                           \
-        for i in $$revlist; do                          \
-            echo "------ making $$target in $$i";       \
-            (cd $$i && $(MAKE) $$target) || exit 1;     \
-            echo "------ completed $$target in $$i";    \
-        done;
-
-
 # DOCUMENTATION RULES
 
 # Every single document in every format.
@@ -909,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/master-passphrase/aclocal.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/aclocal.m4?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/aclocal.m4 (original)
+++ subversion/branches/master-passphrase/aclocal.m4 Fri May 10 14:58:47 2013
@@ -38,7 +38,6 @@ sinclude(build/ac-macros/apr_memcache.m4
 sinclude(build/ac-macros/berkeley-db.m4)
 sinclude(build/ac-macros/compiler.m4)
 sinclude(build/ac-macros/ctypesgen.m4)
-sinclude(build/ac-macros/gssapi.m4)
 sinclude(build/ac-macros/java.m4)
 sinclude(build/ac-macros/sasl.m4)
 sinclude(build/ac-macros/serf.m4)

Modified: subversion/branches/master-passphrase/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build.conf?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build.conf (original)
+++ subversion/branches/master-passphrase/build.conf Fri May 10 14:58:47 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
@@ -57,10 +60,13 @@ private-built-includes =
         subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLib.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLibIterator.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLib.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLibIterator.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
-        subversion/svn/svn-help.inc
-        subversion/svn/svn-help.man
 
 
 test-scripts =
@@ -285,7 +291,7 @@ msvc-export = svn_ra.h private\svn_ra_pr
 type = ra-module
 path = subversion/libsvn_ra_serf
 install = serf-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr serf gssapi xml
+libs = libsvn_delta libsvn_subr aprutil apriconv apr serf xml
 msvc-libs = secur32.lib
 msvc-static = yes
 
@@ -805,6 +811,14 @@ sources = error-test.c
 install = test
 libs = libsvn_test libsvn_subr apriconv apr
 
+[error-code-test]
+description = Test error library
+type = exe
+path = subversion/tests/libsvn_subr
+sources = error-code-test.c
+install = test
+libs = libsvn_test libsvn_subr apriconv apr
+
 [hashdump-test]
 description = Test hashfile format for props
 type = exe
@@ -1147,10 +1161,6 @@ external-lib = $(SVN_DB_LIBS)
 type = lib
 external-lib = $(SVN_GNOME_KEYRING_LIBS)
 
-[gssapi]
-type = lib
-external-lib = $(SVN_GSSAPI_LIBS)
-
 [kwallet]
 type = lib
 external-lib = $(SVN_KWALLET_LIBS)
@@ -1214,7 +1224,7 @@ libs = __ALL__
        strings-reps-test changes-test locks-test repos-test
        checksum-test compat-test config-test hashdump-test mergeinfo-test
        opt-test path-test stream-test string-test time-test utf-test
-       error-test cache-test spillbuf-test crypto-test
+       error-test error-code-test cache-test spillbuf-test crypto-test
        named_atomic-test named_atomic-proc-test revision-test
        subst_translate-test io-test
        translate-test

Modified: subversion/branches/master-passphrase/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/ac-macros/apache.m4?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/ac-macros/apache.m4 (original)
+++ subversion/branches/master-passphrase/build/ac-macros/apache.m4 Fri May 10 14:58:47 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/master-passphrase/build/ac-macros/apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/ac-macros/apr.m4?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/ac-macros/apr.m4 (original)
+++ subversion/branches/master-passphrase/build/ac-macros/apr.m4 Fri May 10 14:58:47 2013
@@ -32,7 +32,7 @@ AC_DEFUN(SVN_LIB_APR,
 
   AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
 
-  APR_FIND_APR("$abs_srcdir/apr", "$abs_builddir/apr", 1, [1 0])
+  APR_FIND_APR("", "", 1, [1 0])
 
   if test $apr_found = "no"; then
     AC_MSG_WARN([APR not found])
@@ -40,7 +40,7 @@ AC_DEFUN(SVN_LIB_APR,
   fi
 
   if test $apr_found = "reconfig"; then
-    SVN_EXTERNAL_PROJECT([apr])
+    AC_MSG_ERROR([Unexpected APR reconfig])
   fi
 
   dnl check APR version number against regex  
@@ -117,29 +117,12 @@ dnl no apr found, print out a message te
 AC_DEFUN(SVN_DOWNLOAD_APR,
 [
   echo "The Apache Portable Runtime (APR) library cannot be found."
-  echo "Please install APR on this system and supply the appropriate"
-  echo "--with-apr option to 'configure'"
+  echo "Please install APR on this system and configure Subversion"
+  echo "with the appropriate --with-apr option."
   echo ""
-  echo "or"
+  echo "You probably need to do something similar with the Apache"
+  echo "Portable Runtime Utility (APRUTIL) library and then configure"
+  echo "Subversion with both the --with-apr and --with-apr-util options."
   echo ""
-  echo "get it with SVN and put it in a subdirectory of this source:"
-  echo ""
-  echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x \\"
-  echo "    apr"
-  echo ""
-  echo "Run that right here in the top level of the Subversion tree."
-  echo "Afterwards, run ./buildconf in that subdirectory and"
-  echo "then run configure again here."
-  echo ""
-  echo "Whichever of the above you do, you probably need to do"
-  echo "something similar for apr-util, either providing both"
-  echo "--with-apr and --with-apr-util to 'configure', or"
-  echo "getting both from SVN with:"
-  echo ""
-  echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
-  echo "    apr-util"
-  echo ""
-  AC_MSG_ERROR([no suitable apr found])
+  AC_MSG_ERROR([no suitable APR found])
 ])

Modified: subversion/branches/master-passphrase/build/ac-macros/apr_memcache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/ac-macros/apr_memcache.m4?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/ac-macros/apr_memcache.m4 (original)
+++ subversion/branches/master-passphrase/build/ac-macros/apr_memcache.m4 Fri May 10 14:58:47 2013
@@ -48,32 +48,20 @@ AC_DEFUN(SVN_LIB_APR_MEMCACHE,
       CPPFLAGS="$save_cppflags"
     fi
   ], [
-    if test -d "$srcdir/apr_memcache"; then
-      apr_memcache_found=reconfig
-    else
 dnl   Try just looking in apr-util (>= 1.3 has it already).
-      AC_MSG_NOTICE([looking for apr_memcache as part of apr-util])
-      save_cppflags="$CPPFLAGS"
-      CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
-      AC_CHECK_HEADER(apr_memcache.h,[
-        save_ldflags="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $SVN_APRUTIL_LIBS"
-        AC_CHECK_LIB(aprutil-1, apr_memcache_create,
-          [apr_memcache_found="aprutil"])
-        LDFLAGS="$save_ldflags"])
-      CPPFLAGS="$save_cppflags"
-
-    fi
+    AC_MSG_NOTICE([looking for apr_memcache as part of apr-util])
+    save_cppflags="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES"
+    AC_CHECK_HEADER(apr_memcache.h,[
+      save_ldflags="$LDFLAGS"
+      LDFLAGS="$LDFLAGS $SVN_APRUTIL_LIBS"
+      AC_CHECK_LIB(aprutil-1, apr_memcache_create,
+        [apr_memcache_found="aprutil"])
+      LDFLAGS="$save_ldflags"])
+    CPPFLAGS="$save_cppflags"
    ])
 
 
-  if test $apr_memcache_found = "reconfig"; then
-    SVN_EXTERNAL_PROJECT([apr_memcache], [--with-apr=$apr_config --with-apr-util=$apu_config])
-    apr_memcache_prefix=$prefix
-    SVN_APR_MEMCACHE_INCLUDES="-I$srcdir/memcache"
-    SVN_APR_MEMCACHE_LIBS="$abs_builddir/memcache/libapr_memcache.la"
-  fi
-
   if test $apr_memcache_found = "standalone"; then
     SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0"
     SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la"

Modified: subversion/branches/master-passphrase/build/ac-macros/aprutil.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/ac-macros/aprutil.m4?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/ac-macros/aprutil.m4 (original)
+++ subversion/branches/master-passphrase/build/ac-macros/aprutil.m4 Fri May 10 14:58:47 2013
@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
 
   AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library configuration])
 
-  APR_FIND_APU("$abs_srcdir/apr-util", "$abs_builddir/apr-util", 1, [1 0])
+  APR_FIND_APU("", "", 1, [1 0])
 
   if test $apu_found = "no"; then
     AC_MSG_WARN([APRUTIL not found])
@@ -46,12 +46,12 @@ AC_DEFUN(SVN_LIB_APRUTIL,
   fi
 
   if test $apu_found = "reconfig"; then
-    SVN_EXTERNAL_PROJECT([apr-util], [--with-apr=../apr])
+    AC_MSG_ERROR([Unexpected APRUTIL reconfig])
   fi
 
   dnl check APRUTIL version number against regex  
 
-  AC_MSG_CHECKING([APR-UTIL version])    
+  AC_MSG_CHECKING([APRUTIL version])    
   apu_version="`$apu_config --version`"
   if test $? -ne 0; then
     # This is a hack as suggested by Ben Collins-Sussman.  It can be
@@ -76,7 +76,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
 
   if test $APU_WANTED_REGEX_MATCH -eq 0; then
     echo "wanted regexes are $APRUTIL_WANTED_REGEXES"
-    AC_MSG_ERROR([invalid apr-util version found])
+    AC_MSG_ERROR([invalid APRUTIL version found])
   fi
 
   dnl Get libraries and thread flags from APRUTIL ---------------------
@@ -121,20 +121,8 @@ dnl no apr-util found, print out a messa
 AC_DEFUN(SVN_DOWNLOAD_APRUTIL,
 [
   echo "The Apache Portable Runtime Utility (APRUTIL) library cannot be found."
-  echo "Either install APRUTIL on this system and supply the appropriate"
-  echo "--with-apr-util option"
-  echo ""
-  echo "or"
-  echo ""
-  echo "get it with SVN and put it in a subdirectory of this source:"
-  echo ""
-  echo "   svn co \\"
-  echo "    http://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x \\"
-  echo "    apr-util"
-  echo ""
-  echo "Run that right here in the top level of the Subversion tree."
-  echo "Afterwards, run ./buildconf in that subdirectory and"
-  echo "then run configure again here."
+  echo "Install APRUTIL on this system and configure Subversion with the"
+  echo " appropriate --with-apr-util option."
   echo ""
   AC_MSG_ERROR([no suitable APRUTIL found])
 ])

Modified: subversion/branches/master-passphrase/build/ac-macros/compiler.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/ac-macros/compiler.m4?rev=1481041&r1=1481040&r2=1481041&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/ac-macros/compiler.m4 (original)
+++ subversion/branches/master-passphrase/build/ac-macros/compiler.m4 Fri May 10 14:58:47 2013
@@ -66,6 +66,10 @@ AC_DEFUN([SVN_CC_MODE_SETUP],
     ])
   ])
 
+  dnl clang does not (always?) error out on unknown compiler
+  dnl options so silence the diagnostics emitted for warning options
+  SVN_CFLAGS_ADD_IFELSE([-Wno-unknown-warning-option])
+
   CMODEFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS_KEEP"
   AC_SUBST(CMODEFLAGS)
@@ -82,6 +86,10 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
                 dnl g++ and clang++
   SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
 
+  dnl clang++ does not (always?) error out on unknown compiler
+  dnl options so silence the diagnostics emitted for warning options
+  SVN_CXXFLAGS_ADD_IFELSE([-Wno-unknown-warning-option])
+
   CXXMODEFLAGS="$CXXFLAGS"
   CXXFLAGS="$CXXFLAGS_KEEP"
   AC_SUBST(CXXMODEFLAGS)



Mime
View raw message