subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1031230 [1/21] - in /subversion/branches/py-tests-as-modules: ./ build/ build/ac-macros/ build/win32/ contrib/client-side/ notes/ notes/http-and-webdav/ notes/wc-ng/ subversion/bindings/ctypes-python/csvn/ subversion/bindings/javahl/native...
Date Thu, 04 Nov 2010 20:48:30 GMT
Author: hwright
Date: Thu Nov  4 20:48:21 2010
New Revision: 1031230

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

(I do plan on getting this into a mergable state.)

Added:
    subversion/branches/py-tests-as-modules/notes/wc-ng/nodes
      - copied unchanged from r1031209, subversion/trunk/notes/wc-ng/nodes
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
      - copied unchanged from r1031209, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra/debug_reporter.c
      - copied unchanged from r1031209, subversion/trunk/subversion/libsvn_ra/debug_reporter.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra/debug_reporter.h
      - copied unchanged from r1031209, subversion/trunk/subversion/libsvn_ra/debug_reporter.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/load-fs-vtable.c
      - copied unchanged from r1031209, subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/py-tests-as-modules/subversion/svn/relocate-cmd.c
      - copied unchanged from r1031209, subversion/trunk/subversion/svn/relocate-cmd.c
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/atomic-ra-revprop-change.c
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/atomic-ra-revprop-change.c
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/copy-bad-line-endings.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/copy-bad-line-endings.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/copy-bad-line-endings.expected.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/copy-bad-line-endings.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/copy-from-previous-version-and-modify.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/copy-from-previous-version-and-modify.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/copy-parent-modify-prop.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/copy-parent-modify-prop.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/descend-into-replace.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/descend-into-replace.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/descend-into-replace.expected.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/descend-into-replace.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/dir-prop-change.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/dir-prop-change.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/modified-in-place.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/modified-in-place.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/move-and-modify.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/move-and-modify.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/no-author.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/no-author.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/repo-with-copy-of-root-dir.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/repo-with-copy-of-root-dir.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/revprops.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/revprops.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/tag-empty-trunk.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/tag-empty-trunk.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file2.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/tag-trunk-with-file2.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests_data/url-encoding-bug.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/url-encoding-bug.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/delete-revprops.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/delete-revprops.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests_data/delete-revprops.expected.dump
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/delete-revprops.expected.dump
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/upgrade_tests_data/dirs-only.tar.bz2
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/dirs-only.tar.bz2
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_wc/op-depth-test.c
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_wc/utils.c
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/libsvn_wc/utils.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_wc/utils.h
      - copied unchanged from r1031209, subversion/trunk/subversion/tests/libsvn_wc/utils.h
    subversion/branches/py-tests-as-modules/tools/dist/collect_sigs.py
      - copied unchanged from r1031209, subversion/trunk/tools/dist/collect_sigs.py
Removed:
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info2.java
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/README
    subversion/branches/py-tests-as-modules/build.conf
    subversion/branches/py-tests-as-modules/build/ac-macros/gssapi.m4
    subversion/branches/py-tests-as-modules/build/ac-macros/java.m4
    subversion/branches/py-tests-as-modules/build/ac-macros/kwallet.m4
    subversion/branches/py-tests-as-modules/build/ac-macros/neon.m4
    subversion/branches/py-tests-as-modules/build/ac-macros/swig.m4
    subversion/branches/py-tests-as-modules/build/run_ctypesgen.sh
    subversion/branches/py-tests-as-modules/build/transform_libtool_scripts.sh
    subversion/branches/py-tests-as-modules/build/win32/   (props changed)
    subversion/branches/py-tests-as-modules/configure.ac
    subversion/branches/py-tests-as-modules/contrib/client-side/svn_apply_autoprops.py
    subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-protocol
    subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-usage.html
    subversion/branches/py-tests-as-modules/notes/subversion-design.html
    subversion/branches/py-tests-as-modules/notes/wc-ng/copying
    subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/repos.py
    subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/wc.py
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/BlameCallback.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.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/File.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/InfoCallback.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.h
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/LogMessageCallback.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ProplistCallback.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
    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/SVNRepos.cpp
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/Targets.cpp
    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/ISVNClient.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/InfoCallback.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
    subversion/branches/py-tests-as-modules/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.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/SVNReposTests.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/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/py-tests-as-modules/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
    subversion/branches/py-tests-as-modules/subversion/include/mod_dav_svn.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_dav_protocol.h
    subversion/branches/py-tests-as-modules/subversion/include/private/svn_sqlite.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_opt.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_string.h
    subversion/branches/py-tests-as-modules/subversion/include/svn_subst.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_auth_gnome_keyring/gnome_keyring.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_auth_kwallet/kwallet.cpp
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/add.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/blame.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_client/checkout.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/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/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/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/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/resolved.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/util.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_delta/svndiff.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_diff/diff_file.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_diff/parse-diff.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs/access.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/lock.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/revs-txns.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_base/tree.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/caching.c
    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/lock.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_fs_fs/tree.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_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/mergeinfo.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/commit.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/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_svn/client.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_ra_svn/editorp.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_ra_svn/ra_svn.h
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/authz.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/delta.c
    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/hooks.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/load.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/log.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_repos/node_tree.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_repos/rev_hunt.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/auth.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/cache-memcache.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/checksum.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/config_file.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/config_impl.h
    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/error.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/io.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_subr/log.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/sqlite.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_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_ops.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/conflicts.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/copy.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/deprecated.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/entries.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/relocate.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/update_editor.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/upgrade.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/workqueue.c
    subversion/branches/py-tests-as-modules/subversion/libsvn_wc/workqueue.h
    subversion/branches/py-tests-as-modules/subversion/mod_authz_svn/INSTALL
    subversion/branches/py-tests-as-modules/subversion/mod_authz_svn/mod_authz_svn.c
    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/lock.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/mirror.c
    subversion/branches/py-tests-as-modules/subversion/mod_dav_svn/mod_dav_svn.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/cl.h
    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/export-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/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/propget-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/proplist-cmd.c
    subversion/branches/py-tests-as-modules/subversion/svn/props.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/schema/info.rnc
    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/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/svnrdump/dump_editor.c
    subversion/branches/py-tests-as-modules/subversion/svnrdump/dump_editor.h
    subversion/branches/py-tests-as-modules/subversion/svnrdump/load_editor.c
    subversion/branches/py-tests-as-modules/subversion/svnrdump/load_editor.h
    subversion/branches/py-tests-as-modules/subversion/svnrdump/svnrdump.c
    subversion/branches/py-tests-as-modules/subversion/svnserve/cyrus_auth.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/svnserve/server.h
    subversion/branches/py-tests-as-modules/subversion/svnsync/main.c
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/   (props changed)
    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/blame_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/copy_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/diff_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/export_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
    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/getopt_tests_data/svn_help_stdout
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/info_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/input_validation_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/lock_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/log_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/mergeinfo_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/special_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/stat_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/py-tests-as-modules/subversion/tests/cmdline/svntest/main.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/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/client-test.c
    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-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_fs_base/strings-reps-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_repos/repos-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_subr/config-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/string-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_subr/target-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_subr/translate-test.c
    subversion/branches/py-tests-as-modules/subversion/tests/libsvn_wc/   (props changed)
    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_main.c
    subversion/branches/py-tests-as-modules/tools/client-side/svnmucc/svnmucc-test.py
    subversion/branches/py-tests-as-modules/tools/client-side/svnmucc/svnmucc.c
    subversion/branches/py-tests-as-modules/tools/dev/contribulyze.py
    subversion/branches/py-tests-as-modules/tools/dev/unix-build/Makefile.svn
    subversion/branches/py-tests-as-modules/tools/dev/wc-format.py
    subversion/branches/py-tests-as-modules/tools/diff/diff.c
    subversion/branches/py-tests-as-modules/tools/diff/diff3.c
    subversion/branches/py-tests-as-modules/tools/diff/diff4.c
    subversion/branches/py-tests-as-modules/tools/hook-scripts/svnperms.conf.example
    subversion/branches/py-tests-as-modules/tools/hook-scripts/svnperms.py
    subversion/branches/py-tests-as-modules/tools/server-side/svn-rep-sharing-stats.c
    subversion/branches/py-tests-as-modules/win-tests.py

Propchange: subversion/branches/py-tests-as-modules/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov  4 20:48:21 2010
@@ -1,4 +1,5 @@
 /subversion/branches/1.5.x-r30215:870312
+/subversion/branches/atomic-revprop:965046-1000689
 /subversion/branches/bdb-reverse-deltas:872050-872529
 /subversion/branches/diff-callbacks3:870059-870761
 /subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
@@ -22,7 +23,7 @@
 /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/performance:982355,983764,983766,984927,984984,985014,985037,985046,985472,985477,985482,985500,985606,985669,987888,987893,995507,995603,1001413,1025660,1028092,1028094,1028104,1029038,1029042,1029090
 /subversion/branches/ra_serf-digest-authn:875693-876404
 /subversion/branches/reintegrate-improvements:873853-874164
 /subversion/branches/subtree-mergeinfo:876734-878766
@@ -37,4 +38,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
+/subversion/trunk:956579-1031209

Modified: subversion/branches/py-tests-as-modules/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/CHANGES?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/CHANGES (original)
+++ subversion/branches/py-tests-as-modules/CHANGES Thu Nov  4 20:48:21 2010
@@ -1,5 +1,5 @@
 Version 1.6.13
-(?? Sep 2010, from /branches/1.6.x)
+(01 Oct 2010, from /branches/1.6.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.6.13
 
   User-visible changes:
@@ -7,17 +7,29 @@ http://svn.apache.org/repos/asf/subversi
    * 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)
+   * improve handling of missing fsfs.conf during 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)
+   * better detect broken working copies during update over ra_neon (r979045)
+   * fsfs: make rev files read-only (r981921)
    * properly canonicalize a URL (r984928, -31)
+   * fix wc corruption with 'commit --depth=empty' (issue #3700)
+   * permissions fixes when doing reintegrate merges (related to issue #3242)
+   * fix mergeinfo miscalculation during 2-url merges (issue #3648)
+   * fix error transmission problems in svnserve (r997457, -66)
+   * fixed: record-only merges create self-referential mergeinfo (issue #3646)
+   * fixed: 'SVNPathAuthz short_circuit' unsolicited read access (issue #3695)
+            See CVE-2010-3315, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2010-3315-advisory.txt
+   * make 'svnmucc propset' handle existing and non-existing URLs (r1000607)
+   * add new 'propsetf' subcommand to svnmucc (r1000612)
+   * warn about copied dirs during 'svn ci' with limited depth (r1002094)
 
   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)
+   * let ra_serf work with current serf releases (r879757, r880320, r943796)
 
 
 Version 1.6.12

Modified: subversion/branches/py-tests-as-modules/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/COMMITTERS?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/COMMITTERS [UTF-8] (original)
+++ subversion/branches/py-tests-as-modules/COMMITTERS [UTF-8] Thu Nov  4 20:48:21 2010
@@ -49,7 +49,7 @@ Blanket commit access:
       danielsh   Daniel Shahaf <d.s@daniel.shahaf.name>
         peters   Peter Samuelson <peter@p12n.org>
       rhuijben   Bert Huijben <rhuijben@collab.net>
-      stylesen   Senthil Kumaran S <senthil@collab.net>
+      stylesen   Senthil Kumaran S <stylesen@gmail.com>
      steveking   Stefan K√ľng <tortoisesvn@gmail.com>
          neels   Neels J. Hofmeyr <neels@elego.de>
      jwhitlock   Jeremy Whitlock <jcscoobyrs@gmail.com>

Modified: subversion/branches/py-tests-as-modules/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/INSTALL?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/INSTALL (original)
+++ subversion/branches/py-tests-as-modules/INSTALL Thu Nov  4 20:48:21 2010
@@ -1421,7 +1421,7 @@ III.  BUILDING A SUBVERSION SERVER
       To run the regression test suite for networked Subversion, see
       the instructions in subversion/tests/cmdline/README.
       For advice about tracing problems, see "Debugging the server" in
-      www/hacking.html.
+      http://subversion.apache.org/docs/community-guide/.
 
 
   E.  Alternative:  'svnserve' and ra_svn

Modified: subversion/branches/py-tests-as-modules/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/Makefile.in?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/Makefile.in (original)
+++ subversion/branches/py-tests-as-modules/Makefile.in Thu Nov  4 20:48:21 2010
@@ -490,12 +490,12 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 
 # First, set up Apache as documented in
 # subversion/tests/cmdline/README.
-davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
 	@$(MAKE) check BASE_URL=http://localhost
 
 # Automatically configure and run Apache httpd on a random port, and then
 # run make check.
-davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
 	@APXS=$(APXS) bash $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
 
 # First, run:

Modified: subversion/branches/py-tests-as-modules/README
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/README?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/README (original)
+++ subversion/branches/py-tests-as-modules/README Thu Nov  4 20:48:21 2010
@@ -45,8 +45,9 @@ II.   DOCUMENTATION
 
 III.  PARTICIPATING IN THE SUBVERSION COMMUNITY
 
-      First, read www/hacking.html!  It describes Subversion coding and
-      log message standards, as well as how to join discussion lists.
+      First, read http://subversion.apache.org/docs/community-guide/
+      It describes Subversion coding and log message standards, as well
+      as how to join discussion lists.
 
       Talk on IRC with developers:  irc.freenode.net, channel #svn-dev.
 

Modified: subversion/branches/py-tests-as-modules/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build.conf?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build.conf (original)
+++ subversion/branches/py-tests-as-modules/build.conf Thu Nov  4 20:48:21 2010
@@ -945,7 +945,7 @@ libs = libsvn_test libsvn_wc libsvn_subr
 description = Test the wc-ng pristine text storage subsystem
 type = exe
 path = subversion/tests/libsvn_wc
-sources = pristine-store-test.c
+sources = pristine-store-test.c utils.c
 install = test
 libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
 
@@ -957,6 +957,14 @@ sources = entries-compat.c
 install = test
 libs = libsvn_test libsvn_wc libsvn_subr apriconv apr
 
+[op-depth-test]
+description = Test the main WC API functions
+type = exe
+path = subversion/tests/libsvn_wc
+sources = op-depth-test.c utils.c
+install = test
+libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+
 # ----------------------------------------------------------------------------
 # These are not unit tests at all, they are small programs that exercise
 # parts of the libsvn_delta API from the command line.  They are stuck here
@@ -989,6 +997,15 @@ install = test
 libs = libsvn_wc libsvn_subr apriconv apr
 testing = skip
 
+[atomic-ra-revprop-change]
+type = exe
+path = subversion/tests/cmdline
+sources = atomic-ra-revprop-change.c
+install = test
+libs = libsvn_ra libsvn_subr apriconv apr
+testing = skip
+
+
 
 # ----------------------------------------------------------------------------
 #
@@ -1090,10 +1107,10 @@ libs = __ALL__
        diff-diff3-test
        ra-local-test
        svndiff-test vdelta-test
-       entries-dump
+       entries-dump atomic-ra-revprop-change
        diff-test diff3-test diff4-test
        client-test
-       tree-conflict-data-test db-test pristine-store-test entries-compat-test
+       tree-conflict-data-test db-test pristine-store-test entries-compat-test op-depth-test
        dirent_uri-test
        auth-test
        parse-diff-test

Modified: subversion/branches/py-tests-as-modules/build/ac-macros/gssapi.m4
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/ac-macros/gssapi.m4?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/ac-macros/gssapi.m4 (original)
+++ subversion/branches/py-tests-as-modules/build/ac-macros/gssapi.m4 Thu Nov  4 20:48:21 2010
@@ -58,10 +58,10 @@ AC_DEFUN(SVN_LIB_RA_SERF_GSSAPI,
       CPPFLAGS="$CPPFLAGS $SVN_GSSAPI_INCLUDES"
       CFLAGS="$old_CFLAGS"
       LIBS="$LIBS $SVN_GSSAPI_LIBS"
-      AC_LINK_IFELSE([
+      AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <gssapi.h>
 int main()
-{gss_init_sec_context(NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL);}],
+{gss_init_sec_context(NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL);}]])],
         svn_lib_gssapi="yes", svn_lib_gssapi="no")
       if test "$svn_lib_gssapi" = "yes"; then
         AC_MSG_RESULT([yes])

Modified: subversion/branches/py-tests-as-modules/build/ac-macros/java.m4
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/ac-macros/java.m4?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/ac-macros/java.m4 (original)
+++ subversion/branches/py-tests-as-modules/build/ac-macros/java.m4 Thu Nov  4 20:48:21 2010
@@ -82,20 +82,48 @@ AC_DEFUN(SVN_FIND_JDK,
   dnl /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Commands
   dnl See http://developer.apple.com/qa/qa2001/qa1170.html
   os_arch="`uname`"
+  if test "$os_arch" = "Darwin"; then
+    OSX_VER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
+
+    if test "$OSX_VER" = "10.4"; then
+      dnl For OS X 10.4, the SDK version is 10.4u instead of 10.4.
+      OSX_VER = "$OSX_VERu"
+    fi
+
+    OSX_SYS_JAVA_FRAMEWORK="/System/Library/Frameworks/JavaVM.framework"
+    OSX_SDK_JAVA_FRAMEWORK="/Developer/SDKs/MacOSX$OSX_VER.sdk/System/Library"
+    OSX_SDK_JAVA_FRAMEWORK="$OSX_SDK_JAVA_FRAMEWORK/Frameworks/JavaVM.framework"
+  fi
+
   if test "$os_arch" = "Darwin" && test "$JDK" = "/usr" &&
      test -d "/Library/Java/Home"; then
-      JDK="/Library/Java/Home"
+    JDK="/Library/Java/Home"
   fi
+
   if test "$os_arch" = "Darwin" && test "$JDK" = "/Library/Java/Home"; then
-      JRE_LIB_DIR="/System/Library/Frameworks/JavaVM.framework/Classes"
+    JRE_LIB_DIR="$OSX_SYS_JAVA_FRAMEWORK/Classes"
   else
-      JRE_LIB_DIR="$JDK/jre/lib"
+    JRE_LIB_DIR="$JDK/jre/lib"
   fi
 
   if test -f "$JDK/include/jni.h"; then
     dnl This *must* be fully expanded, or we'll have problems later in find.
     JNI_INCLUDEDIR="$JDK/include"
     JDK_SUITABLE=yes
+  elif test "$os_arch" = "Darwin" && test -e "$JDK/Headers/jni.h"; then
+    dnl Search the Headers directory in the JDK
+    JNI_INCLUDEDIR="$JDK/Headers"
+    JDK_SUITABLE=yes
+  elif test "$os_arch" = "Darwin" &&
+       test -e "$OSX_SYS_JAVA_FRAMEWORK/Headers/jni.h"; then
+    dnl Search the System framework's Headers directory
+    JNI_INCLUDEDIR="$OSX_SYS_JAVA_FRAMEWORK/Headers"
+    JDK_SUITABLE=yes
+  elif test "$os_arch" = "Darwin" &&
+       test -e "$OSX_SDK_JAVA_FRAMEWORK/Headers/jni.h"; then
+    dnl Search the SDK's System framework's Headers directory
+    JNI_INCLUDEDIR="$OSX_SDK_JAVA_FRAMEWORK/Headers"
+    JDK_SUITABLE=yes
   else
     AC_MSG_WARN([no JNI header files found.])
     if test "$os_arch" = "Darwin"; then
@@ -103,7 +131,7 @@ AC_DEFUN(SVN_FIND_JDK,
     fi
     JDK_SUITABLE=no
   fi
-  AC_MSG_RESULT([$JDK_SUITABLE])
+  AC_MSG_RESULT([$JNI_INCLUDEDIR/jni.h])
 
   if test "$JDK_SUITABLE" = "yes"; then
     JAVA_BIN='$(JDK)/bin'

Modified: subversion/branches/py-tests-as-modules/build/ac-macros/kwallet.m4
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/ac-macros/kwallet.m4?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/ac-macros/kwallet.m4 (original)
+++ subversion/branches/py-tests-as-modules/build/ac-macros/kwallet.m4 Thu Nov  4 20:48:21 2010
@@ -74,10 +74,10 @@ AC_DEFUN(SVN_LIB_KWALLET,
                   kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
                   LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
                   AC_LANG(C++)
-                  AC_LINK_IFELSE([
+                  AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <kwallet.h>
 int main()
-{KWallet::Wallet::walletList();}], svn_lib_kwallet="yes", svn_lib_kwallet="no")
+{KWallet::Wallet::walletList();}]])], svn_lib_kwallet="yes", svn_lib_kwallet="no")
                   AC_LANG(C)
                   if test "$svn_lib_kwallet" = "yes"; then
                     AC_MSG_RESULT([yes])

Modified: subversion/branches/py-tests-as-modules/build/ac-macros/neon.m4
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/ac-macros/neon.m4?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/ac-macros/neon.m4 (original)
+++ subversion/branches/py-tests-as-modules/build/ac-macros/neon.m4 Thu Nov  4 20:48:21 2010
@@ -113,11 +113,11 @@ AC_DEFUN(SVN_NEON_CONFIG,
 #include <ne_xml.h>
 int main()
 {ne_xml_create(); ne_decompress_destroy(NULL);}"
-              AC_LINK_IFELSE([$neon_test_code], shared_linking="yes", shared_linking="no")
+              AC_LINK_IFELSE([AC_LANG_SOURCE([[$neon_test_code]])], shared_linking="yes", shared_linking="no")
               if test "$shared_linking" = "no"; then
                 NEON_LIBS=`$PKG_CONFIG neon --libs --static`
                 LIBS="$LIBS $NEON_LIBS"
-                AC_LINK_IFELSE([$neon_test_code], , AC_MSG_ERROR([cannot find Neon]))
+                AC_LINK_IFELSE([AC_LANG_SOURCE([[$neon_test_code]])], , AC_MSG_ERROR([cannot find Neon]))
               fi
               CFLAGS="$old_CFLAGS"
               LIBS="$old_LIBS"

Modified: subversion/branches/py-tests-as-modules/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/ac-macros/swig.m4?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/ac-macros/swig.m4 (original)
+++ subversion/branches/py-tests-as-modules/build/ac-macros/swig.m4 Thu Nov  4 20:48:21 2010
@@ -231,10 +231,10 @@ AC_DEFUN(SVN_FIND_SWIG,
     old_LIBS="$LIBS"
     CFLAGS="`echo $CFLAGS | $SED -e "s/ -ansi//g"` $svn_cv_ruby_includes"
     LIBS="$SWIG_RB_LIBS"
-    AC_LINK_IFELSE([
+    AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <ruby.h>
 int main()
-{rb_errinfo();}], have_rb_errinfo="yes", have_rb_errinfo="no")
+{rb_errinfo();}]])], have_rb_errinfo="yes", have_rb_errinfo="no")
     if test "$have_rb_errinfo" = "yes"; then
       AC_MSG_RESULT([yes])
       AC_DEFINE([HAVE_RB_ERRINFO], [1],

Modified: subversion/branches/py-tests-as-modules/build/run_ctypesgen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/build/run_ctypesgen.sh?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/build/run_ctypesgen.sh (original)
+++ subversion/branches/py-tests-as-modules/build/run_ctypesgen.sh Thu Nov  4 20:48:21 2010
@@ -86,4 +86,4 @@ $LT_EXECUTE $PYTHON $CTYPESGEN --cpp "$c
 (cat $abs_srcdir/$cp_relpath/csvn/core/functions.py.in; \
  sed -e '/^FILE =/d' $output | \
  perl -pe 's{(\s+\w+)\.restype = POINTER\(svn_error_t\)}{\1.restype = POINTER(svn_error_t)\n\1.errcheck = _svn_errcheck}' \
- ) > $abs_builddir/$cp_relpath/csvn/core/functions.py
+ ) > $abs_srcdir/$cp_relpath/csvn/core/functions.py

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=1031230&r1=1031229&r2=1031230&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 Thu Nov  4 20:48:21 2010
@@ -57,17 +57,20 @@ svnserve="$delta $fs $ra_svn $repos $sub
 svnsync="$auth_gnome_keyring $auth_kwallet $delta $ra $subr"
 svnversion="$subr $wc"
 entries_dump="$subr $wc"
+atomic_ra_revprop_change="$subr $ra"
 
 # Variable 'executables' containing names of variables corresponding to executables
-executables="svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion entries_dump"
+executables="svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion entries_dump atomic_ra_revprop_change"
 
 for executable in $executables; do
   # Set variables containing paths of executables
-  if [ "$executable" != entries_dump ]; then
-    eval "${executable}_path=subversion/$executable/$executable"
-  else
+  eval "${executable}_path=subversion/$executable/$executable"
+  if [ "$executable" = entries_dump ]; then
     eval "${executable}_path=subversion/tests/cmdline/entries-dump"
   fi
+  if [ "$executable" = atomic_ra_revprop_change ]; then
+    eval "${executable}_path=subversion/tests/cmdline/atomic-ra-revprop-change"
+  fi
   # Delete duplicates in dependencies of executables
   executable_dependencies="$(echo -n $(for x in $(eval echo "\$$executable"); do echo $x; done | sort -u))"
   eval "$executable=\$executable_dependencies"

Propchange: subversion/branches/py-tests-as-modules/build/win32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov  4 20:48:21 2010
@@ -9,3 +9,4 @@ msvc-dsp
 *.vcxproj
 vcnet-vcproj
 *.user
+*.log

Modified: subversion/branches/py-tests-as-modules/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/configure.ac?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/configure.ac (original)
+++ subversion/branches/py-tests-as-modules/configure.ac Thu Nov  4 20:48:21 2010
@@ -376,10 +376,10 @@ if test -n "`echo "$svn_lib_expat" | $EG
   old_LIBS="$LIBS"
   CPPFLAGS="$CPPFLAGS $SVN_XML_INCLUDES"
   LIBS="$LIBS $SVN_XML_LIBS"
-  AC_LINK_IFELSE([
+  AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <expat.h>
 int main()
-{XML_ParserCreate(NULL);}], svn_lib_expat="yes", svn_lib_expat="no")
+{XML_ParserCreate(NULL);}]])], svn_lib_expat="yes", svn_lib_expat="no")
   LIBS="$old_LIBS"
   if test "$svn_lib_expat" = "yes"; then
     AC_MSG_RESULT([yes])
@@ -390,10 +390,10 @@ int main()
     if test "$enable_all_static" != "yes"; then
       SVN_APRUTIL_LIBS="$SVN_APRUTIL_LIBS `$apu_config --libs`"
     fi
-    AC_COMPILE_IFELSE([
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <expat.h>
 int main()
-{XML_ParserCreate(NULL);}], svn_lib_expat="yes", svn_lib_expat="no")
+{XML_ParserCreate(NULL);}]])], svn_lib_expat="yes", svn_lib_expat="no")
     if test "$svn_lib_expat" = "yes"; then
       AC_MSG_RESULT([yes])
       AC_MSG_WARN([Expat found amongst libraries used by APR-Util, but Subversion libraries might be needlessly linked against additional unused libraries. It can be avoided by specifying exact location of Expat in argument of --with-expat option.])
@@ -500,11 +500,11 @@ dnl APR_HAS_DSO -------------------
 AC_MSG_CHECKING([whether APR has support for DSOs])
 old_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
-AC_PREPROC_IFELSE([
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
 #include <apr.h>
 #if !APR_HAS_DSO
 #error
-#endif],
+#endif]])],
   APR_HAS_DSO="yes"
   AC_MSG_RESULT([yes]),
   APR_HAS_DSO="no"
@@ -532,10 +532,10 @@ if test -n "$PKG_CONFIG"; then
     CPPFLAGS="$CPPFLAGS $DBUS_CPPFLAGS"
     LIBS="$LIBS $DBUS_LIBS"
     AC_MSG_CHECKING([for D-Bus])
-    AC_LINK_IFELSE([
+    AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #include <dbus/dbus.h>
 int main()
-{dbus_bus_get(DBUS_BUS_SESSION, NULL);}], HAVE_DBUS="yes", HAVE_DBUS="no")
+{dbus_bus_get(DBUS_BUS_SESSION, NULL);}]])], HAVE_DBUS="yes", HAVE_DBUS="no")
     if test "$HAVE_DBUS" = "yes"; then
       AC_MSG_RESULT([yes])
     else
@@ -702,7 +702,7 @@ dnl Build and install rules ------------
 INSTALL_STATIC_RULES="install-bin install-docs"
 INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include install-static"
 INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE"
-BUILD_RULES="fsmod-lib ramod-lib lib bin test $BUILD_APACHE_RULE"
+BUILD_RULES="fsmod-lib ramod-lib lib bin test $BUILD_APACHE_RULE tools"
 
 if test "$svn_lib_berkeley_db" = "yes"; then
   BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"
@@ -826,7 +826,7 @@ if test "$enable_disallowing_of_undefine
   AC_MSG_CHECKING([for -Wl,--no-undefined])
   old_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS -Wl,--no-undefined"
-  AC_LINK_IFELSE([int main(){;}], [svn_wl_no_undefined="yes"], [svn_wl_no_undefined="no"])
+  AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(){;}]])], [svn_wl_no_undefined="yes"], [svn_wl_no_undefined="no"])
   LDFLAGS="$old_LDFLAGS"
   libraries="auth_gnome_keyring auth_kwallet client delta diff fs fs_base fs_fs fs_util ra ra_local ra_neon ra_serf ra_svn repos subr wc"
   if test "$svn_wl_no_undefined" = "yes"; then

Modified: subversion/branches/py-tests-as-modules/contrib/client-side/svn_apply_autoprops.py
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/contrib/client-side/svn_apply_autoprops.py?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/contrib/client-side/svn_apply_autoprops.py (original)
+++ subversion/branches/py-tests-as-modules/contrib/client-side/svn_apply_autoprops.py Thu Nov  4 20:48:21 2010
@@ -124,6 +124,8 @@ def filter_walk(autoprop_lines, dirname,
     prop_list = autoprops_line[1]
 
     matching_filenames = fnmatch.filter(filenames, fnmatch_str)
+    matching_filenames = [f for f in matching_filenames \
+      if not os.path.islink(os.path.join(dirname, f))]
     if not matching_filenames:
       continue
 

Modified: subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-protocol
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-protocol?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-protocol (original)
+++ subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-protocol Thu Nov  4 20:48:21 2010
@@ -177,6 +177,42 @@ Response:
   
   ...svn-svndiff stream that can be passed to svn_txdelta_parse_svndiff...
 
+PROPPATCH
+=========
+
+We extend PROPPATCH as follows.  To pass OLD_VALUE_P (as in
+svn_ra_change_rev_prop2()), any propchange which is accompanied by a non-NULL
+OLD_VALUE_P goes within the <D:set><D:prop> tag (and never within the
+<D:remove><D:prop> tag --- even if it is a propdel).  Consequently, in
+mod_dav_svn it would land in db_store() and not db_remove().
+
+The property tag (in the C: or S: namespace) always contains the propval in its
+cdata (potentially base64-encoded).  The extension is as follows:
+
+* The property tag grows a V:absent attribute, to represent that the property
+  is being removed (i.e., a propdel routed to <D:set><D:prop>).
+
+* A <V:old-value> tag may be nested within the property tag.  The nested tag
+  supports the same V:absent and V:encoding attributed as the parent (property)
+  tag.
+
+* To preserve SVN_ERR_FS_PROP_BASEVALUE_MISMATCH (which is part of
+  the API promise), the <D:status>HTTP/1.1 500 (status)</D:status>
+  part of the "207 Multi-Status" response is used.  We transmit in
+  it a "412 Precondition Failed" response, which ra_neon and ra_serf
+  then special-case to interpret SVN_ERR_FS_PROP_BASEVALUE_MISMATCH.
+
+  Someday we will marshal complete svn_error_t chains over the wire
+  in ra_dav, just like ra_svn does (see svn_ra_svn__handle_failure_status()),
+  or at least will preserve the outer apr_err code in more cases.  In the 
+  meantime, using 412 allows us to preserve the SVN_ERR_FS_PROP_BASEVALUE_MISMATCH
+  error code, which is required for implementing svn_ra_change_rev_prop2().
+
+Historical note: we route propdels via <D:set>/db_store() because the mod_dav
+API for db_remove() was insufficient.  See this thread:
+http://mid.gmane.org/4C531CFB.2010202@collab.net
+
+
 Custom REPORTs
 ==============
 

Modified: subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-usage.html
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-usage.html?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-usage.html (original)
+++ subversion/branches/py-tests-as-modules/notes/http-and-webdav/webdav-usage.html Thu Nov  4 20:48:21 2010
@@ -19,7 +19,7 @@
 
     <p>
       This document details how WebDAV is used within the
-      <a href="http://subversion.tigris.org/">Subversion
+      <a href="http://subversion.apache.org/">Subversion
       product</a>. Specifically, how the client side interfaces with
       <a href="http://www.webdav.org/neon/">Neon</a> to generate
       WebDAV requests over the wire, and what the
@@ -31,7 +31,7 @@
     </p>
     <p>
       This document heavily refers to the
-      <a href="http://subversion.tigris.org/files/documents/15/17/svn-design.html">Subversion
+      <a href="http://svn.apache.org/repos/asf/subversion/trunk/notes/subversion-design.html">Subversion
 	design document</a> and the
       <a href="http://www.webdav.org/deltav/">latest Delta-V protocol
 	draft</a>. Details of those documents will <em>not</em> be

Modified: subversion/branches/py-tests-as-modules/notes/subversion-design.html
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/notes/subversion-design.html?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/notes/subversion-design.html (original)
+++ subversion/branches/py-tests-as-modules/notes/subversion-design.html Thu Nov  4 20:48:21 2010
@@ -2255,7 +2255,7 @@ write/Makefile:6
 
     <p>For a detailed description of exactly how Greg Stein
       <em class="email">gstein@lyra.org</em> is mapping the WebDAV DeltaV spec to
-      Subversion, see his paper: <a href="http://svn.apache.org/repos/asf/subversion/trunk/www/webdav-usage.html">http://svn.apache.org/repos/asf/subversion/trunk/www/webdav-usage.html</a>
+      Subversion, see his paper: <a href="http://svn.apache.org/repos/asf/subversion/trunk/notes/http-and-webdav/webdav-usage.html">http://svn.apache.org/repos/asf/subversion/trunk/notes/http-and-webdav/webdav-usage.html</a>
     </p>
 
     <p>For more information on WebDAV and the DeltaV extensions, see

Modified: subversion/branches/py-tests-as-modules/notes/wc-ng/copying
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/notes/wc-ng/copying?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/notes/wc-ng/copying (original)
+++ subversion/branches/py-tests-as-modules/notes/wc-ng/copying Thu Nov  4 20:48:21 2010
@@ -27,7 +27,10 @@ changes have to be made in the repositor
                              A /X (from /S@N)   M /X/T
                                                 (with local mods)
 
-  /S@N    /S/T@M             A /X (from /S@N)   A /X/T (from /S/A@M)
+  /S@N    /S/T@M             A /X (from /S@N)
+                             (if server finds T@M is same thing as T@N)
+                             or
+                             A /X (from /S@N)   A /X/T (from /S/A@M)
                              or
                              A /X (from /S@N)   R /X/T (from /S/A@M)
                                                 (the FS layer converts
@@ -68,13 +71,26 @@ revision source and from a source with a
 child.  In both cases the commit must either add or replace the child
 and if the copy is from a source that is locally added or replaced the
 client can make the distinction and send a delete before adding the
-replacement.  For a mixed revision the client doesn't distinguish
+replacement.  For a mixed revision, as the client doesn't know whether
+the child existed in its parent's revision and so can't distinguish
 between add and replace, it always sends an add and the FS layer
 converts to a replace as required (for details see 2010-04-19 comments
 in issue 3314).  We will probably have to continue rely on this in
 WC-NG as there is not enough information in the source to determine
 whether or not the child also exists in the parent's revision.
 
+If the mixed-rev source has a "not-present" child (effectively the
+same as "updated to r0"), then the copy schedules this as "delete".
+The client doesn't know whether the child existed in its parent's
+revision, so it can't distinguish between delete and no-op, so it
+always sends a delete.
+
+  ### This current fails, in both 1.6 and trunk.
+
+  ### TODO: The server needs to silently elide a delete, or the client
+  needs to detect the error and recover from it and continue if that
+  is possible.
+
 Child nodes not-present in the source become not-present working nodes
 in the copy, this ensures that they get deleted by the commit.  We
 might want to use a new not-copied state instead, since these deletes

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/repos.py
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/repos.py?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/repos.py (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/repos.py Thu Nov  4 20:48:21 2010
@@ -324,7 +324,7 @@ class RemoteRepository(object):
     def set_log_func(self, log_func):
         """Register a callback to get a log message for commit and
         commit-like operations. LOG_FUNC should take an array as an argument,
-        which holds the files to be commited. It should return a list of the
+        which holds the files to be committed. It should return a list of the
         form [LOG, FILE] where LOG is a log message and FILE is the temporary
         file, if one was created instead of a log message. If LOG is None,
         the operation will be canceled and FILE will be treated as the
@@ -408,7 +408,7 @@ class LocalRepository(object):
           ... absent, then we return svn_node_none.
           ... a regular file, then we return svn_node_file.
           ... a directory, then we return svn_node_dir
-          ... unknown, then we return svn_node_unknowna
+          ... unknown, then we return svn_node_unknown
         """
         assert(not encoded)
         root = self.fs.root(rev=rev, pool=self.iterpool)

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/wc.py
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/wc.py?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/wc.py (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/ctypes-python/csvn/wc.py Thu Nov  4 20:48:21 2010
@@ -30,8 +30,8 @@ class WC(object):
 
         Keyword arguments:
         path -- path to the working copy (default current working directory)
-        user -- object implementingthe user interface representing the user
-            performing the operatio (defaults to an instance of the User class)
+        user -- object implementing the user interface representing the user
+            performing the operation (defaults to an instance of the User class)
         """
         if user is None:
             user = User()
@@ -238,7 +238,7 @@ class WC(object):
     def set_progress_func(self, progress_func):
         """Setup a callback for network progress information.
 
-        This callback should accept two intergers, being the number of bytes
+        This callback should accept two integers, being the number of bytes
         sent and the number of bytes to send.
 
         Keyword arguments:
@@ -428,7 +428,7 @@ class WC(object):
         return props
 
     def propget(self, propname, target="", recurse=True):
-        """Get the the value of propname for target.
+        """Get the value of propname for target.
 
         Returns a hash the keys of which are file paths and the values are the
         value of PROPNAME for the corresponding file. The values of the hash
@@ -477,7 +477,7 @@ class WC(object):
         """Get the status on path using callback to status.
 
         The status callback (which can be set when this method is called or
-        earlier) wil be called for each item.
+        earlier) will be called for each item.
 
         Keyword arguments:
         path -- items to get status for (defaults to WC root)
@@ -585,8 +585,8 @@ class WC(object):
         """Register a callback to get a log message for commit and commit-like
         operations.
 
-        LOG_FUNC should take an array as an argument,vwhich holds the files to
-        be commited. It should return a list of thevform [LOG, FILE] where LOG
+        LOG_FUNC should take an array as an argument, which holds the files to
+        be committed. It should return a list of the form [LOG, FILE] where LOG
         is a log message and FILE is the temporary file, if one was created
         instead of a log message. If LOG is None, the operation will be
         canceled and FILE will be treated as the temporary file holding the
@@ -615,9 +615,9 @@ class WC(object):
         """Commit changes in the working copy.
 
         Keyword arguments:
-        paths -- list of paths that should be commited (defaults to WC root)
+        paths -- list of paths that should be committed (defaults to WC root)
         recurse -- if True, the contents of directories to be committed will
-            also be commited (default True)
+            also be committed (default True)
         keep_locks -- if True, locks will not be released during commit
             (default False)"""
         commit_info = POINTER(svn_commit_info_t)()
@@ -702,9 +702,9 @@ class WC(object):
         self.iterpool.clear()
 
     def relocate(self, from_url, to_url, dir="", recurse=True):
-        """Modify a working copy directory, changing repository URLs. that begin with FROM_URL to begin with
-        TO_URL instead, recursing into subdirectories if RECURSE is True
-        (True by default).
+        """Modify a working copy directory, changing repository URLs that begin
+        with FROM_URL to begin with TO_URL instead, recursing into
+        subdirectories if RECURSE is True (True by default).
 
         Keyword arguments:
         from_url -- url to be replaced, if this url is matched at the beginning

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/BlameCallback.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/BlameCallback.cpp Thu Nov  4 20:48:21 2010
@@ -106,14 +106,14 @@ BlameCallback::singleLine(svn_revnum_t s
     }
 
   // convert the parameters to their Java relatives
-  jobject jrevProps = CreateJ::PropertyMap(revProps, pool);
+  jobject jrevProps = CreateJ::PropertyMap(revProps);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
   jobject jmergedRevProps = NULL;
   if (mergedRevProps != NULL)
     {
-      jmergedRevProps = CreateJ::PropertyMap(mergedRevProps, pool);
+      jmergedRevProps = CreateJ::PropertyMap(mergedRevProps);
       if (JNIUtil::isJavaExceptionThrown())
         POP_AND_RETURN(SVN_NO_ERROR);
     }

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.cpp Thu Nov  4 20:48:21 2010
@@ -38,7 +38,8 @@
 
 
 ClientContext::ClientContext(jobject jsvnclient)
-    : m_prompter(NULL)
+    : m_prompter(NULL),
+      m_cancelOperation(false)
 {
     JNIEnv *env = JNIUtil::getEnv();
     JNICriticalSection criticalSection(*JNIUtil::getGlobalPoolMutex());
@@ -240,7 +241,7 @@ ClientContext::setConfigDirectory(const 
 }
 
 const char *
-ClientContext::getConfigDirectory()
+ClientContext::getConfigDirectory() const
 {
     return m_configDir.c_str();
 }
@@ -285,7 +286,7 @@ ClientContext::notify(void *baton,
       env->DeleteLocalRef(clazz);
     }
 
-  jobject jInfo = CreateJ::ClientNotifyInformation(notify, pool);
+  jobject jInfo = CreateJ::ClientNotifyInformation(notify);
   if (JNIUtil::isJavaExceptionThrown())
     return;
 

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.h
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.h?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.h (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ClientContext.h Thu Nov  4 20:48:21 2010
@@ -80,7 +80,7 @@ class ClientContext
   void password(const char *pi_password);
   void setPrompt(Prompter *prompter);
   void cancelOperation();
-  const char *getConfigDirectory();
+  const char *getConfigDirectory() const;
 
   /**
    * Set the configuration directory, taking the usual steps to

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.cpp Thu Nov  4 20:48:21 2010
@@ -177,7 +177,7 @@ CreateJ::ConflictVersion(const svn_wc_co
 }
 
 jobject
-CreateJ::Info2(const char *path, const svn_info_t *info)
+CreateJ::Info(const char *path, const svn_info_t *info)
 {
   JNIEnv *env = JNIUtil::getEnv();
 
@@ -186,7 +186,7 @@ CreateJ::Info2(const char *path, const s
   if (JNIUtil::isJavaExceptionThrown())
     return NULL;
 
-  jclass clazz = env->FindClass(JAVA_PACKAGE "/Info2");
+  jclass clazz = env->FindClass(JAVA_PACKAGE "/Info");
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -194,12 +194,13 @@ CreateJ::Info2(const char *path, const s
   if (mid == 0)
     {
       mid = env->GetMethodID(clazz, "<init>",
-                             "(Ljava/lang/String;Ljava/lang/String;J"
+                             "(Ljava/lang/String;Ljava/lang/String;"
+                             "Ljava/lang/String;J"
                              "L"JAVA_PACKAGE"/NodeKind;"
                              "Ljava/lang/String;Ljava/lang/String;"
                              "JJLjava/lang/String;"
                              "L"JAVA_PACKAGE"/Lock;Z"
-                             "L"JAVA_PACKAGE"/Info2$ScheduleKind;"
+                             "L"JAVA_PACKAGE"/Info$ScheduleKind;"
                              "Ljava/lang/String;JJJ"
                              "Ljava/lang/String;Ljava/lang/String;"
                              "Ljava/lang/String;Ljava/lang/String;"
@@ -214,6 +215,10 @@ CreateJ::Info2(const char *path, const s
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
+  jstring jwcroot = JNIUtil::makeJString(info->wcroot_abspath);
+  if (JNIUtil::isJavaExceptionThrown())
+    POP_AND_RETURN_NULL;
+
   jstring jurl = JNIUtil::makeJString(info->URL);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
@@ -280,7 +285,8 @@ CreateJ::Info2(const char *path, const s
   jlong jreposSize = info->size == SVN_INFO_SIZE_UNKNOWN
     ? -1 : (jlong) info->size;
 
-  jobject jinfo2 = env->NewObject(clazz, mid, jpath, jurl, (jlong) info->rev,
+  jobject jinfo2 = env->NewObject(clazz, mid, jpath, jwcroot, jurl,
+                                  (jlong) info->rev,
                                   jnodeKind, jreposRootUrl, jreportUUID,
                                   (jlong) info->last_changed_rev,
                                   (jlong) info->last_changed_date,
@@ -671,8 +677,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
 }
 
 jobject
-CreateJ::ClientNotifyInformation(const svn_wc_notify_t *wcNotify,
-                                 apr_pool_t *pool)
+CreateJ::ClientNotifyInformation(const svn_wc_notify_t *wcNotify)
 {
   JNIEnv *env = JNIUtil::getEnv();
 
@@ -762,7 +767,7 @@ CreateJ::ClientNotifyInformation(const s
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
-  jobject jrevProps = CreateJ::PropertyMap(wcNotify->rev_props, pool);
+  jobject jrevProps = CreateJ::PropertyMap(wcNotify->rev_props);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN_NULL;
 
@@ -791,8 +796,7 @@ CreateJ::ClientNotifyInformation(const s
 }
 
 jobject
-CreateJ::ReposNotifyInformation(const svn_repos_notify_t *reposNotify,
-                                apr_pool_t *pool)
+CreateJ::ReposNotifyInformation(const svn_repos_notify_t *reposNotify)
 {
   JNIEnv *env = JNIUtil::getEnv();
 
@@ -1016,7 +1020,6 @@ CreateJ::RevisionRangeList(apr_array_hea
 jobject
 CreateJ::StringSet(apr_array_header_t *strings)
 {
-  JNIEnv *env = JNIUtil::getEnv();
   std::vector<jobject> jstrs;
 
   for (int i = 0; i < strings->nelts; ++i)
@@ -1032,7 +1035,7 @@ CreateJ::StringSet(apr_array_header_t *s
   return CreateJ::Set(jstrs);
 }
 
-jobject CreateJ::PropertyMap(apr_hash_t *prop_hash, apr_pool_t *pool)
+jobject CreateJ::PropertyMap(apr_hash_t *prop_hash)
 {
   JNIEnv *env = JNIUtil::getEnv();
 
@@ -1072,7 +1075,8 @@ jobject CreateJ::PropertyMap(apr_hash_t 
 
   apr_hash_index_t *hi;
   int i = 0;
-  for (hi = apr_hash_first(pool, prop_hash); hi; hi = apr_hash_next(hi), ++i)
+  for (hi = apr_hash_first(apr_hash_pool_get(prop_hash), prop_hash);
+       hi; hi = apr_hash_next(hi), ++i)
     {
       const char *key;
       svn_string_t *val;

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.h
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.h?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.h (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/CreateJ.h Thu Nov  4 20:48:21 2010
@@ -46,7 +46,7 @@ class CreateJ
   ConflictDescriptor(const svn_wc_conflict_description_t *desc);
 
   static jobject
-  Info2(const char *path, const svn_info_t *info);
+  Info(const char *path, const svn_info_t *info);
 
   static jobject
   Lock(const svn_lock_t *lock);
@@ -59,10 +59,10 @@ class CreateJ
          const svn_client_status_t *status, apr_pool_t *pool);
 
   static jobject
-  ClientNotifyInformation(const svn_wc_notify_t *notify, apr_pool_t *pool);
+  ClientNotifyInformation(const svn_wc_notify_t *notify);
 
   static jobject
-  ReposNotifyInformation(const svn_repos_notify_t *notify, apr_pool_t *pool);
+  ReposNotifyInformation(const svn_repos_notify_t *notify);
 
   static jobject
   CommitItem(svn_client_commit_item3_t *item);
@@ -77,7 +77,7 @@ class CreateJ
   StringSet(apr_array_header_t *strings);
 
   static jobject
-  PropertyMap(apr_hash_t *prop_hash, apr_pool_t *pool);
+  PropertyMap(apr_hash_t *prop_hash);
 
   /* This creates a set of Objects.  It derefs the members of the vector
    * after putting them in the set, so they caller doesn't need to. */

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/EnumMapper.cpp Thu Nov  4 20:48:21 2010
@@ -132,7 +132,7 @@ jobject EnumMapper::mapNotifyLockState(s
 jobject EnumMapper::mapScheduleKind(svn_wc_schedule_t schedule)
 {
   // We're assuming a valid value for the C enum above
-  return mapEnum(JAVA_PACKAGE"/Info2$ScheduleKind", (int) schedule);
+  return mapEnum(JAVA_PACKAGE"/Info$ScheduleKind", (int) schedule);
 }
 
 /**

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.cpp Thu Nov  4 20:48:21 2010
@@ -95,7 +95,7 @@ const char *File::getInternalStyle(const
     return NULL;
 }
 
-bool File::isNull()
+bool File::isNull() const
 {
   return m_jthis == NULL;
 }

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.h
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.h?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.h (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/File.h Thu Nov  4 20:48:21 2010
@@ -49,7 +49,7 @@ class File
   ~File();
   const char *getAbsPath();
   const char *getInternalStyle(const SVN::Pool &pool);
-  bool isNull();
+  bool isNull() const;
 };
 
 #endif // FILE_H

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/InfoCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/InfoCallback.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/InfoCallback.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/InfoCallback.cpp Thu Nov  4 20:48:21 2010
@@ -85,12 +85,12 @@ InfoCallback::singleInfo(const char *pat
         POP_AND_RETURN(SVN_NO_ERROR);
 
       mid = env->GetMethodID(clazz, "singleInfo",
-                             "(L"JAVA_PACKAGE"/Info2;)V");
+                             "(L"JAVA_PACKAGE"/Info;)V");
       if (JNIUtil::isJavaExceptionThrown() || mid == 0)
         POP_AND_RETURN(SVN_NO_ERROR);
     }
 
-  jobject jinfo2 = CreateJ::Info2(path, info);
+  jobject jinfo2 = CreateJ::Info(path, info);
   if (jinfo2 == NULL || JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.cpp Thu Nov  4 20:48:21 2010
@@ -78,7 +78,7 @@ int JNIByteArray::getLength()
  * Returns the bytes of the byte array.
  * @return the bytes
  */
-const signed char *JNIByteArray::getBytes()
+const signed char *JNIByteArray::getBytes() const
 {
   return m_data;
 }
@@ -87,7 +87,7 @@ const signed char *JNIByteArray::getByte
  * Returns if the byte array was not set.
  * @return if the byte array was not set
  */
-bool JNIByteArray::isNull()
+bool JNIByteArray::isNull() const
 {
   return m_data == NULL;
 }

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.h
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.h?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.h (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/JNIByteArray.h Thu Nov  4 20:48:21 2010
@@ -52,8 +52,8 @@ class JNIByteArray
    */
   bool m_deleteByteArray;
  public:
-  bool isNull();
-  const signed char *getBytes();
+  bool isNull() const;
+  const signed char *getBytes() const;
   int getLength();
   JNIByteArray(jbyteArray jba, bool deleteByteArray = false);
   ~JNIByteArray();

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/LogMessageCallback.cpp Thu Nov  4 20:48:21 2010
@@ -115,7 +115,7 @@ LogMessageCallback::singleMessage(svn_lo
 
   jobject jrevprops = NULL;
   if (log_entry->revprops != NULL && apr_hash_count(log_entry->revprops) > 0)
-    jrevprops = CreateJ::PropertyMap(log_entry->revprops, pool);
+    jrevprops = CreateJ::PropertyMap(log_entry->revprops);
 
   env->CallVoidMethod(m_callback,
                       sm_mid,

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ProplistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ProplistCallback.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ProplistCallback.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ProplistCallback.cpp Thu Nov  4 20:48:21 2010
@@ -96,7 +96,7 @@ svn_error_t *ProplistCallback::singlePat
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 
-  jobject jmap = CreateJ::PropertyMap(prop_hash, pool);
+  jobject jmap = CreateJ::PropertyMap(prop_hash);
   if (JNIUtil::isJavaExceptionThrown())
     POP_AND_RETURN(SVN_NO_ERROR);
 

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ReposNotifyCallback.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ReposNotifyCallback.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/ReposNotifyCallback.cpp Thu Nov  4 20:48:21 2010
@@ -81,7 +81,7 @@ ReposNotifyCallback::onNotify(const svn_
       env->DeleteLocalRef(clazz);
     }
 
-  jobject jInfo = CreateJ::ReposNotifyInformation(wcNotify, pool);
+  jobject jInfo = CreateJ::ReposNotifyInformation(wcNotify);
   if (JNIUtil::isJavaExceptionThrown())
     return;
 

Modified: subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNBase.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNBase.cpp?rev=1031230&r1=1031229&r2=1031230&view=diff
==============================================================================
--- subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNBase.cpp (original)
+++ subversion/branches/py-tests-as-modules/subversion/bindings/javahl/native/SVNBase.cpp Thu Nov  4 20:48:21 2010
@@ -36,7 +36,7 @@ SVNBase::~SVNBase()
 {
 }
 
-jlong SVNBase::getCppAddr()
+jlong SVNBase::getCppAddr() const
 {
   return reinterpret_cast<jlong>(this);
 }



Mime
View raw message