You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/09/15 21:32:38 UTC

svn commit: r997472 [1/41] - in /subversion/branches/py-tests-as-modules: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ contrib/server-side/ notes/ notes/tree-conflicts/ notes/wc-ng/ subversion/bindings/javahl/native/ subversio...

Author: hwright
Date: Wed Sep 15 19:32:26 2010
New Revision: 997472

URL: http://svn.apache.org/viewvc?rev=997472&view=rev
Log:
On the py-tests-as-modules branch:
Bring up-to-date with trunk.

Added:
    subversion/branches/py-tests-as-modules/notes/external-vs-switched
      - copied unchanged from r997305, subversion/trunk/notes/external-vs-switched
    subversion/branches/py-tests-as-modules/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt
      - copied unchanged from r997305, subversion/trunk/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt
    subversion/branches/py-tests-as-modules/notes/wc-ng/node-data
      - copied unchanged from r997305, subversion/trunk/notes/wc-ng/node-data
    subversion/branches/py-tests-as-modules/notes/wc-ng/single-db-per-wc
      - copied unchanged from r997305, subversion/trunk/notes/wc-ng/single-db-per-wc
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.cpp
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.h
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/native/ClientContext.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CommitCallback.cpp
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/native/CommitCallback.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CommitCallback.h
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/native/CommitCallback.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNRepos.cpp
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNRepos.h
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/native/SVNRepos.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitCallback.java
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java
      - copied unchanged from r997305, subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNReposTests.java
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/cleanup.c
      - copied unchanged from r997305, subversion/trunk/subversion/libsvn_wc/cleanup.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/posts/   (props changed)
      - copied from r997305, subversion/trunk/subversion/mod_dav_svn/posts/
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/posts/create_txn.c
      - copied unchanged from r997305, subversion/trunk/subversion/mod_dav_svn/posts/create_txn.c
    subversion/branches/py-tests-as-modules/subversion/svnrdump/   (props changed)
      - copied from r997305, subversion/trunk/subversion/svnrdump/
    subversion/branches/py-tests-as-modules/subversion/svnrdump/dump_editor.c
      - copied unchanged from r997305, subversion/trunk/subversion/svnrdump/dump_editor.c
    subversion/branches/py-tests-as-modules/subversion/svnrdump/dump_editor.h
      - copied unchanged from r997305, subversion/trunk/subversion/svnrdump/dump_editor.h
    subversion/branches/py-tests-as-modules/subversion/svnrdump/load_editor.c
      - copied unchanged from r997305, subversion/trunk/subversion/svnrdump/load_editor.c
    subversion/branches/py-tests-as-modules/subversion/svnrdump/load_editor.h
      - copied unchanged from r997305, subversion/trunk/subversion/svnrdump/load_editor.h
    subversion/branches/py-tests-as-modules/subversion/svnrdump/svnrdump.1
      - copied unchanged from r997305, subversion/trunk/subversion/svnrdump/svnrdump.1
    subversion/branches/py-tests-as-modules/subversion/svnrdump/svnrdump.c
      - copied unchanged from r997305, subversion/trunk/subversion/svnrdump/svnrdump.c
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/input_validation_tests.py
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/redirect_tests.py
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/redirect_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests.py
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/
      - copied from r997305, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/revision-0.dump
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/revision-0.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/skeleton.dump
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/skeleton.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/upgrade_tests_data/missing-dirs.tar.bz2
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/missing-dirs.tar.bz2
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.0.tar.bz2
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.0.tar.bz2
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.6.tar.bz2
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.4.6.tar.bz2
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.6.12.tar.bz2
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-3x-1.6.12.tar.bz2
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/upgrade_tests_data/wc-delete.tar.bz2
      - copied unchanged from r997305, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/wc-delete.tar.bz2
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
      - copied unchanged from r997305, subversion/trunk/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
    subversion/branches/py-tests-as-modules/subversion/tests/manual/
      - copied from r997305, subversion/trunk/subversion/tests/manual/
    subversion/branches/py-tests-as-modules/subversion/tests/manual/README
      - copied unchanged from r997305, subversion/trunk/subversion/tests/manual/README
    subversion/branches/py-tests-as-modules/subversion/tests/manual/tree-conflicts-add-vs-add.py
      - copied unchanged from r997305, subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py
    subversion/branches/py-tests-as-modules/tools/dev/unix-build/README
      - copied unchanged from r997305, subversion/trunk/tools/dev/unix-build/README
    subversion/branches/py-tests-as-modules/tools/dev/wc-format.py
      - copied unchanged from r997305, subversion/trunk/tools/dev/wc-format.py
    subversion/branches/py-tests-as-modules/tools/dev/wc-ng/bump-to-19.py
      - copied unchanged from r997305, subversion/trunk/tools/dev/wc-ng/bump-to-19.py
Removed:
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientNotifyCallback.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientNotifyCallback.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ConflictResolverCallback.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ProgressListener.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ProgressListener.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNAdmin.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNAdmin.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitMessage.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNAdmin.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNAdmin.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNAdminTests.java
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/adm_ops.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/log.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/log.h
Modified:
    subversion/branches/py-tests-as-modules/   (props changed)
    subversion/branches/py-tests-as-modules/CHANGES
    subversion/branches/py-tests-as-modules/COMMITTERS
    subversion/branches/py-tests-as-modules/INSTALL
    subversion/branches/py-tests-as-modules/Makefile.in
    subversion/branches/py-tests-as-modules/build.conf
    subversion/branches/py-tests-as-modules/build/ac-macros/serf.m4
    subversion/branches/py-tests-as-modules/build/ac-macros/sqlite.m4
    subversion/branches/py-tests-as-modules/build/generator/build_zlib.ezt
    subversion/branches/py-tests-as-modules/build/generator/extractor.py
    subversion/branches/py-tests-as-modules/build/generator/gen_win.py
    subversion/branches/py-tests-as-modules/build/generator/templates/vcnet_vcxproj.ezt
    subversion/branches/py-tests-as-modules/build/run_tests.py
    subversion/branches/py-tests-as-modules/build/transform_libtool_scripts.sh
    subversion/branches/py-tests-as-modules/configure.ac
    subversion/branches/py-tests-as-modules/contrib/server-side/fsfsverify.py
    subversion/branches/py-tests-as-modules/gen-make.py
    subversion/branches/py-tests-as-modules/get-deps.sh
    subversion/branches/py-tests-as-modules/notes/unicode-composition-for-filenames
    subversion/branches/py-tests-as-modules/notes/wc-ng/conflict-storage
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CommitMessage.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CommitMessage.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/EnumMapper.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/EnumMapper.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/LogMessageCallback.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/MessageReceiver.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/Prompter.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/Prompter.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNBase.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNBase.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ChangelistCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/DiffSummaryCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/InfoCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/PatchCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ProplistCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/UserPasswordCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/include/svn_containers.swg
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/README
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/svn/delta.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/auth.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/client.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/core.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/delta.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/mergeinfo.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/pool.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/ra.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/repository.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/utils.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/python/tests/wc.py
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/ruby/svn/core.rb
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/ruby/test/test_client.rb
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/ruby/test/test_info.rb
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/ruby/test/test_wc.rb
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/svn_delta.i
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/svn_diff.i
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/svn_fs.i
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_dep_compat.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_eol_private.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_fs_util.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_mergeinfo_private.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_opt_private.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_skel.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_sqlite.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_wc_private.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_client.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_config.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_dav.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_diff.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_dirent_uri.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_error.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_error_codes.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_fs.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_io.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_mergeinfo.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_props.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_ra.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_ra_svn.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_repos.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_sorts.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_string.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_types.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_wc.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/add.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/cat.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/changelist.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/cleanup.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/client.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/cmdline.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/commit.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/commit_util.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/copy.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/delete.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/deprecated.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/diff.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/export.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/externals.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/info.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/list.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/locking_commands.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/log.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/merge.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/mergeinfo.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/patch.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/prop_commands.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/ra.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/relocate.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/repos_diff.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/repos_diff_summarize.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/revert.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/status.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/switch.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/update.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/url.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_delta/path_driver.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_delta/svndiff.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_delta/text_delta.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_diff/diff_file.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_diff/diff_memory.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_diff/parse-diff.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs/fs-loader.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs/fs-loader.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/bdb/locks-table.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/bdb/locks-table.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/lock.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/lock.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/notes/fs-history
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/notes/structure
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/tree.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/util/fs_skels.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/fs.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/id.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/lock.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/lock.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/structure
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/tree.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra/compat.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra/deprecated.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra/ra_loader.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra/ra_loader.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra/wrapper_template.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_local/split_url.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/commit.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/fetch.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/get_locks.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/lock.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/options.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/props.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/ra_neon.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/session.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_neon/util.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/auth.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/blame.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/commit.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/get_deleted_rev.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/getdate.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/getlocationsegments.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/locks.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/log.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/merge.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/mergeinfo.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/options.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/property.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/replay.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/serf.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/update.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/util.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_serf/win32_auth_sspi.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_svn/client.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_svn/protocol
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/deprecated.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/dump.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/load.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/replay.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/reporter.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/repos.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/config.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/config_file.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/config_win.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/constructors.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/deprecated.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/hash.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/io.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/opt.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/path.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/prompt.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/quoprint.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/skel.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/sqlite.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/stream.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/subst.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/svn_string.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/utf.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/validate.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/adm_crawler.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/adm_files.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/adm_files.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/adm_ops.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/ambient_depth_filter_editor.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/copy.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/crop.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/deprecated.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/diff.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/entries.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/entries.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/lock.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/lock.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/merge.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/node.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/old-and-busted.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/props.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/props.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/questions.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/relocate.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/revision_status.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/status.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/translate.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/translate.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/tree_conflicts.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/update_editor.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/upgrade.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/util.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/wc.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/wc_db.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/wc_db.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/wc_db_pdh.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/workqueue.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/workqueue.h
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/authz.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/deadprops.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/liveprops.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/lock.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/reports/get-locks.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/reports/log.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/reports/replay.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/reports/update.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/repos.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/util.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/version.c
    subversion/branches/py-tests-as-modules/subversion/po/fr.po
    subversion/branches/py-tests-as-modules/subversion/svn/add-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/blame-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/changelist-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/checkout-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/cl.h
    subversion/branches/py-tests-as-modules/subversion/svn/cleanup-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/commit-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/conflict-callbacks.c
    subversion/branches/py-tests-as-modules/subversion/svn/copy-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/delete-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/diff-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/export-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/import-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/info-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/lock-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/log-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/main.c
    subversion/branches/py-tests-as-modules/subversion/svn/merge-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/mkdir-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/move-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/notify.c
    subversion/branches/py-tests-as-modules/subversion/svn/patch-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/propdel-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/propedit-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/propset-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/resolve-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/resolved-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/revert-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/status-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/status.c
    subversion/branches/py-tests-as-modules/subversion/svn/switch-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/unlock-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/update-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/upgrade-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/util.c
    subversion/branches/py-tests-as-modules/subversion/svndumpfilter/main.c
    subversion/branches/py-tests-as-modules/subversion/svnlook/main.c
    subversion/branches/py-tests-as-modules/subversion/svnserve/cyrus_auth.c
    subversion/branches/py-tests-as-modules/subversion/svnserve/log-escape.c
    subversion/branches/py-tests-as-modules/subversion/svnserve/main.c
    subversion/branches/py-tests-as-modules/subversion/svnserve/serve.c
    subversion/branches/py-tests-as-modules/subversion/svnsync/main.c
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/README
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/authz_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/basic_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/cat_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/checkout_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/commit_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/copy_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/depth_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/diff_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/entries-dump.c
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/entries_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/export_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/externals_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/lock_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/merge_authz_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/merge_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/patch_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/prop_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/resolve_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/resolved_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/revert_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/schedule_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/stat_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnlook_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/copy-and-modify.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/copy-bad-line-endings.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version-and-modify.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/copy-from-previous-version.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/copy-parent-modify-prop.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/delete-svn-props.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/file-dir-file.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/modified-in-place.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/no-author.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/revprops.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/svnsync-move-and-modify.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/tag-empty-trunk.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-dir.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/tag-trunk-with-file2.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/tag-with-modified-file.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/url-encoding-bug.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/factory.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/main.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/sandbox.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/tree.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/verify.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/wc.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/switch_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/trans_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/update_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_client/   (props changed)
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_client/client-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_delta/delta-window-test.h
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_fs_fs/fs-pack-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_ra_local/ra-local-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_subr/skel-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_wc/entries-compat.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_wc/pristine-store-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/svn_test_fs.c
    subversion/branches/py-tests-as-modules/subversion/tests/svn_test_fs.h
    subversion/branches/py-tests-as-modules/subversion/tests/svn_test_main.c
    subversion/branches/py-tests-as-modules/tools/backup/hot-backup.py.in
    subversion/branches/py-tests-as-modules/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
    subversion/branches/py-tests-as-modules/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
    subversion/branches/py-tests-as-modules/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
    subversion/branches/py-tests-as-modules/tools/client-side/svn-viewspec.py
    subversion/branches/py-tests-as-modules/tools/dev/svnraisetreeconflict/   (props changed)
    subversion/branches/py-tests-as-modules/tools/dev/unix-build/Makefile.svn
    subversion/branches/py-tests-as-modules/tools/server-side/   (props changed)
    subversion/branches/py-tests-as-modules/win-tests.py

Propchange: subversion/branches/py-tests-as-modules/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Sep 15 19:32:26 2010
@@ -17,6 +17,7 @@ autogen-standalone.mk
 autom4te.cache
 gen-make.opts
 tests.log
+fails.log
 db4-win32
 db
 *.o
@@ -27,6 +28,7 @@ apr-util
 apr-iconv
 Release
 Debug
+ipch
 subversion_msvc.dsw
 subversion_msvc.ncb
 subversion_msvc.opt
@@ -34,6 +36,8 @@ subversion_msvc.plg
 subversion_vcnet.sln
 subversion_vcnet.ncb
 subversion_vcnet.suo
+subversion_vcnet.sdf
+subversion_vcnet.opensdf
 mkmf.log
 .project
 .classpath

Propchange: subversion/branches/py-tests-as-modules/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 15 19:32:26 2010
@@ -10,6 +10,7 @@
 /subversion/branches/gnome-keyring:870558-871410
 /subversion/branches/http-protocol-v2:874395-876041
 /subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/issue-2779-dev:965496-984198
 /subversion/branches/issue-2843-dev:871432-874179
 /subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
 /subversion/branches/issue-3067-deleted-subtrees:873375-874084
@@ -20,6 +21,8 @@
 /subversion/branches/kwallet:870785-871314
 /subversion/branches/log-g-performance:870941-871032
 /subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/nfc-nfd-aware-client:870276,870376
+/subversion/branches/performance:983764,983766,984927,985014,985037,985046,985669,987893,995507,995603
 /subversion/branches/ra_serf-digest-authn:875693-876404
 /subversion/branches/reintegrate-improvements:873853-874164
 /subversion/branches/subtree-mergeinfo:876734-878766
@@ -34,3 +37,4 @@
 /subversion/branches/tc_url_rev:874351-874483
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
+/subversion/trunk:956579-997456

Modified: subversion/branches/py-tests-as-modules/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/CHANGES?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/CHANGES (original)
+++ subversion/branches/py-tests-as-modules/CHANGES Wed Sep 15 19:32:26 2010
@@ -1,3 +1,25 @@
+Version 1.6.13
+(?? Sep 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.13
+
+  User-visible changes:
+   * don't drop properties during foreign-repo merges (issue #3623)
+   * improve auto-props failure error message (r961970)
+   * improve error message for 403 status with ra_neon (r876615)
+   * don't allow 'merge --reintegrate' for 2-url merges (r959004)
+   * improve handling of missing fsfs.conf in with hotcopy (r980811, -1449)
+   * escape unsafe characters in a URL during export (issue #3683)
+   * don't leak stale locks in FSFS (r959760)
+   * better detect broken working copies during update over neon (r979045)
+   * make rev files read-only (r981921)
+   * properly canonicalize a URL (r984928, -31)
+
+  Developer-visible changes:
+   * make ruby bindings compatible with Ruby 1.9 (r957507)
+   * use the repos verify API in JavaHL (r948916)
+   * teach ra_serf to parse md5 checksums with update editors (r979429)
+
+
 Version 1.6.12
 (21 Jun 2010, from /branches/1.6.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.6.12
@@ -36,7 +58,7 @@ http://svn.apache.org/repos/asf/subversi
   * make 'svnadmin hotcopy' copy the fsfs config file (r905303)
   * mergeinfo improvements with non-inheritable mergeinfo (issue #3573)
   * make mergeinfo queries not require access to the repo root (issue #3242)
-  * update URLs to refer the the new apache.org repository (r904301, -94)
+  * update URLs to refer the new apache.org repository (r904301, -94)
   * update relative externals during a switch (issue #3390)
   * fix 'merge --reintegrate' with self-referential mergeinfo (r892050, -85)
   * improve wc-ng working copy detection (r929382)

Modified: subversion/branches/py-tests-as-modules/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/COMMITTERS?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/COMMITTERS [UTF-8] (original)
+++ subversion/branches/py-tests-as-modules/COMMITTERS [UTF-8] Wed Sep 15 19:32:26 2010
@@ -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.
@@ -29,7 +29,7 @@ Blanket commit access:
            jaa   Jani Averbach <ja...@iki.fi>
     julianfoad   Julian Foad <ju...@wandisco.com>
   jszakmeister   John Szakmeister <jo...@szakmeister.net>
-           ehu   Erik Hülsmann <e....@gmx.net>
+           ehu   Erik Hülsmann <er...@wandisco.com>
         breser   Ben Reser <be...@reser.org>
           maxb   Max Bowsher <ma...@ukf.net>
        dberlin   Daniel Berlin <db...@dberlin.org>
@@ -143,6 +143,7 @@ Commit access for specific areas:
            esr   Eric S. Raymond <es...@thyrsus.com>           (svncutter)
      gmcdonald   Gavin McDonald <ga...@16degrees.com.au>     (build/hudson,
                                                               tools/buildbot)
+      artagnon   Ramkumar Ramachandra <ar...@gmail.com>   (svnrdump, svntest)
 
   Translation of message files:
 
@@ -178,6 +179,7 @@ giorgio_valoti   Giorgio Valoti <giorgio
        cacknin   Charles Acknin <ch...@gmail.com>    (svnpatch-diff 
                                                               br.)
         holden   Holden Karau <ho...@pigscanfly.ca>         (scheme-bindings br.)
+       stefan2   Stefan Fuhrmann <st...@alice-dsl.de> (performance br.)
 
   Subprojects that are complete, abandoned or have moved elsewhere:
 

Modified: subversion/branches/py-tests-as-modules/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/INSTALL?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/INSTALL (original)
+++ subversion/branches/py-tests-as-modules/INSTALL Wed Sep 15 19:32:26 2010
@@ -450,7 +450,7 @@ I.    INTRODUCTION
 
       If the Simple Authentication and Security Layer (SASL) library
       is detected on your system, then the Subversion client and
-      svnserve server can utilize its abliities for various form of
+      svnserve server can utilize its abilities for various form of
       authentication.  To learn more about SASL or to get the source
       code, visit:
 

Modified: subversion/branches/py-tests-as-modules/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/Makefile.in?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/Makefile.in (original)
+++ subversion/branches/py-tests-as-modules/Makefile.in Wed Sep 15 19:32:26 2010
@@ -168,6 +168,8 @@ SVN_ZLIB_INCLUDES = @SVN_ZLIB_INCLUDES@
 
 MKDIR = @MKDIR@
 
+DOXYGEN = @DOXYGEN@
+
 # The EXTRA_ parameters can be used to pass extra flags at 'make' time.
 CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
 CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
@@ -424,9 +426,9 @@ revision-install:
 install-static: @INSTALL_STATIC_RULES@
 
 # JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-lib @JAVAHL_TESTS_TARGET@
+javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
 install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
-javahl-compat: javahl-compat-java javahl @JAVAHL_COMPAT_TESTS_TARGET@
+javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
 
 clean-javahl:
 	rm -rf $(javahl_java_PATH) $(javahl_javah_PATH) @JAVAHL_OBJDIR@
@@ -435,13 +437,10 @@ clean-javahl:
 	rm -f $(libsvnjavahl_PATH)/*.lo
 	rm -f $(libsvnjavahl_PATH)/*.o
 
-check-javahl-compat: javahl-compat-tests javahl-compat
-	@FIX_JAVAHL_LIB@
-	$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
-
-check-javahl: javahl
+check-javahl: javahl javahl-compat
 	@FIX_JAVAHL_LIB@
 	$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
+	$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
 
 # "make check CLEANUP=true" will clean up directories for successful tests.
 # "make check TESTS=subversion/tests/cmdline/basic_tests.py"
@@ -534,7 +533,7 @@ check-clean:
 	       subversion/tests/libsvn_wc/fake-wc              \
 	       subversion/tests/libsvn_client/test-patch*      \
 	       subversion/tests/svnserveautocheck.pid          \
-	       tests.log
+	       tests.log fails.log
 
 mkdir-init:
 	@list='$(BUILD_DIRS) $(SCHEMA_DIR) doc';         \
@@ -599,7 +598,7 @@ doc: doc-api doc-javahl
 doc-api: mkdir-init
 	( cd $(top_srcdir) && \
 	  sed "s,\(OUTPUT_DIRECTORY *= *\),\1$(abs_builddir)/," \
-	  doc/doxygen.conf | doxygen - )
+	  doc/doxygen.conf | $(DOXYGEN) - )
 
 # Generate API documentation for the JavaHL package.
 doc-javahl:

Modified: subversion/branches/py-tests-as-modules/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build.conf?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build.conf (original)
+++ subversion/branches/py-tests-as-modules/build.conf Wed Sep 15 19:32:26 2010
@@ -54,7 +54,7 @@ private-built-includes =
         subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeResources.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_Path.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_Revision.h
-        subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNAdmin.h
+        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_Version.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
@@ -167,6 +167,14 @@ libs = libsvn_wc libsvn_subr apriconv ap
 install = bin
 manpages = subversion/svnversion/svnversion.1
 
+[svnrdump]
+description = Subversion remote repository dumper and loader
+type = exe
+path = subversion/svnrdump
+libs = libsvn_client libsvn_ra libsvn_repos libsvn_delta libsvn_subr apr
+install = bin
+manpages = subversion/svnrdump/svnrdump.1
+
 # Support for GNOME Keyring
 [libsvn_auth_gnome_keyring]
 description = Subversion GNOME Keyring Library
@@ -272,7 +280,7 @@ msvc-static = yes
 type = ra-module
 path = subversion/libsvn_ra_serf
 install = serf-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr serf gssapi
+libs = libsvn_delta libsvn_subr aprutil apriconv apr serf gssapi xml
 msvc-libs = secur32.lib
 msvc-static = yes
 
@@ -337,7 +345,7 @@ msvc-export = svn_wc.h private\svn_wc_pr
 description = Subversion plug-in for the Apache DAV module
 type = apache-mod
 path = subversion/mod_dav_svn
-sources = *.c reports/*.c
+sources = *.c reports/*.c posts/*.c
 libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr
 nonlibs = apr aprutil
 install = apache-mod
@@ -881,7 +889,7 @@ type = exe
 path = subversion/tests/libsvn_client
 sources = client-test.c
 install = test
-libs = libsvn_test libsvn_client libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr neon
+libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr neon
 
 # ----------------------------------------------------------------------------
 # Tests for libsvn_diff
@@ -1065,7 +1073,7 @@ libs = libsvn_fs_base libsvn_fs_fs
 [__ALL__]
 type = project
 path = build/win32
-libs = svn svnserve svnadmin svnlook svnversion svndumpfilter
+libs = svn svnserve svnadmin svnlook svnversion svnrdump svndumpfilter
        mod_authz_svn mod_dav_svn svnsync
 
 [__ALL_TESTS__]

Modified: subversion/branches/py-tests-as-modules/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/ac-macros/serf.m4?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/ac-macros/serf.m4 (original)
+++ subversion/branches/py-tests-as-modules/build/ac-macros/serf.m4 Wed Sep 15 19:32:26 2010
@@ -27,6 +27,10 @@ AC_DEFUN(SVN_LIB_SERF,
 [
   serf_found=no
 
+  serf_check_major=0
+  serf_check_minor=3
+  serf_check_patch=1
+
   AC_ARG_WITH(serf,AS_HELP_STRING([--with-serf=PREFIX],
                                   [Serf WebDAV client library]),
   [
@@ -40,7 +44,16 @@ AC_DEFUN(SVN_LIB_SERF,
       AC_CHECK_HEADERS(serf.h,[
         save_ldflags="$LDFLAGS"
         LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
-        AC_CHECK_LIB(serf-0, serf_context_create,[serf_found="yes"], ,
+        AC_CHECK_LIB(serf-0, serf_context_create,[
+          AC_TRY_COMPILE([
+#include <stdlib.h>
+#include "serf.h"
+],[
+#if ! SERF_VERSION_AT_LEAST($serf_check_major, $serf_check_minor, $serf_check_patch)
+#error Serf version too old: need $serf_check_major.$serf_check_minor.$serf_check_patch
+#endif
+], [serf_found=yes], [AC_MSG_WARN([Serf version too old: need $serf_check_major.$serf_check_minor.$serf_check_patch])
+        serf_found=no])], ,
           $SVN_APRUTIL_LIBS $SVN_APR_LIBS -lz)
         LDFLAGS="$save_ldflags"])
       CPPFLAGS="$save_cppflags"

Modified: subversion/branches/py-tests-as-modules/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/ac-macros/sqlite.m4?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/py-tests-as-modules/build/ac-macros/sqlite.m4 Wed Sep 15 19:32:26 2010
@@ -190,6 +190,7 @@ SQLITE_VERSION_OKAY
                   AC_DEFINE(SVN_SQLITE_INLINE, 1,
                   [Defined if svn should use the amalgamated version of sqlite])
                   SVN_SQLITE_INCLUDES="-I`dirname $sqlite_amalg`"
+                  SVN_SQLITE_LIBS="-ldl -lpthread"
                   svn_lib_sqlite="yes"],
                  [AC_MSG_RESULT([unsupported amalgamation SQLite version])])
   fi

Modified: subversion/branches/py-tests-as-modules/build/generator/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/generator/build_zlib.ezt?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/generator/build_zlib.ezt (original)
+++ subversion/branches/py-tests-as-modules/build/generator/build_zlib.ezt Wed Sep 15 19:32:26 2010
@@ -43,13 +43,13 @@ if not exist gvmat32c.c    copy contrib\
 if not exist gvmat32.asm   copy contrib\masmx86\gvmat32.asm .
 if not exist inffas32.asm  copy contrib\masmx86\inffas32.asm .[end]
 
-if "%1" == "release" goto release
-if "%1" == "debug" goto debug
+if /i "%1" == "release" goto release
+if /i "%1" == "debug" goto debug
 goto pIerr
 
 :checkrebuild
-if "%2" == "rebuild" goto rebuild
-if "%2" == "clean" goto clean
+if /i "%2" == "rebuild" goto rebuild
+if /i "%2" == "clean" goto clean
 if not "%2" == "" goto pIIerr
 set target= %STATICLIB%
 goto build

Modified: subversion/branches/py-tests-as-modules/build/generator/extractor.py
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/generator/extractor.py?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/generator/extractor.py (original)
+++ subversion/branches/py-tests-as-modules/build/generator/extractor.py Wed Sep 15 19:32:26 2010
@@ -24,7 +24,6 @@
 
 import os
 import re
-import string
 
 #
 # This parses the following two types of declarations:

Modified: subversion/branches/py-tests-as-modules/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/generator/gen_win.py?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/generator/gen_win.py (original)
+++ subversion/branches/py-tests-as-modules/build/generator/gen_win.py Wed Sep 15 19:32:26 2010
@@ -34,6 +34,7 @@ import fnmatch
 import re
 import subprocess
 import glob
+import string
 import generator.swig.header_wrappers
 import generator.swig.checkout_swig_header
 import generator.swig.external_runtime
@@ -79,6 +80,7 @@ class GeneratorBase(gen_base.GeneratorBa
     self.libintl_path = None
     self.zlib_path = 'zlib'
     self.openssl_path = None
+    self.jdk_path = None
     self.junit_path = None
     self.swig_path = None
     self.vs_version = '2002'
@@ -126,6 +128,8 @@ class GeneratorBase(gen_base.GeneratorBa
       elif opt == '--with-libintl':
         self.libintl_path = val
         self.enable_nls = 1
+      elif opt == '--with-jdk':
+        self.jdk_path = val
       elif opt == '--with-junit':
         self.junit_path = val
       elif opt == '--with-zlib':
@@ -833,6 +837,11 @@ class WinGeneratorBase(GeneratorBase):
     if isinstance(target, gen_base.TargetSWIG):
       fakedefines.append("SWIG_GLOBAL")
 
+    # Expect rb_errinfo() to be avilable in Ruby 1.9+,
+    # rather than ruby_errinfo.
+    if (self.ruby_major_version > 1 or self.ruby_minor_version > 8):
+      fakedefines.extend(["HAVE_RB_ERRINFO"])
+
     if cfg == 'Debug':
       fakedefines.extend(["_DEBUG","SVN_DEBUG"])
     elif cfg == 'Release':
@@ -1207,19 +1216,31 @@ class WinGeneratorBase(GeneratorBase):
     "Find the right Ruby library name to link swig bindings with"
     self.ruby_includes = []
     self.ruby_libdir = None
+    self.ruby_version = None
+    self.ruby_major_version = None
+    self.ruby_minor_version = None
     proc = os.popen('ruby -rrbconfig -e ' + escape_shell_arg(
+                    "puts Config::CONFIG['ruby_version'];"
                     "puts Config::CONFIG['LIBRUBY'];"
                     "puts Config::CONFIG['archdir'];"
                     "puts Config::CONFIG['libdir'];"), 'r')
     try:
-      libruby = proc.readline()[:-1]
-      if libruby:
-        msg = 'Found installed ruby.'
-        self.ruby_lib = libruby
-        self.ruby_includes.append(proc.readline()[:-1])
-        self.ruby_libdir = proc.readline()[:-1]
+      rubyver = proc.readline()[:-1]
+      if rubyver:
+        self.ruby_version = rubyver
+        self.ruby_major_version = string.atoi(self.ruby_version[0])
+        self.ruby_minor_version = string.atoi(self.ruby_version[2])
+        libruby = proc.readline()[:-1]
+        if libruby:
+          msg = 'Found installed ruby %s' % rubyver
+          self.ruby_lib = libruby
+          self.ruby_includes.append(proc.readline()[:-1])
+          self.ruby_libdir = proc.readline()[:-1]
       else:
-        msg = 'Could not detect Ruby version.'
+        msg = 'Could not detect Ruby version, assuming 1.8.'
+        self.ruby_version = "1.8"
+        self.ruby_major_version = 1
+        self.ruby_minor_version = 8
         self.ruby_lib = 'msvcrt-ruby18.lib'
       print('%s\n  Ruby bindings will be linked with %s\n'
              % (msg, self.ruby_lib))
@@ -1242,39 +1263,41 @@ class WinGeneratorBase(GeneratorBase):
       pass
 
   def _find_jdk(self):
-    self.jdk_path = None
-    jdk_ver = None
-    try:
+    if not self.jdk_path:
+      jdk_ver = None
       try:
-        # Python >=3.0
-        import winreg
-      except ImportError:
-        # Python <3.0
-        import _winreg as winreg
-      key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
+        try:
+          # Python >=3.0
+          import winreg
+        except ImportError:
+          # Python <3.0
+          import _winreg as winreg
+        key = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
                            r"SOFTWARE\JavaSoft\Java Development Kit")
-      # Find the newest JDK version.
-      num_values = winreg.QueryInfoKey(key)[1]
-      for i in range(num_values):
-        (name, value, key_type) = winreg.EnumValue(key, i)
-        if name == "CurrentVersion":
-          jdk_ver = value
-          break
-
-      # Find the JDK path.
-      if jdk_ver is not None:
-        key = winreg.OpenKey(key, jdk_ver)
+        # Find the newest JDK version.
         num_values = winreg.QueryInfoKey(key)[1]
         for i in range(num_values):
           (name, value, key_type) = winreg.EnumValue(key, i)
-          if name == "JavaHome":
-            self.jdk_path = value
+          if name == "CurrentVersion":
+            jdk_ver = value
             break
-      winreg.CloseKey(key)
-    except (ImportError, EnvironmentError):
-      pass
-    if self.jdk_path:
-      print("Found JDK version %s in %s\n" % (jdk_ver, self.jdk_path))
+
+        # Find the JDK path.
+        if jdk_ver is not None:
+          key = winreg.OpenKey(key, jdk_ver)
+          num_values = winreg.QueryInfoKey(key)[1]
+          for i in range(num_values):
+            (name, value, key_type) = winreg.EnumValue(key, i)
+            if name == "JavaHome":
+              self.jdk_path = value
+              break
+        winreg.CloseKey(key)
+      except (ImportError, EnvironmentError):
+        pass
+      if self.jdk_path:
+        print("Found JDK version %s in %s\n" % (jdk_ver, self.jdk_path))
+    else:
+      print("Using JDK in %s\n" % (self.jdk_path))
 
   def _find_swig(self):
     # Require 1.3.24. If not found, assume 1.3.25.

Modified: subversion/branches/py-tests-as-modules/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/generator/templates/vcnet_vcxproj.ezt?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/py-tests-as-modules/build/generator/templates/vcnet_vcxproj.ezt Wed Sep 15 19:32:26 2010
@@ -67,6 +67,7 @@
       <AdditionalLibraryDirectories>[for configs.libdirs][configs.libdirs];[end]%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
+      <EnableUAC>true</EnableUAC>
 [is configs.name "Debug"]      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
 [else]      <OptimizeReferences>true</OptimizeReferences>
 [end]    </Link>

Modified: subversion/branches/py-tests-as-modules/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/run_tests.py?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/run_tests.py (original)
+++ subversion/branches/py-tests-as-modules/build/run_tests.py Wed Sep 15 19:32:26 2010
@@ -44,7 +44,7 @@ separated list of test numbers; the defa
 # A few useful constants
 LINE_LENGTH = 45
 
-import os, sys, subprocess, imp
+import os, re, subprocess, sys, imp
 from datetime import datetime
 
 import getopt
@@ -70,7 +70,7 @@ class TestHarness:
   '''Test harness for Subversion tests.
   '''
 
-  def __init__(self, abs_srcdir, abs_builddir, logfile,
+  def __init__(self, abs_srcdir, abs_builddir, logfile, faillogfile,
                base_url=None, fs_type=None, http_library=None,
                server_minor_version=None, verbose=None,
                cleanup=None, enable_sasl=None, parallel=None, config_file=None,
@@ -91,6 +91,7 @@ class TestHarness:
     self.srcdir = abs_srcdir
     self.builddir = abs_builddir
     self.logfile = logfile
+    self.faillogfile = faillogfile
     self.base_url = base_url
     self.fs_type = fs_type
     self.http_library = http_library
@@ -200,6 +201,27 @@ class TestHarness:
       print('  %d test%s FAILED'
             % (len(failed_list), 's'*min(len(failed_list) - 1, 1)))
 
+    # Copy the truly interesting verbose logs to a separate file, for easier
+    # viewing.
+    if xpassed or failed_list:
+      faillog = open(self.faillogfile, 'wb')
+      last_start_lineno = None
+      last_start_re = re.compile('^(FAIL|SKIP|XFAIL|PASS|START|CLEANUP|END):')
+      for lineno, line in enumerate(log_lines):
+        # Iterate the lines.  If it ends a test we're interested in, dump that
+        # test to FAILLOG.  If it starts a test (at all), remember the line
+        # number (in case we need it later).
+        if line in xpassed or line in failed_list:
+          faillog.write('[[[\n')
+          faillog.writelines(log_lines[last_start_lineno : lineno+1])
+          faillog.write(']]]\n\n')
+        if last_start_re.match(line):
+          last_start_lineno = lineno + 1
+      faillog.close()
+    elif os.path.exists(self.faillogfile):
+      print("WARNING: no failures, but '%s' exists from a previous run."
+            % self.faillogfile)
+
     self._close_log()
     return failed
 
@@ -228,6 +250,7 @@ class TestHarness:
                  '--srcdir=' + os.path.join(self.srcdir, progdir)]
       if self.config_file is not None:
         cmdline.append('--config-file=' + self.config_file)
+      cmdline.append('--trap-assertion-failures')
     else:
       print('Don\'t know what to do about ' + progbase)
       sys.exit(1)
@@ -467,10 +490,12 @@ def main():
 
   if log_to_stdout:
     logfile = None
+    faillogfile = None
   else:
     logfile = os.path.abspath('tests.log')
+    faillogfile = os.path.abspath('fails.log')
 
-  th = TestHarness(args[0], args[1], logfile,
+  th = TestHarness(args[0], args[1], logfile, faillogfile,
                    base_url, fs_type, http_library, server_minor_version,
                    verbose, cleanup, enable_sasl, parallel, config_file,
                    fsfs_sharding, fsfs_packing)

Modified: subversion/branches/py-tests-as-modules/build/transform_libtool_scripts.sh
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/transform_libtool_scripts.sh?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/transform_libtool_scripts.sh (original)
+++ subversion/branches/py-tests-as-modules/build/transform_libtool_scripts.sh Wed Sep 15 19:32:26 2010
@@ -102,6 +102,7 @@ $2" "$3" > "$3.new"
 current_directory="$(pwd)"
 for libtool_script in $executables $tests; do
   eval "libtool_script_path=\$${libtool_script}_path"
+  libtool_script_libraries=""
   if [ -f "$libtool_script_path" ]; then
     if { grep LD_LIBRARY_PATH "$libtool_script_path" && ! grep LD_PRELOAD "$libtool_script_path"; } > /dev/null; then
       echo "Transforming $libtool_script_path"

Modified: subversion/branches/py-tests-as-modules/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/configure.ac?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/configure.ac (original)
+++ subversion/branches/py-tests-as-modules/configure.ac Wed Sep 15 19:32:26 2010
@@ -153,7 +153,7 @@ SVN_FIND_APACHE(20020903)
 
 dnl Search for SQLite
 SQLITE_MINIMUM_VER="3.4.0"
-SQLITE_RECOMMENDED_VER="3.6.17"
+SQLITE_RECOMMENDED_VER="3.7.2"
 SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER}.tar.gz"
 SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
                ${SQLITE_URL})
@@ -332,6 +332,21 @@ else
     AC_SUBST(TRANG)
 fi
 
+dnl Check for doxygen
+doxygen=yes
+AC_ARG_WITH(doxygen,
+AC_HELP_STRING([--with-doxygen=PATH],
+               [Specify the command to run doxygen]),
+[
+    doxygen="$withval"
+])
+if test "$doxygen" = "yes"; then
+    AC_PATH_PROG(DOXYGEN, doxygen, none)
+else
+    DOXYGEN="$doxygen"
+    AC_SUBST(DOXYGEN)
+fi
+
 
 dnl Check for libraries --------------------
 
@@ -804,7 +819,10 @@ dnl Use -Wl,--no-undefined during linkin
 AC_ARG_ENABLE(disallowing-of-undefined-references,
   [AS_HELP_STRING([--enable-disallowing-of-undefined-references],
                   [Use -Wl,--no-undefined flag during linking of some libraries to disallow undefined references])])
-if test "$enable_disallowing_of_undefined_references" = "yes"; then
+if test "$enable_disallowing_of_undefined_references" != "yes" && test "`uname`" != "Linux"; then
+  enable_disallowing_of_undefined_references="no"
+fi
+if test "$enable_disallowing_of_undefined_references" != "no"; then
   AC_MSG_CHECKING([for -Wl,--no-undefined])
   old_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS -Wl,--no-undefined"
@@ -818,7 +836,9 @@ if test "$enable_disallowing_of_undefine
     done
   else
     AC_MSG_RESULT([no])
-    AC_MSG_ERROR([--enable-disallowing-of-undefined-references explicitly requested, but -Wl,--no-undefined not supported])
+    if test "$enable_disallowing_of_undefined_references" = "yes"; then
+      AC_MSG_ERROR([--enable-disallowing-of-undefined-references explicitly requested, but -Wl,--no-undefined not supported])
+    fi
   fi
 fi
 AC_SUBST([libsvn_auth_gnome_keyring_LDFLAGS])
@@ -882,6 +902,9 @@ AS_HELP_STRING([--enable-maintainer-mode
         CFLAGS="-Wold-style-definition $CFLAGS_KEEP"
         AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
 
+        CFLAGS="-Wno-system-headers $CFLAGS_KEEP"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
+
         AC_LANG_POP([C])
         CFLAGS="$CFLAGS_KEEP"
       fi
@@ -937,16 +960,16 @@ AS_HELP_STRING([--with-editor=PATH],
 
 SVN_LIB_Z
 
-MOD_ACTIVATION="-a"
+MOD_ACTIVATION=""
 AC_ARG_ENABLE(mod-activation,
-AS_HELP_STRING([--disable-mod-activation],
-               [Do not enable mod_dav_svn in httpd.conf]),
+AS_HELP_STRING([--enable-mod-activation],
+               [Enable mod_dav_svn in httpd.conf]),
 [
-    if test "$enableval" = "no" ; then
-      MOD_ACTIVATION=""
-      AC_MSG_NOTICE([Disabling apache module activation])
-    else
+    if test "$enableval" = "yes" ; then
+      MOD_ACTIVATION="-a"
       AC_MSG_NOTICE([Enabling apache module activation])
+    else
+      AC_MSG_NOTICE([Disabling apache module activation])
     fi
 ])
 AC_SUBST(MOD_ACTIVATION)

Modified: subversion/branches/py-tests-as-modules/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/contrib/server-side/fsfsverify.py?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/contrib/server-side/fsfsverify.py (original)
+++ subversion/branches/py-tests-as-modules/contrib/server-side/fsfsverify.py Wed Sep 15 19:32:26 2010
@@ -675,11 +675,13 @@ class NodeRev(object):
       elif field == 'pred':
         self.pred = NodeId(value)
       elif field == 'text':
-        (rev, offset, length, size, digest) = value.split(' ')
-        rev = int(rev)
-        offset = int(offset)
-        length = int(length)
-        size = int(size)
+        values = value.split(' ')
+        rev = int(values[0])
+        offset = int(values[1])
+        length = int(values[2])
+        size = int(values[3])
+        digest = values[4]
+        # TODO SHA1 digest
 
         if rev != currentRev:
           contentType = None

Modified: subversion/branches/py-tests-as-modules/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/gen-make.py?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/gen-make.py (original)
+++ subversion/branches/py-tests-as-modules/gen-make.py Wed Sep 15 19:32:26 2010
@@ -167,6 +167,9 @@ def _usage_exit():
   print("           tell neon to look for ZLib headers and")
   print("           libs in DIR")
   print("")
+  print("  --with-jdk=DIR")
+  print("           look for the java development kit here")
+  print("")
   print("  --with-junit=DIR")
   print("           look for the junit jar here")
   print("           junit is for testing the java bindings")
@@ -241,6 +244,7 @@ if __name__ == '__main__':
                             'with-libintl=',
                             'with-openssl=',
                             'with-zlib=',
+                            'with-jdk=',
                             'with-junit=',
                             'with-swig=',
                             'with-sqlite=',

Modified: subversion/branches/py-tests-as-modules/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/get-deps.sh?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/get-deps.sh (original)
+++ subversion/branches/py-tests-as-modules/get-deps.sh Wed Sep 15 19:32:26 2010
@@ -28,7 +28,7 @@ APR_UTIL=apr-util-1.3.9
 NEON=neon-0.29.0
 SERF=serf-0.6.1
 ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.6.20
+SQLITE_VERSION=3.7.2
 SQLITE=sqlite-amalgamation-$SQLITE_VERSION
 
 HTTPD=httpd-2.2.14

Modified: subversion/branches/py-tests-as-modules/notes/unicode-composition-for-filenames
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/notes/unicode-composition-for-filenames?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/notes/unicode-composition-for-filenames (original)
+++ subversion/branches/py-tests-as-modules/notes/unicode-composition-for-filenames Wed Sep 15 19:32:26 2010
@@ -251,6 +251,32 @@ Implementing option (4) means:
     communicate with the server.
 
 
+The above means the client has to be very carefull to preserve the
+encoding from the server and use that when talking to the server
+otherwise the server may not recognize the path as a versioned entity.
+
+Locally however, we can't be sure the filesystem enforces the encoding
+the server sent to the client, meaning there are (contrived) cases where
+a file exists in a different encoding locally than in the repository.
+Which means we have to be very carefull about how we find our files and
+to use the encoding we got from the local filesystem.
+
+Implementation details:
+
+ * The hash keys in svn_wc_adm_access_t's are hashed on the normalized
+   path encoding, not the repository path, in order to be able to
+   calculate the hash key from both the wc path as well as the repo path
+ * The same line of reasoning applies to the hash keys in the entries hash
+
+New conventions:
+ * variables containing a path as encoded in the local filesystem
+   should contain the (sub)string 'wc_path'
+ * variables containing a path as encoded in the repository should
+   contain the (sub)string 'repo_path'
+
+
+
+
 References
 ==========
 

Modified: subversion/branches/py-tests-as-modules/notes/wc-ng/conflict-storage
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/notes/wc-ng/conflict-storage?rev=997472&r1=997471&r2=997472&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/notes/wc-ng/conflict-storage (original)
+++ subversion/branches/py-tests-as-modules/notes/wc-ng/conflict-storage Wed Sep 15 19:32:26 2010
@@ -48,6 +48,16 @@ equivalent in wc-ng conflict storage (su
 but this information can be deduced from the information stored
 (e.g. conflict-old and friends; foo.r42 is now 'foo' + '.r' + left_rev)
 
+### BH: We have to store the exact name of the conflict marker files. If we
+### just 'guess' how conflict markers are named by using their revision
+### numbers, we can't handle situations where there are existing files with
+### these names. The WC-1.0 code uses a unique name function to generate a
+### unique marker file name which happens to match this pattern if there are
+### no conflicts, but sometimes explicitly preserves the existing file
+### extension to help diff tools. (See 'preserved-conflict-file-exts' in our
+### config). I think we can move the names of the markers into the skel and/or
+### keep them in their own columns. (These names are needed on filling a
+### svn_wc_entry_t)
 
 Operation skel
 --------------
@@ -256,19 +266,23 @@ is the failure to find a match for a hun
 There can be one or more reject conflicts on a node. Each "reject" conflict
 has the following form:
 
-  ("reject" HUNK_ORIGINAL_OFFSET HUNK_ORIGINAL_LEN
-    HUNK_MODIFIED_OFFSET HUNK_MODIFIED_LENGTH
-    REJECT_DIFF_SHA1)
+  REJECTED_HUNK_LIST := (HUNK_ORIGINAL_OFFSET HUNK_ORIGINAL_LENGTH
+                         HUNK_MODIFIED_OFFSET HUNK_MODIFIED_LENGTH)*
+
+  ("reject" REJECT_FILE TARGET_PATCH_SHA1 REJECTED_HUNK_LIST)
+
+REJECT_FILE is ...
+
+TARGET_PATCH_SHA1 is <selection of patch file applying to target>
+the sha1 of the unidiff content of the rejected
+hunk as written to the .svnpatch.rej file. The actual unidiff content
+(which can be large!) can be retrieved from the pristine store.
 
 HUNK_{ORIGINAL,MODIFIED}_OFFSET and HUNK_{ORIGINAL,MODIFIED}_LENGTH
 are the hunk header values as parsed from the patch file (i.e. the "ID"
 of the hunk within the patch file). These also occur in the reject
 diff text but are stored here for easy retrieval.
 
-REJECT_DIFF_SHA1 is the sha1 of the unidiff content of the rejected
-hunk as written to the .svnpatch.rej file. The actual unidiff content
-(which can be large!) can be retrieved from the pristine store.
-
 ### BH: Using a sha1 here, makes it impossible to cleanup the pristine store
 ###     The pristine store needs all references to be stored in a DB column.
 ###     To support this we would need an extra table.
@@ -277,3 +291,6 @@ hunk as written to the .svnpatch.rej fil
 ###   the user deletes the tempfile would be nice. And I don't see an issue
 ###   with also storing the SHA1 sum in the ACTUAL table. We do this for
 ###   text conflicts as well. Why would it need an extra table?
+
+  ("prop-reject" REJECT_FILE
+   (PROPERTY_NAME TARGET_PATCH_SHA1 REJECTED_HUNK_LIST)* )