subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1367002 [1/21] - in /subversion/branches/svn-bisect: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ contrib/client-side/emacs/ contrib/server-side/mod_dontdothat/ notes/ notes/api-errata/1.7/ notes/http-and-webdav/ ...
Date Mon, 30 Jul 2012 06:39:38 GMT
Author: arwin
Date: Mon Jul 30 06:39:28 2012
New Revision: 1367002

URL: http://svn.apache.org/viewvc?rev=1367002&view=rev
Log:
Merging r1204362 to r1295003 from trunk to svn-bisect branch.

Added:
    subversion/branches/svn-bisect/subversion/bindings/javahl/Manifest.in
      - copied unchanged from r1295003, subversion/trunk/subversion/bindings/javahl/Manifest.in
    subversion/branches/svn-bisect/tools/dev/gdb-py/
      - copied from r1295003, subversion/trunk/tools/dev/gdb-py/
    subversion/branches/svn-bisect/tools/dev/merge-graph.py
      - copied unchanged from r1295003, subversion/trunk/tools/dev/merge-graph.py
    subversion/branches/svn-bisect/tools/dev/mergegraph/
      - copied from r1295003, subversion/trunk/tools/dev/mergegraph/
    subversion/branches/svn-bisect/tools/examples/info.rb
      - copied unchanged from r1295003, subversion/trunk/tools/examples/info.rb
    subversion/branches/svn-bisect/tools/server-side/mod_dontdothat/   (props changed)
      - copied from r1295003, subversion/trunk/tools/server-side/mod_dontdothat/
    subversion/branches/svn-bisect/tools/server-side/svnpubsub/
      - copied from r1295003, subversion/trunk/tools/server-side/svnpubsub/
Removed:
    subversion/branches/svn-bisect/contrib/server-side/mod_dontdothat/
Modified:
    subversion/branches/svn-bisect/   (props changed)
    subversion/branches/svn-bisect/CHANGES
    subversion/branches/svn-bisect/COMMITTERS
    subversion/branches/svn-bisect/INSTALL
    subversion/branches/svn-bisect/Makefile.in
    subversion/branches/svn-bisect/autogen.sh
    subversion/branches/svn-bisect/build.conf
    subversion/branches/svn-bisect/build/ac-macros/apache.m4
    subversion/branches/svn-bisect/build/find_python.sh
    subversion/branches/svn-bisect/build/generator/gen_vcnet_vcproj.py
    subversion/branches/svn-bisect/build/generator/gen_win.py
    subversion/branches/svn-bisect/build/generator/templates/neon.vcxproj.ezt
    subversion/branches/svn-bisect/build/generator/templates/serf.vcxproj.ezt
    subversion/branches/svn-bisect/build/generator/templates/svn_config.vcxproj.ezt
    subversion/branches/svn-bisect/build/generator/templates/svn_locale.vcxproj.ezt
    subversion/branches/svn-bisect/build/generator/templates/vcnet_vcxproj.ezt
    subversion/branches/svn-bisect/build/generator/templates/zlib.vcxproj.ezt
    subversion/branches/svn-bisect/build/run_tests.py
    subversion/branches/svn-bisect/configure.ac
    subversion/branches/svn-bisect/contrib/client-side/emacs/vc-svn.el
    subversion/branches/svn-bisect/get-deps.sh
    subversion/branches/svn-bisect/notes/api-errata/1.7/ra001.txt
    subversion/branches/svn-bisect/notes/dump-load-format.txt
    subversion/branches/svn-bisect/notes/http-and-webdav/webdav-protocol
    subversion/branches/svn-bisect/notes/knobs
    subversion/branches/svn-bisect/notes/repos-dictated-config
    subversion/branches/svn-bisect/subversion/bindings/javahl/   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/svn-bisect/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/svn-bisect/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/svn-bisect/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
    subversion/branches/svn-bisect/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/svn-bisect/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/svn-bisect/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/svn-bisect/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/svn-bisect/subversion/bindings/swig/INSTALL
    subversion/branches/svn-bisect/subversion/bindings/swig/core.i
    subversion/branches/svn-bisect/subversion/bindings/swig/include/svn_containers.swg
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/Base.pm   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/Client.pm   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/Core.pm   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/Delta.pm   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/Fs.pm   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/Ra.pm   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/Repos.pm   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/Wc.pm   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/t/0use.t   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/t/1repos.t   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/t/2fs.t   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/t/3client.t   (contents, props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/t/4pool.t   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/t/5delta-compat.t   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/perl/native/t/5delta.t   (props changed)
    subversion/branches/svn-bisect/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/svn-bisect/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
    subversion/branches/svn-bisect/subversion/bindings/swig/python/tests/client.py
    subversion/branches/svn-bisect/subversion/bindings/swig/python/tests/mergeinfo.py
    subversion/branches/svn-bisect/subversion/bindings/swig/python/tests/repository.py
    subversion/branches/svn-bisect/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
    subversion/branches/svn-bisect/subversion/bindings/swig/python/tests/wc.py
    subversion/branches/svn-bisect/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
    subversion/branches/svn-bisect/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h
    subversion/branches/svn-bisect/subversion/bindings/swig/ruby/svn/core.rb
    subversion/branches/svn-bisect/subversion/bindings/swig/ruby/test/test_delta.rb
    subversion/branches/svn-bisect/subversion/bindings/swig/ruby/test/util.rb
    subversion/branches/svn-bisect/subversion/include/private/svn_auth_private.h
    subversion/branches/svn-bisect/subversion/include/private/svn_cache.h
    subversion/branches/svn-bisect/subversion/include/private/svn_client_private.h
    subversion/branches/svn-bisect/subversion/include/private/svn_cmdline_private.h
    subversion/branches/svn-bisect/subversion/include/private/svn_debug.h
    subversion/branches/svn-bisect/subversion/include/private/svn_error_private.h
    subversion/branches/svn-bisect/subversion/include/private/svn_fs_util.h
    subversion/branches/svn-bisect/subversion/include/private/svn_fspath.h
    subversion/branches/svn-bisect/subversion/include/private/svn_mutex.h
    subversion/branches/svn-bisect/subversion/include/private/svn_ra_private.h
    subversion/branches/svn-bisect/subversion/include/private/svn_repos_private.h
    subversion/branches/svn-bisect/subversion/include/private/svn_subr_private.h
    subversion/branches/svn-bisect/subversion/include/private/svn_wc_private.h
    subversion/branches/svn-bisect/subversion/include/svn_checksum.h
    subversion/branches/svn-bisect/subversion/include/svn_client.h
    subversion/branches/svn-bisect/subversion/include/svn_config.h
    subversion/branches/svn-bisect/subversion/include/svn_delta.h
    subversion/branches/svn-bisect/subversion/include/svn_dirent_uri.h
    subversion/branches/svn-bisect/subversion/include/svn_editor.h
    subversion/branches/svn-bisect/subversion/include/svn_fs.h
    subversion/branches/svn-bisect/subversion/include/svn_io.h
    subversion/branches/svn-bisect/subversion/include/svn_mergeinfo.h
    subversion/branches/svn-bisect/subversion/include/svn_ra.h
    subversion/branches/svn-bisect/subversion/include/svn_repos.h
    subversion/branches/svn-bisect/subversion/include/svn_string.h
    subversion/branches/svn-bisect/subversion/include/svn_utf.h
    subversion/branches/svn-bisect/subversion/include/svn_wc.h
    subversion/branches/svn-bisect/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
    subversion/branches/svn-bisect/subversion/libsvn_auth_kwallet/kwallet.cpp
    subversion/branches/svn-bisect/subversion/libsvn_client/add.c
    subversion/branches/svn-bisect/subversion/libsvn_client/checkout.c
    subversion/branches/svn-bisect/subversion/libsvn_client/client.h
    subversion/branches/svn-bisect/subversion/libsvn_client/cmdline.c
    subversion/branches/svn-bisect/subversion/libsvn_client/commit.c
    subversion/branches/svn-bisect/subversion/libsvn_client/commit_util.c
    subversion/branches/svn-bisect/subversion/libsvn_client/copy.c
    subversion/branches/svn-bisect/subversion/libsvn_client/delete.c
    subversion/branches/svn-bisect/subversion/libsvn_client/deprecated.c
    subversion/branches/svn-bisect/subversion/libsvn_client/diff.c
    subversion/branches/svn-bisect/subversion/libsvn_client/export.c
    subversion/branches/svn-bisect/subversion/libsvn_client/externals.c
    subversion/branches/svn-bisect/subversion/libsvn_client/merge.c
    subversion/branches/svn-bisect/subversion/libsvn_client/mergeinfo.c
    subversion/branches/svn-bisect/subversion/libsvn_client/mergeinfo.h
    subversion/branches/svn-bisect/subversion/libsvn_client/patch.c
    subversion/branches/svn-bisect/subversion/libsvn_client/prop_commands.c
    subversion/branches/svn-bisect/subversion/libsvn_client/ra.c
    subversion/branches/svn-bisect/subversion/libsvn_client/repos_diff.c
    subversion/branches/svn-bisect/subversion/libsvn_client/status.c
    subversion/branches/svn-bisect/subversion/libsvn_client/switch.c
    subversion/branches/svn-bisect/subversion/libsvn_client/update.c
    subversion/branches/svn-bisect/subversion/libsvn_client/util.c
    subversion/branches/svn-bisect/subversion/libsvn_delta/compat.c
    subversion/branches/svn-bisect/subversion/libsvn_delta/delta.h
    subversion/branches/svn-bisect/subversion/libsvn_delta/editor.c
    subversion/branches/svn-bisect/subversion/libsvn_delta/svndiff.c
    subversion/branches/svn-bisect/subversion/libsvn_delta/text_delta.c
    subversion/branches/svn-bisect/subversion/libsvn_delta/xdelta.c
    subversion/branches/svn-bisect/subversion/libsvn_diff/parse-diff.c
    subversion/branches/svn-bisect/subversion/libsvn_fs/fs-loader.c
    subversion/branches/svn-bisect/subversion/libsvn_fs/fs-loader.h
    subversion/branches/svn-bisect/subversion/libsvn_fs_base/bdb/env.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_base/bdb/locks-table.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_base/fs.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_base/id.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_base/notes/structure
    subversion/branches/svn-bisect/subversion/libsvn_fs_base/reps-strings.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/caching.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/dag.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/fs.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/fs.h
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/id.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/rep-cache-db.sql
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/rep-cache.c
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/rep-cache.h
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/structure
    subversion/branches/svn-bisect/subversion/libsvn_fs_fs/tree.c
    subversion/branches/svn-bisect/subversion/libsvn_ra/ra_loader.c
    subversion/branches/svn-bisect/subversion/libsvn_ra/ra_loader.h
    subversion/branches/svn-bisect/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_neon/commit.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_neon/log.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_neon/merge.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_neon/ra_neon.h
    subversion/branches/svn-bisect/subversion/libsvn_ra_neon/session.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_neon/util.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_serf/commit.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_serf/locks.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_serf/log.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_serf/property.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/svn-bisect/subversion/libsvn_ra_serf/serf.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_serf/update.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_serf/util.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_svn/client.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/svn-bisect/subversion/libsvn_ra_svn/ra_svn.h
    subversion/branches/svn-bisect/subversion/libsvn_repos/commit.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/dump.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/hooks.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/log.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/replay.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/reporter.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/repos.c
    subversion/branches/svn-bisect/subversion/libsvn_repos/repos.h
    subversion/branches/svn-bisect/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/auth.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/cache-inprocess.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/cache-memcache.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/checksum.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/cmdline.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/config.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/config_file.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/debug.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/deprecated.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/error.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/gpg_agent.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/io.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/macos_keychain.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/opt.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/simple_providers.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/skel.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/spillbuf.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/sqlite.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/ssl_server_trust_providers.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/stream.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/svn_base64.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/svn_mutex.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/svn_string.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/utf.c
    subversion/branches/svn-bisect/subversion/libsvn_subr/win32_crypto.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/adm_ops.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/copy.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/deprecated.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/diff_editor.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/externals.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/info.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/node.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/questions.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/status.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/update_editor.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/util.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/svn-bisect/subversion/libsvn_wc/wc.h
    subversion/branches/svn-bisect/subversion/libsvn_wc/wc_db.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/wc_db.h
    subversion/branches/svn-bisect/subversion/libsvn_wc/wc_db_pristine.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/svn-bisect/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/svn-bisect/subversion/libsvn_wc/workqueue.c
    subversion/branches/svn-bisect/subversion/mod_authz_svn/mod_authz_svn.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/svn-bisect/subversion/mod_dav_svn/liveprops.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/lock.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/merge.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/reports/log.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/reports/update.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/repos.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/util.c
    subversion/branches/svn-bisect/subversion/mod_dav_svn/version.c
    subversion/branches/svn-bisect/subversion/po/de.po
    subversion/branches/svn-bisect/subversion/po/fr.po
    subversion/branches/svn-bisect/subversion/po/zh_CN.po
    subversion/branches/svn-bisect/subversion/svn/cl.h
    subversion/branches/svn-bisect/subversion/svn/diff-cmd.c
    subversion/branches/svn-bisect/subversion/svn/log-cmd.c
    subversion/branches/svn-bisect/subversion/svn/main.c
    subversion/branches/svn-bisect/subversion/svn/merge-cmd.c
    subversion/branches/svn-bisect/subversion/svn/mergeinfo-cmd.c
    subversion/branches/svn-bisect/subversion/svn/propedit-cmd.c
    subversion/branches/svn-bisect/subversion/svn/status.c
    subversion/branches/svn-bisect/subversion/svn/util.c
    subversion/branches/svn-bisect/subversion/svnadmin/main.c
    subversion/branches/svn-bisect/subversion/svndumpfilter/main.c
    subversion/branches/svn-bisect/subversion/svnlook/main.c
    subversion/branches/svn-bisect/subversion/svnrdump/dump_editor.c
    subversion/branches/svn-bisect/subversion/svnrdump/svnrdump.c
    subversion/branches/svn-bisect/subversion/svnrdump/svnrdump.h
    subversion/branches/svn-bisect/subversion/svnserve/main.c
    subversion/branches/svn-bisect/subversion/svnserve/serve.c
    subversion/branches/svn-bisect/subversion/svnsync/main.c
    subversion/branches/svn-bisect/subversion/svnsync/sync.c
    subversion/branches/svn-bisect/subversion/tests/README
    subversion/branches/svn-bisect/subversion/tests/cmdline/README
    subversion/branches/svn-bisect/subversion/tests/cmdline/basic_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/commit_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/copy_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/svn-bisect/subversion/tests/cmdline/depth_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/diff_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/externals_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
    subversion/branches/svn-bisect/subversion/tests/cmdline/input_validation_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/lock_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/log_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/log_tests_data/merge_history_repo.png
    subversion/branches/svn-bisect/subversion/tests/cmdline/merge_authz_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/merge_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/patch_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/prop_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/special_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/stat_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svndumpfilter_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svnlook_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svntest/__init__.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svntest/factory.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svntest/main.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svntest/sandbox.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/svntest/verify.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/switch_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/update_tests.py
    subversion/branches/svn-bisect/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/svn-bisect/subversion/tests/libsvn_client/client-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_fs/locks-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_ra_local/ra-local-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_subr/checksum-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_subr/config-test.cfg
    subversion/branches/svn-bisect/subversion/tests/libsvn_subr/spillbuf-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/svn-bisect/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/svn-bisect/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
    subversion/branches/svn-bisect/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
    subversion/branches/svn-bisect/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
    subversion/branches/svn-bisect/tools/client-side/svn-ssl-fingerprints.sh
    subversion/branches/svn-bisect/tools/client-side/svnmucc/svnmucc.c
    subversion/branches/svn-bisect/tools/dev/gdb-py/svndbg/   (props changed)
    subversion/branches/svn-bisect/tools/dev/po-merge.py
    subversion/branches/svn-bisect/tools/dev/unix-build/Makefile.svn
    subversion/branches/svn-bisect/tools/dist/backport.pl
    subversion/branches/svn-bisect/tools/dist/dist.sh
    subversion/branches/svn-bisect/tools/examples/SvnCLBrowse
    subversion/branches/svn-bisect/tools/examples/get-location-segments.py
    subversion/branches/svn-bisect/tools/server-side/svnpredumpfilter.py

Propchange: subversion/branches/svn-bisect/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1204363-1295003

Modified: subversion/branches/svn-bisect/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/CHANGES?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/CHANGES (original)
+++ subversion/branches/svn-bisect/CHANGES Mon Jul 30 06:39:28 2012
@@ -12,6 +12,14 @@ http://svn.apache.org/repos/asf/subversi
   - Minor new features and improvements:
     * new 'svnadmin load --revision' load filtering support (issue #3734)
     * new 'commit --include-externals' option (related to issues #1167, #3563)
+    * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
+    * reject some attempts to merge between unrelated branches (r1215273)
+    * support GPG agent for password storage on UNIX-like platforms (r1150783)
+    * new 'svnadmin lock' / 'svnadmin unlock' subcommands (issue #3942, #4092)
+    * new SVNUseUTF8 configuration option for mod_dav_svn (issue #2487)
+    * new SVNHooksEnv configuration option for mod_dav_svn (r1239966)
+    * new --ignore-properties option for 'svn diff' (r1239553. -617)
+    * new --patch-compatible option for 'svn diff' (r1239561)
 
   - Client-side bugfixes:
     *
@@ -24,7 +32,7 @@ http://svn.apache.org/repos/asf/subversi
   
  Developer-visible changes:
   - General:
-    *
+    * Now require Python 2.5 for tests and dev tools (r1243627)
 
   - API changes:
     * fix inconsistent handling of log revs without changed paths (issue #3694)
@@ -32,6 +40,111 @@ http://svn.apache.org/repos/asf/subversi
   - Bindings:
     *
 
+
+Version 1.7.4
+(?? ??? 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.4
+
+  User-visible changes:
+    * fix 'svn log --diff' for moved paths (r1210147, et al)
+    * fix ra_serf problem with reading directory entries via HTTPv2 (r1238121)
+    * prepend "sqlite:" to error messages from SQLite (r1245738, -817)
+    * fix randomly missing "Merged via" notifications in 'svn log -g' (r1293229)
+    * fix spurious conflict when merging deleted symbolic link (issue #4052)
+    * fix URL-to-WC copy of externals on Windows (issue #4123)
+    * improve an FSFS sanity-check error message (r1294470)
+
+  Developer-visible changes:
+    * don't build mod_dontdothat if not building with httpd (r1243976)
+    * fix the testsuite to avoid FAILs on APR hash order (r1230714, et al)
+
+
+Version 1.7.3
+(14 Feb 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.3
+
+  General:
+    * ship mod_dontdothat with the standard release
+
+  User-visible changes:
+    * fix segfault on 'svn rm $ROOT_URL' (issue #4074)
+    * replace a couple of assertions in favor of errors (r1207858, -949)
+    * fix a server assert after being upgraded (r1210195)
+    * fix segfault on 'svn mkdir svn://localhost' (r1211483)
+    * make 'svnadmin recover' prune the rep cache (r1213331, et al)
+    * make svnmucc use values from --config-dir option
+    * update and clarify the merge help text (r1154121, et al)
+    * replace wc assertion with informative error (r1222521, -693)
+    * copy permissions correctly for FSFS dirs (r1229252)
+    * improve 'svn log --with-all-revprops' over ra-dav (issue #4082)
+    * fix segfault when remapping a file external (issue #4093)
+    * fix segfault caused by obstructing unversioned dir (r1229677)
+    * fix regression on first update of external dir with '-r' (issue #4053)
+    * fix various EOL-handling problems in 'svn patch' (issues #3814, #3991)
+    * fix segfault in 'svn revert' (r1229303)
+    * improve correctness of 'svn patch --dry-run' (r1231944, -5)
+    * enforce revisions given in 'svn:externals' (issue #4053)
+    * fix potential corruption on 32-bit FSFS with large files (r1230212)
+    * make 'svn status --xml' show new files (issue #4097)
+    * fix 'svn mergeinfo' correctness (issue #4050)
+    * return the correct status for non-present nodes (r1232202, -07, -21, -22)
+    * improve SASL error messages (r1236343, et al)
+    * improve server cert error code for ra_serf (r1232413)
+    * fix SVNParentPath listings for parent path symlinks (r1221767, -80)
+    * fix mod_dav_svn's handling of POST errors (issue #4086)
+    * log some mod_dav_svn errors, rather than ignoring them (r1237720, -9596)
+    * relax requirements for canonicalization in mod_dav_svn (r1236173)
+    * fix a rare source of FSFS corruption (r1240752)
+    * allow committing the result of some copy operations (issue #4059)
+    * prevent one-byte buffer overflow in base64 decoding (r1242337)
+
+  Developer-visible changes:
+    * JavaHL: Add missing notify action, fixing an exception (r1221793)
+    * fix swig-py memory leak (r1235264, -296, -302, -736)
+    * fix spurious test suite failure (r1220742, -50)
+    * allow running tests on UNC shares (r1225491)
+    * bindings: see platform-specific password providers (r1242660, -1)
+    * skip 'svnrdump dump' tests over ra_serf (r1242537)
+    * convert a few ra_serf assertions to errors (r1242607)
+
+
+Version 1.7.2
+(02 Dec 2011, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.2
+
+  User-visible changes:
+   * fix working copy corruption after interrupted update/switch (issue #4040)
+   * avoid segfaults against pre-1.5 servers (r1186928)
+   * improve configure error message if apr-util uses old or no bdb (r1186784)
+   * make 'svn patch' ignore '/dev/null' targets for compat with git (r1197998)
+   * fix 'svn patch' segfault on patch that skips and deletes files (r1199950)
+   * omit "Committed revision N." output from 'svn commit --quiet' (r1200837)
+   * fix authz denial when svnserve root is a repository (issue #4060)
+   * fix uninitialized memory read in client diff code (r1201002)
+   * avoid potential segfault during merges (r1202807)
+   * fix an assertion failure when a symlink is updated (r1186944, -81, -83)
+   * make working copy operations fail if nodes have no base checksum (r1202630)
+   * fix nested <Location>s when using v2 protocol (r1203546, -651, -653)
+   * make mod_dav_svn ignore non-Subversion POST requests (r1187695)
+   * avoid reading freed memory (r1204478)
+   * recognize empty (only byte order mark) UTF-8 files as text (issue #4064)
+   * fix 1.7 client regression when operating against a 1.0.x server (r1199876)
+   * remove empty parent dirs of removed externals on update (issue #4044)
+   * make 'svn diff -c N' work for files added in rN (issue #2873)
+   * plug a memory leak in the bdb backend (r1205726)
+   * fix 'svn import' with native eol-style and inconsistent EOLs (r1205193)
+   * fix reading beyond the end of a string in bdb backend (r1205839, -48)
+   * don't assert when committing an incomplete directory (issue #4042)
+
+  Developer-visible changes:
+   * JavaHL: allow 'status -u' to function properly (r1189190, -395)
+   * don't put '\r' characters in our generate sql headers (r1189580)
+   * properly define WIN64 on Windows x64 builds (r1188609)
+   * better adherence to C89 in enum definitions (r1189665)
+   * bump copyright year in Windows DLLs (r1189261)
+   * log a better error when opening rep-cache.db fails (r1204610, -73)
+
+
 Version 1.7.1
 (24 Oct 2011, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.1

Modified: subversion/branches/svn-bisect/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/COMMITTERS?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/COMMITTERS [UTF-8] (original)
+++ subversion/branches/svn-bisect/COMMITTERS [UTF-8] Mon Jul 30 06:39:28 2012
@@ -137,7 +137,7 @@ Commit access for specific areas:
        madanus   Madan U S <madan@collab.net>                (svnmerge) [EMAIL
                                                              IS BOUNCING]
           wein   Mathias Weinert <wein@mccw.de>              (mailer)
-        bhuvan   Bhuvaneswaran <bhuvan@collab.net>           (svn2feed.py,
+        bhuvan   Bhuvaneswaran A <bhuvan@apache.org>         (svn2feed.py,
                                                               build/hudson)
         aogier   Anthony Ogier <aogier@iorga.com>            (svn-merge-vendor.py)
       dkagedal   David Kågedal <davidk@lysator.liu.se>       (dsvn.el)
@@ -154,12 +154,15 @@ Commit access for specific areas:
                                                               tools/buildbot)
       artagnon   Ramkumar Ramachandra <artagnon@gmail.com>   (svnrdump, svntest)
          arwin   Arwin Arni <arwin@collab.net>               (svn-bisect)
+          joes   Joe Schaefer <joe_schaefer@yahoo.com>       (svnpubsub)
+
 
   Translation of message files:
 
        niqueco   Nicolás Lichtmaier <nick@reloco.com.ar>     (po: es)
         luebbe   Lübbe Onken <luebbe@tigris.org>             (po: de)
     jensseidel   Jens Seidel <jensseidel@users.sf.net>       (po: de)
+      astieger   Andreas Stieger <andreas.stieger@gmx.de>    (po: de)
       oyvindmo   Øyvind Møll <svn@moll.no>                   (po: nb)
       sunny256   Øyvind A. Holm <sunny@sunbase.org>          (po: nb)
         jzgoda   Jaroslaw Zgoda <jzgoda@o2.pl>               (po: pl)

Modified: subversion/branches/svn-bisect/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/INSTALL?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/INSTALL (original)
+++ subversion/branches/svn-bisect/INSTALL Mon Jul 30 06:39:28 2012
@@ -478,11 +478,11 @@ I.    INTRODUCTION
       is done: See section III for details.
 
 
-      10.  Python 2.4 or newer (http://www.python.org/)  (OPTIONAL)
+      10.  Python 2.5 or newer (http://www.python.org/)  (OPTIONAL)
 
       If you want to run "make check" or build from the latest source
       under Unix as described in section II.B and III.D, install
-      Python 2.4 or higher on your system. The majority of the test
+      Python 2.5 or higher on your system. The majority of the test
       suite is written in Python, as is part of Subversion's build
       system.
 
@@ -842,7 +842,7 @@ II.   INSTALLATION
         is compatible with VC6, which is the one from february 2003.
         You can get it from MSDN:
         http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
-      * Python 2.4 or higher, downloaded from http://www.python.org/ which is
+      * Python 2.5 or higher, downloaded from http://www.python.org/ which is
         used to generate the project files.
       * Perl 5.8 or higher from http://www.activestate.com/
       * Awk (from http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe) is

Modified: subversion/branches/svn-bisect/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/Makefile.in?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/Makefile.in (original)
+++ subversion/branches/svn-bisect/Makefile.in Mon Jul 30 06:39:28 2012
@@ -297,8 +297,11 @@ SWIG_RB_SRC_DIR = $(abs_srcdir)/subversi
 
 ### Automate JAR creation using Makefile generator's javahl-java.jar
 ### property.  Enhance generator to support JAR installation.
+JAVAHL_MANIFEST_IN = $(abs_srcdir)/subversion/bindings/javahl/Manifest.in
+JAVAHL_MANIFEST = subversion/bindings/javahl/Manifest
 INSTALL_EXTRA_JAVAHL_JAVA=\
-	$(JAR) cf $(JAVAHL_JAR) -C subversion/bindings/javahl/classes org; \
+	sed s/%bundleVersion/$(PACKAGE_VERSION)/ $(JAVAHL_MANIFEST_IN) > $(JAVAHL_MANIFEST); \
+	$(JAR) cfm $(JAVAHL_JAR) $(JAVAHL_MANIFEST) -C subversion/bindings/javahl/classes org; \
 	$(INSTALL_DATA) $(JAVAHL_JAR) $(DESTDIR)$(javahl_javadir);
 
 INSTALL_EXTRA_JAVAHL_LIB=@INSTALL_EXTRA_JAVAHL_LIB@
@@ -494,7 +497,7 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 	            $$flags                                                  \
 	            '$(abs_srcdir)' '$(abs_builddir)' $(TESTS);              \
 	else                                                                 \
-	  echo "make check: Python 2.4 or greater is required,";             \
+	  echo "make check: Python 2.5 or greater is required,";             \
 	  echo "            but was not detected during configure";          \
 	  exit 1;                                                            \
 	fi;

Modified: subversion/branches/svn-bisect/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/autogen.sh?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/autogen.sh (original)
+++ subversion/branches/svn-bisect/autogen.sh Mon Jul 30 06:39:28 2012
@@ -120,11 +120,11 @@ fi
 #
 # Note: this dependency on Python is fine: only SVN developers use autogen.sh
 #       and we can state that dev people need Python on their machine. Note
-#       that running gen-make.py requires Python 2.4 or newer.
+#       that running gen-make.py requires Python 2.5 or newer.
 
 PYTHON="`./build/find_python.sh`"
 if test -z "$PYTHON"; then
-  echo "Python 2.4 or later is required to run autogen.sh"
+  echo "Python 2.5 or later is required to run autogen.sh"
   echo "If you have a suitable Python installed, but not on the"
   echo "PATH, set the environment variable PYTHON to the full path"
   echo "to the Python executable, and re-run autogen.sh"

Modified: subversion/branches/svn-bisect/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build.conf?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build.conf (original)
+++ subversion/branches/svn-bisect/build.conf Mon Jul 30 06:39:28 2012
@@ -362,6 +362,15 @@ libs = libsvn_repos libsvn_subr
 install = apache-mod
 msvc-libs = libhttpd.lib
 
+[mod_dontdothat]
+description = Apache Httpd module to block certain kinds of Apache Subversion requests
+type = apache-mod
+path = tools/server-side/mod_dontdothat
+nonlibs = mod_dav_svn apr aprutil
+libs = libsvn_subr xml
+install = apache-mod
+msvc-libs = libhttpd.lib
+
 # ----------------------------------------------------------------------------
 #
 # CONSTRUCTED HEADERS
@@ -1113,7 +1122,7 @@ type = project
 path = build/win32
 libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync
        svnversion
-       mod_authz_svn mod_dav_svn
+       mod_authz_svn mod_dav_svn mod_dontdothat
        svnauthz-validate svnraisetreeconflict
 
 [__ALL_TESTS__]

Modified: subversion/branches/svn-bisect/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/ac-macros/apache.m4?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/ac-macros/apache.m4 (original)
+++ subversion/branches/svn-bisect/build/ac-macros/apache.m4 Mon Jul 30 06:39:28 2012
@@ -100,7 +100,7 @@ if test -n "$APXS" && test "$APXS" != "n
       apache_minor_version_wanted_regex=["[1-4]"]
       ;;
     2)
-      apache_minor_version_wanted_regex=["[3-4]"]
+      apache_minor_version_wanted_regex=["[3-5]"]
       ;;
     *)
       AC_MSG_ERROR([unknown APR version])

Modified: subversion/branches/svn-bisect/build/find_python.sh
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/find_python.sh?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/find_python.sh (original)
+++ subversion/branches/svn-bisect/build/find_python.sh Mon Jul 30 06:39:28 2012
@@ -23,7 +23,7 @@
 # Required version of Python
 # Python 2.0 = 0x2000000
 # Python 2.4 = 0x2040000
-VERSION=${1:-0x2040000}
+VERSION=${1:-0x2050000}
 
 for pypath in "$PYTHON" "$PYTHON2" "$PYTHON3" python python2 python3; do
   if [ "x$pypath" != "x" ]; then

Modified: subversion/branches/svn-bisect/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/generator/gen_vcnet_vcproj.py?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/svn-bisect/build/generator/gen_vcnet_vcproj.py Mon Jul 30 06:39:28 2012
@@ -115,6 +115,7 @@ class Generator(gen_win.WinGeneratorBase
       'instrument_apr_pools' : self.instrument_apr_pools,
       'instrument_purify_quantify' : self.instrument_purify_quantify,
       'version' : self.vcproj_version,
+      'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
       }
 
     if self.vcproj_extension == '.vcproj':

Modified: subversion/branches/svn-bisect/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/generator/gen_win.py?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/generator/gen_win.py (original)
+++ subversion/branches/svn-bisect/build/generator/gen_win.py Mon Jul 30 06:39:28 2012
@@ -90,6 +90,7 @@ class GeneratorBase(gen_base.GeneratorBa
     self.sqlite_path = 'sqlite-amalgamation'
     self.skip_sections = { 'mod_dav_svn': None,
                            'mod_authz_svn': None,
+                           'mod_dontdothat' : None,
                            'libsvn_auth_kwallet': None,
                            'libsvn_auth_gnome_keyring': None }
 
@@ -126,6 +127,7 @@ class GeneratorBase(gen_base.GeneratorBa
         self.httpd_path = val
         del self.skip_sections['mod_dav_svn']
         del self.skip_sections['mod_authz_svn']
+        del self.skip_sections['mod_dontdothat']
       elif opt == '--with-libintl':
         self.libintl_path = val
         self.enable_nls = 1
@@ -186,6 +188,11 @@ class GeneratorBase(gen_base.GeneratorBa
           self.sln_version = '11.00'
           self.vcproj_version = '10.0'
           self.vcproj_extension = '.vcxproj'
+        elif val == '11':
+          self.vs_version = '11'
+          self.sln_version = '12.00'
+          self.vcproj_version = '11.0'
+          self.vcproj_extension = '.vcxproj'
         else:
           print('WARNING: Unknown VS.NET version "%s",'
                  ' assuming "%s"\n' % (val, '7.00'))
@@ -294,7 +301,7 @@ class WinGeneratorBase(GeneratorBase):
 
     # Generate the build_zlib.bat file
     if self.zlib_path:
-      data = {'zlib_path': os.path.abspath(self.zlib_path),
+      data = {'zlib_path': os.path.relpath(self.zlib_path, self.projfilesdir),
               'zlib_version': self.zlib_version,
               'use_ml': self.have_ml and 1 or None}
       bat = os.path.join(self.projfilesdir, 'build_zlib.bat')
@@ -334,7 +341,7 @@ class WinGeneratorBase(GeneratorBase):
 
   def find_rootpath(self):
     "Gets the root path as understand by the project system"
-    return ".." + "\\.." * self.projfilesdir.count(os.sep) + "\\"
+    return os.path.relpath('.', self.projfilesdir) + "\\"
 
   def makeguid(self, data):
     "Generate a windows style GUID"
@@ -952,6 +959,8 @@ class WinGeneratorBase(GeneratorBase):
           fakeincludes.append(self.apath(self.swig_libdir, 'perl5'))
       else:
         fakeincludes.append(self.swig_libdir)
+      if target.lang == "perl":
+        fakeincludes.extend(self.perl_includes)
       if target.lang == "python":
         fakeincludes.extend(self.python_includes)
       if target.lang == "ruby":
@@ -1004,6 +1013,8 @@ class WinGeneratorBase(GeneratorBase):
     if self.swig_libdir \
        and (isinstance(target, gen_base.TargetSWIG)
             or isinstance(target, gen_base.TargetSWIGLib)):
+      if target.lang == "perl" and self.perl_libdir:
+        fakelibdirs.append(self.perl_libdir)
       if target.lang == "python" and self.python_libdir:
         fakelibdirs.append(self.python_libdir)
       if target.lang == "ruby" and self.ruby_libdir:
@@ -1141,16 +1152,20 @@ class WinGeneratorBase(GeneratorBase):
     if not self.zlib_path:
       return
     zlib_path = os.path.abspath(self.zlib_path)
+    zlib_sources = map(lambda x : os.path.relpath(x, self.projfilesdir),
+                       glob.glob(os.path.join(zlib_path, '*.c')) +
+                       glob.glob(os.path.join(zlib_path,
+                                              'contrib/masmx86/*.c')) +
+                       glob.glob(os.path.join(zlib_path,
+                                              'contrib/masmx86/*.asm')))
+    zlib_headers = map(lambda x : os.path.relpath(x, self.projfilesdir),
+                       glob.glob(os.path.join(zlib_path, '*.h')))
+                       
     self.move_proj_file(self.projfilesdir, name,
-                        (('zlib_path', zlib_path),
-                         ('zlib_sources',
-                          glob.glob(os.path.join(zlib_path, '*.c'))
-                          + glob.glob(os.path.join(zlib_path,
-                                                   'contrib/masmx86/*.c'))
-                          + glob.glob(os.path.join(zlib_path,
-                                                   'contrib/masmx86/*.asm'))),
-                         ('zlib_headers',
-                          glob.glob(os.path.join(zlib_path, '*.h'))),
+                        (('zlib_path', os.path.relpath(zlib_path,
+                                                       self.projfilesdir)),
+                         ('zlib_sources', zlib_sources),
+                         ('zlib_headers', zlib_headers),
                          ('zlib_version', self.zlib_version),
                          ('project_guid', self.makeguid('zlib')),
                          ('use_ml', self.have_ml and 1 or None),
@@ -1161,19 +1176,22 @@ class WinGeneratorBase(GeneratorBase):
       return
 
     neon_path = os.path.abspath(self.neon_path)
+    neon_sources = map(lambda x : os.path.relpath(x, self.neon_path),
+                       glob.glob(os.path.join(neon_path, 'src', '*.c')))
+    neon_headers = map(lambda x : os.path.relpath(x, self.neon_path),
+                       glob.glob(os.path.join(neon_path, 'src', '*.h')))
+
     self.move_proj_file(self.neon_path, name,
-                        (('neon_sources',
-                          glob.glob(os.path.join(neon_path, 'src', '*.c'))),
-                         ('neon_headers',
-                          glob.glob(os.path.join(neon_path, 'src', '*.h'))),
+                        (('neon_sources', neon_sources),
+                         ('neon_headers', neon_headers),
                          ('expat_path',
-                          os.path.join(os.path.abspath(self.apr_util_path),
-                                       'xml', 'expat', 'lib')),
-                         ('zlib_path', self.zlib_path
-                                       and os.path.abspath(self.zlib_path)),
-                         ('openssl_path',
-                          self.openssl_path
-                            and os.path.abspath(self.openssl_path)),
+                           os.path.relpath(os.path.join(self.apr_util_path,
+                                                        'xml', 'expat', 'lib'),
+                                           self.neon_path)),
+                         ('zlib_path', os.path.relpath(self.zlib_path,
+                                                       self.neon_path)),
+                         ('openssl_path', os.path.relpath(self.openssl_path,
+                                                          self.neon_path)),
                          ('project_guid', self.makeguid('neon')),
                         ))
 
@@ -1182,29 +1200,31 @@ class WinGeneratorBase(GeneratorBase):
       return
 
     serf_path = os.path.abspath(self.serf_path)
+    serf_sources = map(lambda x : os.path.relpath(x, self.serf_path),
+                       glob.glob(os.path.join(serf_path, '*.c'))
+                       + glob.glob(os.path.join(serf_path, 'auth', '*.c'))
+                       + glob.glob(os.path.join(serf_path, 'buckets',
+                                                   '*.c')))
+    serf_headers = map(lambda x : os.path.relpath(x, self.serf_path),
+                       glob.glob(os.path.join(serf_path, '*.h'))
+                       + glob.glob(os.path.join(serf_path, 'auth', '*.h'))
+                       + glob.glob(os.path.join(serf_path, 'buckets', '*.h')))
     if self.serf_ver_maj != 0:
       serflib = 'serf-%d.lib' % self.serf_ver_maj
     else:
       serflib = 'serf.lib'
 
     self.move_proj_file(self.serf_path, name,
-                        (('serf_sources',
-                          glob.glob(os.path.join(serf_path, '*.c'))
-                          + glob.glob(os.path.join(serf_path, 'auth', '*.c'))
-                          + glob.glob(os.path.join(serf_path, 'buckets',
-                                                   '*.c'))),
-                         ('serf_headers',
-                          glob.glob(os.path.join(serf_path, '*.h'))
-                          + glob.glob(os.path.join(serf_path, 'auth', '*.h'))
-                          + glob.glob(os.path.join(serf_path, 'buckets',
-                                                   '*.h'))),
-                         ('zlib_path', self.zlib_path
-                                       and os.path.abspath(self.zlib_path)),
-                         ('openssl_path',
-                          self.openssl_path
-                            and os.path.abspath(self.openssl_path)),
-                         ('apr_path', os.path.abspath(self.apr_path)),
-                         ('apr_util_path', os.path.abspath(self.apr_util_path)),
+                        (('serf_sources', serf_sources),
+                         ('serf_headers', serf_headers),
+                         ('zlib_path', os.path.relpath(self.zlib_path,
+                                                       self.serf_path)),
+                         ('openssl_path', os.path.relpath(self.openssl_path,
+                                                          self.serf_path)),
+                         ('apr_path', os.path.relpath(self.apr_path,
+                                                      self.serf_path)),
+                         ('apr_util_path', os.path.relpath(self.apr_util_path,
+                                                           self.serf_path)),
                          ('project_guid', self.makeguid('serf')),
                          ('apr_static', self.static_apr),
                          ('serf_lib', serflib),
@@ -1219,7 +1239,8 @@ class WinGeneratorBase(GeneratorBase):
     data = {
       'version' : self.vcproj_version,
       'configs' : self.configs,
-      'platforms' : self.platforms
+      'platforms' : self.platforms,
+      'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
       }
     for key, val in params:
       data[key] = val
@@ -1232,13 +1253,15 @@ class WinGeneratorBase(GeneratorBase):
 
   def _find_perl(self):
     "Find the right perl library name to link swig bindings with"
+    self.perl_includes = []
+    self.perl_libdir = None
     fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
                   'print "$Config{PERL_REVISION}$Config{PERL_VERSION}"'), 'r')
     try:
-      num = fp.readline()
-      if num:
+      line = fp.readline()
+      if line:
         msg = 'Found installed perl version number.'
-        self.perl_lib = 'perl' + num.rstrip() + '.lib'
+        self.perl_lib = 'perl' + line.rstrip() + '.lib'
       else:
         msg = 'Could not detect perl version.'
         self.perl_lib = 'perl56.lib'
@@ -1246,6 +1269,16 @@ class WinGeneratorBase(GeneratorBase):
              % (msg, self.perl_lib))
     finally:
       fp.close()
+      
+    fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
+                  'print $Config{archlib}'), 'r')
+    try:
+      line = fp.readline()
+      if line:
+        self.perl_libdir = os.path.join(line, 'CORE')
+        self.perl_includes = [os.path.join(line, 'CORE')]
+    finally:
+      fp.close()
 
   def _find_ruby(self):
     "Find the right Ruby library name to link swig bindings with"

Modified: subversion/branches/svn-bisect/build/generator/templates/neon.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/generator/templates/neon.vcxproj.ezt?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/generator/templates/neon.vcxproj.ezt (original)
+++ subversion/branches/svn-bisect/build/generator/templates/neon.vcxproj.ezt Mon Jul 30 06:39:28 2012
@@ -33,7 +33,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/svn-bisect/build/generator/templates/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/generator/templates/serf.vcxproj.ezt?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/generator/templates/serf.vcxproj.ezt (original)
+++ subversion/branches/svn-bisect/build/generator/templates/serf.vcxproj.ezt Mon Jul 30 06:39:28 2012
@@ -34,7 +34,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/svn-bisect/build/generator/templates/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/generator/templates/svn_config.vcxproj.ezt?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/branches/svn-bisect/build/generator/templates/svn_config.vcxproj.ezt Mon Jul 30 06:39:28 2012
@@ -33,6 +33,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/svn-bisect/build/generator/templates/svn_locale.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/generator/templates/svn_locale.vcxproj.ezt?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/generator/templates/svn_locale.vcxproj.ezt (original)
+++ subversion/branches/svn-bisect/build/generator/templates/svn_locale.vcxproj.ezt Mon Jul 30 06:39:28 2012
@@ -34,6 +34,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CLRSupport>false</CLRSupport>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/svn-bisect/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/generator/templates/vcnet_vcxproj.ezt?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/svn-bisect/build/generator/templates/vcnet_vcxproj.ezt Mon Jul 30 06:39:28 2012
@@ -33,6 +33,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'" Label="Configuration">
     <ConfigurationType>[config_type]</ConfigurationType>
     <UseDebugLibraries>[is configs.name "Debug"]true[else]false[end]</UseDebugLibraries>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/svn-bisect/build/generator/templates/zlib.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/generator/templates/zlib.vcxproj.ezt?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/generator/templates/zlib.vcxproj.ezt (original)
+++ subversion/branches/svn-bisect/build/generator/templates/zlib.vcxproj.ezt Mon Jul 30 06:39:28 2012
@@ -33,7 +33,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/svn-bisect/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/build/run_tests.py?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/build/run_tests.py (original)
+++ subversion/branches/svn-bisect/build/run_tests.py Mon Jul 30 06:39:28 2012
@@ -43,7 +43,6 @@ separated list of test numbers; the defa
 '''
 
 # A few useful constants
-LINE_LENGTH = 45
 SVN_VER_MINOR = 8
 
 import os, re, subprocess, sys, imp
@@ -72,6 +71,38 @@ class TextColors:
     cls.SUCCESS = ''
 
 
+def _get_term_width():
+  'Attempt to discern the width of the terminal'
+  # This may not work on all platforms, in which case the default of 80
+  # characters is used.  Improvements welcomed.
+
+  def ioctl_GWINSZ(fd):
+    try:
+      import fcntl, termios, struct, os
+      cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))
+    except:
+      return None
+    return cr
+
+  cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
+  if not cr:
+    try:
+      fd = os.open(os.ctermid(), os.O_RDONLY)
+      cr = ioctl_GWINSZ(fd)
+      os.close(fd)
+    except:
+      pass
+  if not cr:
+    try:
+      cr = (env['LINES'], env['COLUMNS'])
+    except:
+      cr = None
+  if not cr:
+    # Default
+    cr = (25, 80)
+  return int(cr[1])
+
+
 class TestHarness:
   '''Test harness for Subversion tests.
   '''
@@ -511,14 +542,17 @@ class TestHarness:
 
     progabs = os.path.abspath(os.path.join(self.srcdir, prog))
     old_cwd = os.getcwd()
+    line_length = _get_term_width()
+    dots_needed = line_length \
+                    - len(test_info) \
+                    - len('Running tests in ') \
+                    - len('success')
     try:
       os.chdir(progdir)
       if progbase[-3:] == '.py':
-        failed = self._run_py_test(progabs, test_nums,
-                                   (LINE_LENGTH - len(test_info)))
+        failed = self._run_py_test(progabs, test_nums, dots_needed)
       else:
-        failed = self._run_c_test(prog, test_nums,
-                                  (LINE_LENGTH - len(test_info)))
+        failed = self._run_c_test(prog, test_nums, dots_needed)
     except:
       os.chdir(old_cwd)
       raise

Modified: subversion/branches/svn-bisect/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/configure.ac?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/configure.ac (original)
+++ subversion/branches/svn-bisect/configure.ac Mon Jul 30 06:39:28 2012
@@ -584,7 +584,7 @@ dnl GPG Agent -------------------
 AC_ARG_WITH(gpg_agent,
 AS_HELP_STRING([--without-gpg-agent], 
                [Disable support for GPG-Agent]),
-               [with_gpg_agent=no], [with_gpg_agent=yes])
+               [], [with_gpg_agent=yes])
 AC_MSG_CHECKING([whether to support GPG-Agent])
 if test "$svn_enable_shared" != "yes"; then
   AC_MSG_RESULT([no (shared library support is disabled)])
@@ -792,6 +792,20 @@ if test "$svn_lib_kwallet" = "yes"; then
             [Defined if KWallet support is enabled])
 fi
 
+dnl plaintext passwords -------------------
+AC_ARG_ENABLE(plaintext-password-storage,
+AS_HELP_STRING([--disable-plaintext-password-storage],
+               [Disable on-disk caching of plaintext passwords and passphrases.
+                (Leaving this functionality enabled will not force Subversion
+                to store passwords in plaintext, but does permit users to
+                explicitly allow that behavior via runtime configuration.)]),
+[
+   if test "$enableval" = "no"; then
+      AC_MSG_NOTICE([Disabling plaintext password/passphrase storage])
+      AC_DEFINE(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE, 1,
+                [Defined if plaintext password/passphrase storage is disabled])
+   fi
+])
 
 dnl Build and install rules -------------------
 
@@ -1120,7 +1134,7 @@ AS_HELP_STRING([--enable-gprof],
 
 PYTHON="`$abs_srcdir/build/find_python.sh`"
 if test -z "$PYTHON"; then
-  AC_MSG_WARN([Python 2.4 or later is required to run the testsuite])
+  AC_MSG_WARN([Python 2.5 or later is required to run the testsuite])
   AC_MSG_WARN([or to use the Subversion Python bindings])
   AC_MSG_WARN([])
   AC_MSG_WARN([If you have a suitable Python installed, but not on the])

Modified: subversion/branches/svn-bisect/contrib/client-side/emacs/vc-svn.el
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/contrib/client-side/emacs/vc-svn.el?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/contrib/client-side/emacs/vc-svn.el (original)
+++ subversion/branches/svn-bisect/contrib/client-side/emacs/vc-svn.el Mon Jul 30 06:39:28 2012
@@ -3,18 +3,28 @@
 
 ;;; #########################################################################
 ;;; ##                                                                     ##
-;;; ##          NOTE: THIS IS NOT THE MASTER VERSION OF VC-SVN.EL          ##
+;;; ##                NOTE: THIS FILE IS ONLY FOR EMACS 21                 ##
 ;;; ##                                                                     ##
-;;; ## The canonical vc-svn.el now lives in the FSF Emacs tree, at         ##
-;;; ## http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/vc-svn.el. ##
-;;; ## The version here is maintained only because it is compatible with   ##
-;;; ## older releases of Emacs, since (as of this writing) the one in the  ##
-;;; ## FSF tree hasn't made it into an official release of Emacs yet.      ##
-;;; ## Eventually it will, though, and sometime after that the version     ##
-;;; ## here will go away.                                                  ##
+;;; ## Emacs 21 does not come with a working vc-mode for Subversion, and   ##
+;;; ## in particular, dsvn.el needs one. This file is provided for those   ##
+;;; ## who use that Emacs version.					   ##
 ;;; ##                                                                     ##
+;;; ## Emacs 22 and newer versions come with a Subversion-capable vc-mode  ##
+;;; ## and should not use this file.					   ##
+;;; ##									   ##
+;;; ## This file is a mild fork of vc-svn.el from the Emacs source tree.   ##
+;;; ## It may go away at some undetermined point in the future, when	   ##
+;;; ## support of Emacs 21 becomes completely irrelevant.		   ##
+;;; ## 									   ##
+;;; ## Maintenance of the vc-mode for Subversion should be done first and  ##
+;;; ## foremost in the Emacs tree, and changes done to this file only	   ##
+;;; ## when necessary.							   ##
+;;; ## 									   ##
 ;;; #########################################################################
 
+(if (> emacs-major-version 21)
+    (error "This file should only be used by Emacs versions 21 and earlier"))
+
 ;;; Writing this back end has shown up some problems in VC: bugs,
 ;;; shortcomings in the back end interface, and so on.  But I want to
 ;;; first produce code that Subversion users can use with an already

Modified: subversion/branches/svn-bisect/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/get-deps.sh?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/get-deps.sh (original)
+++ subversion/branches/svn-bisect/get-deps.sh Mon Jul 30 06:39:28 2012
@@ -23,15 +23,15 @@
 # get-deps.sh -- download the dependencies useful for building Subversion
 #
 
-APR=apr-1.4.5
-APR_UTIL=apr-util-1.3.12
+APR=apr-1.4.6
+APR_UTIL=apr-util-1.4.1
 NEON=neon-0.29.6
-SERF=serf-0.7.2
-ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.7.8
+SERF=serf-1.0.1
+ZLIB=zlib-1.2.6
+SQLITE_VERSION=3.7.10
 SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
 
-HTTPD=httpd-2.2.21
+HTTPD=httpd-2.2.22
 APR_ICONV=apr-iconv-1.2.1
 
 BASEDIR=`pwd`

Modified: subversion/branches/svn-bisect/notes/api-errata/1.7/ra001.txt
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/notes/api-errata/1.7/ra001.txt?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/notes/api-errata/1.7/ra001.txt (original)
+++ subversion/branches/svn-bisect/notes/api-errata/1.7/ra001.txt Mon Jul 30 06:39:28 2012
@@ -3,7 +3,7 @@ API ERRATA -- $Id$
 Root Cause of Errata: 
  Library(s) Affected: libsvn_ra, RA servers (svnserve, mod_dav_svn)
 Function(s) Affected: svn_delta_editor_t
-     New Behavior in: 1.7 (default), 1.4 (client optional)
+     New Behavior in: 1.8 (default), 1.4 (client optional)
       Related Issues: #2932, #3628
 
 



Mime
View raw message