subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1231318 [1/35] - in /subversion/branches/revprop-packing: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/client-side/emacs/ contrib/server-side/mod_dontdothat/ notes/ notes/http-and-webdav/ note...
Date Fri, 13 Jan 2012 21:40:38 GMT
Author: hwright
Date: Fri Jan 13 21:40:26 2012
New Revision: 1231318

URL: http://svn.apache.org/viewvc?rev=1231318&view=rev
Log:
On the rev-prop packing branch:
Bring up-to-date with trunk.

(I resolved conflicts in fs_fs.c.  This compiles, but I haven't yet run tests.)

Added:
    subversion/branches/revprop-packing/subversion/include/private/svn_mutex.h
      - copied unchanged from r1231296, subversion/trunk/subversion/include/private/svn_mutex.h
    subversion/branches/revprop-packing/subversion/include/private/svn_subr_private.h
      - copied unchanged from r1231296, subversion/trunk/subversion/include/private/svn_subr_private.h
    subversion/branches/revprop-packing/subversion/include/svn_editor.h
      - copied unchanged from r1231296, subversion/trunk/subversion/include/svn_editor.h
    subversion/branches/revprop-packing/subversion/libsvn_client/diff_summarize.c
      - copied unchanged from r1231296, subversion/trunk/subversion/libsvn_client/diff_summarize.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/spillbuf.c
      - copied unchanged from r1231296, subversion/trunk/subversion/libsvn_subr/spillbuf.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/svn_mutex.c
      - copied unchanged from r1231296, subversion/trunk/subversion/libsvn_subr/svn_mutex.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/svn_types.c
      - copied unchanged from r1231296, subversion/trunk/subversion/libsvn_subr/svn_types.c
    subversion/branches/revprop-packing/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent.tar.bz2
      - copied unchanged from r1231296, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent.tar.bz2
    subversion/branches/revprop-packing/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent_repos.tar.bz2
      - copied unchanged from r1231296, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent_repos.tar.bz2
    subversion/branches/revprop-packing/subversion/tests/cmdline/upgrade_tests_data/upgrade_file_externals.tar.bz2
      - copied unchanged from r1231296, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_file_externals.tar.bz2
    subversion/branches/revprop-packing/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
      - copied unchanged from r1231296, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
    subversion/branches/revprop-packing/subversion/tests/cmdline/upgrade_tests_data/upgrade_not_present_replaced.tar.bz2
      - copied unchanged from r1231296, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_not_present_replaced.tar.bz2
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/spillbuf-test.c
      - copied unchanged from r1231296, subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_wc/wc-incomplete-tester.c
      - copied unchanged from r1231296, subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c
    subversion/branches/revprop-packing/tools/client-side/mergeinfo-sanitizer.py
      - copied unchanged from r1231296, subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
    subversion/branches/revprop-packing/tools/dev/histogram.py
      - copied unchanged from r1231296, subversion/trunk/tools/dev/histogram.py
    subversion/branches/revprop-packing/tools/dist/_gnupg.py
      - copied unchanged from r1231296, subversion/trunk/tools/dist/_gnupg.py
    subversion/branches/revprop-packing/tools/dist/templates/download.ezt
      - copied unchanged from r1231296, subversion/trunk/tools/dist/templates/download.ezt
    subversion/branches/revprop-packing/tools/dist/templates/htaccess.ezt
      - copied unchanged from r1231296, subversion/trunk/tools/dist/templates/htaccess.ezt
    subversion/branches/revprop-packing/tools/dist/templates/stable-news.ezt
      - copied unchanged from r1231296, subversion/trunk/tools/dist/templates/stable-news.ezt
    subversion/branches/revprop-packing/tools/server-side/mod_dontdothat/   (props changed)
      - copied from r1231296, subversion/trunk/tools/server-side/mod_dontdothat/
Removed:
    subversion/branches/revprop-packing/contrib/server-side/mod_dontdothat/
    subversion/branches/revprop-packing/subversion/include/private/svn_editor.h
    subversion/branches/revprop-packing/subversion/libsvn_client/repos_diff_summarize.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/constructors.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/kitchensink.c
    subversion/branches/revprop-packing/tools/client-side/svnmucc/svnmucc-test.py
    subversion/branches/revprop-packing/tools/dist/gnupg.py
Modified:
    subversion/branches/revprop-packing/   (props changed)
    subversion/branches/revprop-packing/CHANGES
    subversion/branches/revprop-packing/INSTALL
    subversion/branches/revprop-packing/Makefile.in
    subversion/branches/revprop-packing/build.conf
    subversion/branches/revprop-packing/build/ac-macros/berkeley-db.m4
    subversion/branches/revprop-packing/build/ac-macros/sqlite.m4
    subversion/branches/revprop-packing/build/ac-macros/zlib.m4
    subversion/branches/revprop-packing/build/generator/gen_win.py
    subversion/branches/revprop-packing/build/generator/templates/neon.vcxproj.ezt
    subversion/branches/revprop-packing/build/generator/templates/serf.vcxproj.ezt
    subversion/branches/revprop-packing/build/generator/templates/vcnet_vcproj.ezt
    subversion/branches/revprop-packing/build/generator/templates/vcnet_vcxproj.ezt
    subversion/branches/revprop-packing/build/generator/templates/zlib.vcxproj.ezt
    subversion/branches/revprop-packing/build/getversion.py
    subversion/branches/revprop-packing/build/run_tests.py
    subversion/branches/revprop-packing/build/transform_sql.py
    subversion/branches/revprop-packing/build/win32/svn.rc
    subversion/branches/revprop-packing/configure.ac
    subversion/branches/revprop-packing/contrib/client-side/emacs/dsvn.el
    subversion/branches/revprop-packing/contrib/client-side/emacs/vc-svn.el
    subversion/branches/revprop-packing/get-deps.sh
    subversion/branches/revprop-packing/notes/editor-v2.txt
    subversion/branches/revprop-packing/notes/fsfs-improvements.txt
    subversion/branches/revprop-packing/notes/http-and-webdav/webdav-protocol
    subversion/branches/revprop-packing/notes/knobs
    subversion/branches/revprop-packing/notes/repos-dictated-config
    subversion/branches/revprop-packing/notes/wc-ng/transitions
    subversion/branches/revprop-packing/subversion/bindings/javahl/native/Array.cpp
    subversion/branches/revprop-packing/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/revprop-packing/subversion/bindings/javahl/native/File.cpp
    subversion/branches/revprop-packing/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/revprop-packing/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/revprop-packing/subversion/bindings/javahl/native/SVNRepos.cpp
    subversion/branches/revprop-packing/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/revprop-packing/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
    subversion/branches/revprop-packing/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/revprop-packing/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/revprop-packing/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
    subversion/branches/revprop-packing/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/branches/revprop-packing/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
    subversion/branches/revprop-packing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/revprop-packing/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
    subversion/branches/revprop-packing/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/revprop-packing/subversion/bindings/swig/ruby/test/test_delta.rb
    subversion/branches/revprop-packing/subversion/bindings/swig/svn_wc.i
    subversion/branches/revprop-packing/subversion/include/private/ra_svn_sasl.h
    subversion/branches/revprop-packing/subversion/include/private/svn_adler32.h   (props changed)
    subversion/branches/revprop-packing/subversion/include/private/svn_cache.h
    subversion/branches/revprop-packing/subversion/include/private/svn_client_private.h
    subversion/branches/revprop-packing/subversion/include/private/svn_dav_protocol.h
    subversion/branches/revprop-packing/subversion/include/private/svn_debug.h
    subversion/branches/revprop-packing/subversion/include/private/svn_dep_compat.h
    subversion/branches/revprop-packing/subversion/include/private/svn_error_private.h
    subversion/branches/revprop-packing/subversion/include/private/svn_fs_util.h
    subversion/branches/revprop-packing/subversion/include/private/svn_fspath.h
    subversion/branches/revprop-packing/subversion/include/private/svn_mergeinfo_private.h
    subversion/branches/revprop-packing/subversion/include/private/svn_opt_private.h
    subversion/branches/revprop-packing/subversion/include/private/svn_ra_private.h
    subversion/branches/revprop-packing/subversion/include/private/svn_sqlite.h
    subversion/branches/revprop-packing/subversion/include/private/svn_string_private.h   (props changed)
    subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h   (props changed)
    subversion/branches/revprop-packing/subversion/include/private/svn_wc_private.h
    subversion/branches/revprop-packing/subversion/include/svn_client.h
    subversion/branches/revprop-packing/subversion/include/svn_config.h
    subversion/branches/revprop-packing/subversion/include/svn_dav.h
    subversion/branches/revprop-packing/subversion/include/svn_delta.h
    subversion/branches/revprop-packing/subversion/include/svn_dirent_uri.h
    subversion/branches/revprop-packing/subversion/include/svn_error_codes.h
    subversion/branches/revprop-packing/subversion/include/svn_fs.h
    subversion/branches/revprop-packing/subversion/include/svn_io.h
    subversion/branches/revprop-packing/subversion/include/svn_mergeinfo.h
    subversion/branches/revprop-packing/subversion/include/svn_path.h
    subversion/branches/revprop-packing/subversion/include/svn_ra.h
    subversion/branches/revprop-packing/subversion/include/svn_ra_svn.h
    subversion/branches/revprop-packing/subversion/include/svn_repos.h
    subversion/branches/revprop-packing/subversion/include/svn_sorts.h
    subversion/branches/revprop-packing/subversion/include/svn_string.h
    subversion/branches/revprop-packing/subversion/include/svn_types.h
    subversion/branches/revprop-packing/subversion/include/svn_wc.h
    subversion/branches/revprop-packing/subversion/libsvn_client/add.c
    subversion/branches/revprop-packing/subversion/libsvn_client/blame.c
    subversion/branches/revprop-packing/subversion/libsvn_client/cleanup.c
    subversion/branches/revprop-packing/subversion/libsvn_client/client.h
    subversion/branches/revprop-packing/subversion/libsvn_client/cmdline.c
    subversion/branches/revprop-packing/subversion/libsvn_client/commit.c
    subversion/branches/revprop-packing/subversion/libsvn_client/commit_util.c
    subversion/branches/revprop-packing/subversion/libsvn_client/copy.c
    subversion/branches/revprop-packing/subversion/libsvn_client/delete.c
    subversion/branches/revprop-packing/subversion/libsvn_client/deprecated.c
    subversion/branches/revprop-packing/subversion/libsvn_client/diff.c
    subversion/branches/revprop-packing/subversion/libsvn_client/export.c
    subversion/branches/revprop-packing/subversion/libsvn_client/externals.c
    subversion/branches/revprop-packing/subversion/libsvn_client/info.c
    subversion/branches/revprop-packing/subversion/libsvn_client/list.c
    subversion/branches/revprop-packing/subversion/libsvn_client/log.c
    subversion/branches/revprop-packing/subversion/libsvn_client/merge.c
    subversion/branches/revprop-packing/subversion/libsvn_client/mergeinfo.c
    subversion/branches/revprop-packing/subversion/libsvn_client/mergeinfo.h
    subversion/branches/revprop-packing/subversion/libsvn_client/patch.c
    subversion/branches/revprop-packing/subversion/libsvn_client/prop_commands.c
    subversion/branches/revprop-packing/subversion/libsvn_client/ra.c
    subversion/branches/revprop-packing/subversion/libsvn_client/relocate.c
    subversion/branches/revprop-packing/subversion/libsvn_client/repos_diff.c
    subversion/branches/revprop-packing/subversion/libsvn_client/status.c
    subversion/branches/revprop-packing/subversion/libsvn_client/switch.c
    subversion/branches/revprop-packing/subversion/libsvn_client/update.c
    subversion/branches/revprop-packing/subversion/libsvn_client/url.c
    subversion/branches/revprop-packing/subversion/libsvn_client/util.c
    subversion/branches/revprop-packing/subversion/libsvn_delta/compat.c
    subversion/branches/revprop-packing/subversion/libsvn_delta/compose_delta.c
    subversion/branches/revprop-packing/subversion/libsvn_delta/delta.h
    subversion/branches/revprop-packing/subversion/libsvn_delta/editor.c
    subversion/branches/revprop-packing/subversion/libsvn_delta/svndiff.c
    subversion/branches/revprop-packing/subversion/libsvn_delta/text_delta.c
    subversion/branches/revprop-packing/subversion/libsvn_delta/xdelta.c
    subversion/branches/revprop-packing/subversion/libsvn_diff/diff_file.c
    subversion/branches/revprop-packing/subversion/libsvn_diff/diff_memory.c
    subversion/branches/revprop-packing/subversion/libsvn_diff/parse-diff.c
    subversion/branches/revprop-packing/subversion/libsvn_fs/fs-loader.c
    subversion/branches/revprop-packing/subversion/libsvn_fs/fs-loader.h
    subversion/branches/revprop-packing/subversion/libsvn_fs_base/bdb/changes-table.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_base/bdb/env.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_base/bdb/locks-table.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_base/fs.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_base/id.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_base/reps-strings.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_base/tree.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_base/tree.h
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/caching.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/dag.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs.h
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/id.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/key-gen.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/lock.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/rep-cache-db.sql
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/rep-cache.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/rep-cache.h
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c   (props changed)
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h   (props changed)
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/tree.c
    subversion/branches/revprop-packing/subversion/libsvn_fs_fs/tree.h
    subversion/branches/revprop-packing/subversion/libsvn_ra/compat.c
    subversion/branches/revprop-packing/subversion/libsvn_ra/deprecated.c
    subversion/branches/revprop-packing/subversion/libsvn_ra/ra_loader.c
    subversion/branches/revprop-packing/subversion/libsvn_ra/ra_loader.h
    subversion/branches/revprop-packing/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/commit.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/fetch.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/file_revs.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/get_dated_rev.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/get_deleted_rev.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/get_location_segments.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/get_locations.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/get_locks.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/lock.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/log.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/merge.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/mergeinfo.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/options.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/props.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/ra_neon.h
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/replay.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/session.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_neon/util.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/blame.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/commit.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/get_deleted_rev.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/getdate.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/locks.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/log.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/merge.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/mergeinfo.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/options.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/property.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/replay.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/serf.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/update.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_serf/util.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_svn/client.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/revprop-packing/subversion/libsvn_ra_svn/protocol
    subversion/branches/revprop-packing/subversion/libsvn_repos/authz.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/commit.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/deprecated.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/dump.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/log.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/replay.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/reporter.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/repos.c
    subversion/branches/revprop-packing/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c   (props changed)
    subversion/branches/revprop-packing/subversion/libsvn_subr/cache-inprocess.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/cmdline.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/config.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/config_file.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/config_win.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/debug.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/deprecated.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/dso.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/error.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/gpg_agent.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/io.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/iter.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/log.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/opt.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/prompt.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/properties.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/quoprint.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/simple_providers.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/sorts.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/sqlite.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/stream.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/subst.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/svn_base64.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/svn_string.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c   (props changed)
    subversion/branches/revprop-packing/subversion/libsvn_subr/target.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/utf.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/win32_xlate.c
    subversion/branches/revprop-packing/subversion/libsvn_subr/xml.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/adm_crawler.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/adm_files.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/adm_ops.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/ambient_depth_filter_editor.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/cleanup.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/conflicts.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/conflicts.h
    subversion/branches/revprop-packing/subversion/libsvn_wc/copy.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/crop.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/deprecated.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/diff_editor.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/diff_local.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/entries.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/externals.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/info.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/lock.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/merge.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/node.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/props.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/props.h
    subversion/branches/revprop-packing/subversion/libsvn_wc/questions.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/relocate.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/status.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/translate.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/tree_conflicts.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/update_editor.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/upgrade.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/util.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/revprop-packing/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/revprop-packing/subversion/libsvn_wc/wc.h
    subversion/branches/revprop-packing/subversion/libsvn_wc/wc_db.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/wc_db.h
    subversion/branches/revprop-packing/subversion/libsvn_wc/wc_db_pristine.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/workqueue.c
    subversion/branches/revprop-packing/subversion/libsvn_wc/workqueue.h
    subversion/branches/revprop-packing/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/revprop-packing/subversion/mod_dav_svn/lock.c
    subversion/branches/revprop-packing/subversion/mod_dav_svn/merge.c
    subversion/branches/revprop-packing/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/revprop-packing/subversion/mod_dav_svn/reports/log.c
    subversion/branches/revprop-packing/subversion/mod_dav_svn/reports/mergeinfo.c
    subversion/branches/revprop-packing/subversion/mod_dav_svn/repos.c
    subversion/branches/revprop-packing/subversion/mod_dav_svn/util.c
    subversion/branches/revprop-packing/subversion/mod_dav_svn/version.c
    subversion/branches/revprop-packing/subversion/po/de.po
    subversion/branches/revprop-packing/subversion/po/fr.po
    subversion/branches/revprop-packing/subversion/po/zh_CN.po
    subversion/branches/revprop-packing/subversion/svn/add-cmd.c
    subversion/branches/revprop-packing/subversion/svn/blame-cmd.c
    subversion/branches/revprop-packing/subversion/svn/cat-cmd.c
    subversion/branches/revprop-packing/subversion/svn/changelist-cmd.c
    subversion/branches/revprop-packing/subversion/svn/cl.h
    subversion/branches/revprop-packing/subversion/svn/commit-cmd.c
    subversion/branches/revprop-packing/subversion/svn/copy-cmd.c
    subversion/branches/revprop-packing/subversion/svn/delete-cmd.c
    subversion/branches/revprop-packing/subversion/svn/diff-cmd.c
    subversion/branches/revprop-packing/subversion/svn/import-cmd.c
    subversion/branches/revprop-packing/subversion/svn/info-cmd.c
    subversion/branches/revprop-packing/subversion/svn/list-cmd.c
    subversion/branches/revprop-packing/subversion/svn/log-cmd.c
    subversion/branches/revprop-packing/subversion/svn/main.c
    subversion/branches/revprop-packing/subversion/svn/merge-cmd.c
    subversion/branches/revprop-packing/subversion/svn/mergeinfo-cmd.c
    subversion/branches/revprop-packing/subversion/svn/mkdir-cmd.c
    subversion/branches/revprop-packing/subversion/svn/move-cmd.c
    subversion/branches/revprop-packing/subversion/svn/notify.c
    subversion/branches/revprop-packing/subversion/svn/propedit-cmd.c
    subversion/branches/revprop-packing/subversion/svn/proplist-cmd.c
    subversion/branches/revprop-packing/subversion/svn/props.c
    subversion/branches/revprop-packing/subversion/svn/relocate-cmd.c
    subversion/branches/revprop-packing/subversion/svn/schema/diff.rnc
    subversion/branches/revprop-packing/subversion/svn/schema/status.rnc
    subversion/branches/revprop-packing/subversion/svn/status-cmd.c
    subversion/branches/revprop-packing/subversion/svn/status.c
    subversion/branches/revprop-packing/subversion/svn/tree-conflicts.c
    subversion/branches/revprop-packing/subversion/svn/util.c
    subversion/branches/revprop-packing/subversion/svnadmin/main.c
    subversion/branches/revprop-packing/subversion/svndumpfilter/main.c
    subversion/branches/revprop-packing/subversion/svnlook/main.c
    subversion/branches/revprop-packing/subversion/svnrdump/dump_editor.c
    subversion/branches/revprop-packing/subversion/svnrdump/load_editor.c
    subversion/branches/revprop-packing/subversion/svnrdump/svnrdump.c
    subversion/branches/revprop-packing/subversion/svnserve/cyrus_auth.c
    subversion/branches/revprop-packing/subversion/svnserve/serve.c
    subversion/branches/revprop-packing/subversion/svnsync/main.c
    subversion/branches/revprop-packing/subversion/svnsync/sync.c
    subversion/branches/revprop-packing/subversion/svnversion/main.c
    subversion/branches/revprop-packing/subversion/tests/cmdline/authz_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/basic_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/cat_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/commit_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/copy_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/dav-mirror-autocheck.sh
    subversion/branches/revprop-packing/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/revprop-packing/subversion/tests/cmdline/depth_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/diff_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/externals_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
    subversion/branches/revprop-packing/subversion/tests/cmdline/input_validation_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/lock_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/log_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/merge_authz_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/merge_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/patch_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/prop_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/resolve_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/special_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/stat_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/svnmucc_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/factory.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/svntest/main.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/update_tests.py
    subversion/branches/revprop-packing/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/revprop-packing/subversion/tests/libsvn_client/client-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_delta/   (props changed)
    subversion/branches/revprop-packing/subversion/tests/libsvn_diff/diff-diff3-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_fs/locks-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_fs_base/strings-reps-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_ra_local/ra-local-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/   (props changed)
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/config-test.cfg
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/mergeinfo-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/path-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_subr/subst_translate-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_wc/   (props changed)
    subversion/branches/revprop-packing/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/revprop-packing/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/revprop-packing/subversion/tests/svn_test_fs.c
    subversion/branches/revprop-packing/subversion/tests/svn_test_main.c
    subversion/branches/revprop-packing/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
    subversion/branches/revprop-packing/tools/client-side/bash_completion
    subversion/branches/revprop-packing/tools/client-side/bash_completion_test
    subversion/branches/revprop-packing/tools/client-side/svn-ssl-fingerprints.sh
    subversion/branches/revprop-packing/tools/client-side/svn-viewspec.py
    subversion/branches/revprop-packing/tools/client-side/svnmucc/svnmucc.c
    subversion/branches/revprop-packing/tools/dev/benchmarks/suite1/benchmark.py
    subversion/branches/revprop-packing/tools/dev/benchmarks/suite1/cronjob
    subversion/branches/revprop-packing/tools/dev/benchmarks/suite1/run
    subversion/branches/revprop-packing/tools/dev/po-merge.py
    subversion/branches/revprop-packing/tools/dev/unix-build/Makefile.svn
    subversion/branches/revprop-packing/tools/dev/wc-format.py
    subversion/branches/revprop-packing/tools/dev/windows-build/README
    subversion/branches/revprop-packing/tools/dist/backport.pl
    subversion/branches/revprop-packing/tools/dist/collect_sigs.py
    subversion/branches/revprop-packing/tools/dist/dist.sh
    subversion/branches/revprop-packing/tools/dist/nightly.sh
    subversion/branches/revprop-packing/tools/dist/rat-excludes
    subversion/branches/revprop-packing/tools/dist/release.py
    subversion/branches/revprop-packing/tools/dist/templates/nightly-candidates.ezt
    subversion/branches/revprop-packing/tools/dist/templates/rc-candidates.ezt
    subversion/branches/revprop-packing/tools/dist/templates/rc-news.ezt
    subversion/branches/revprop-packing/tools/dist/templates/stable-candidates.ezt
    subversion/branches/revprop-packing/tools/examples/SvnCLBrowse
    subversion/branches/revprop-packing/tools/examples/get-location-segments.py
    subversion/branches/revprop-packing/tools/server-side/svnauthz-validate.c
    subversion/branches/revprop-packing/tools/server-side/svnpredumpfilter.py

Propchange: subversion/branches/revprop-packing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 21:40:26 2012
@@ -23,6 +23,7 @@
 /subversion/branches/integrate-partial-getter:1072558-1076552
 /subversion/branches/integrate-readline-speedup:1072553-1072555
 /subversion/branches/integrate-stream-api-extensions:1068695-1072516
+/subversion/branches/integrate-string-improvements:1068251-1190617
 /subversion/branches/integrate-txdelta-caching:1072541-1078213
 /subversion/branches/issue-2779-dev:965496-984198
 /subversion/branches/issue-2843-dev:871432-874179
@@ -32,19 +33,19 @@
 /subversion/branches/issue-3220-dev:872210-872226
 /subversion/branches/issue-3242-dev:879653-896436
 /subversion/branches/issue-3334-dirs:875156-875867
-/subversion/branches/issue-3668-3669:1031000-1035744
 /subversion/branches/issue-3975:1152931-1160746
 /subversion/branches/kwallet:870785-871314
 /subversion/branches/log-g-performance:870941-871032
 /subversion/branches/merge-skips-obstructions:874525-874615
 /subversion/branches/nfc-nfd-aware-client:870276,870376
-/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,1029344,
 1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,10
 29342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
 /subversion/branches/py-tests-as-modules:956579-1033052
 /subversion/branches/ra_serf-digest-authn:875693-876404
 /subversion/branches/reintegrate-improvements:873853-874164
 /subversion/branches/subtree-mergeinfo:876734-878766
 /subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
 /subversion/branches/svn-patch-improvements:918519-934609
+/subversion/branches/svn_mutex:1141683-1182099
 /subversion/branches/svnpatch-diff:865738-876477
 /subversion/branches/svnraisetc:874709-875149
 /subversion/branches/svnserve-logging:869828-870893
@@ -55,4 +56,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1143817-1163196
+/subversion/trunk:1143817-1231296

Modified: subversion/branches/revprop-packing/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/CHANGES?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/CHANGES (original)
+++ subversion/branches/revprop-packing/CHANGES Fri Jan 13 21:40:26 2012
@@ -3,14 +3,120 @@ Version 1.8.0
 http://svn.apache.org/repos/asf/subversion/tags/1.8.0
 
  User-visible changes:
+  - General:
+    * remove extraneous externals output from 'svn status -q' (issue #1935)
+
+  - Major new features:
+    *
+
+  - 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)
+
+  - Client-side bugfixes:
+    *
 
+  - Server-side bugfixes:
+    *
+
+  - Other tool improvements and bugfixes:
+    *
+  
  Developer-visible changes:
+  - General:
+    *
+
   - API changes:
     * fix inconsistent handling of log revs without changed paths (issue #3694)
 
+  - Bindings:
+    *
+
+
+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
+
+  User-visible changes:
+   * improve performance of 'svn info' (r1164386)
+   * improve hash table sorting performance (r1167659)
+   * update bash completion for 1.7 (r1177001)
+   * make 'svn ls' continue to work with 1.0-1.3 repos (r1154278, -379, -82)
+   * improve handling of error messages generated by Cyrus SASL (r1179767)
+   * update INSTALL documentation file (r1182115, and others)
+   * error instead of assert when upgrading corrupt WCs (r1182904, -9)
+   * improve memory usage in merge (r1176915)
+   * fix an invalid assertion in merge (r1149103, -35)
+   * improve performance of 'merge --reintegrate' in edge-case (r1167681)
+   * fixed: 'svn mergeinfo' shows wrong revisions for added nodes (issue #3791)
+   * make 'svn add --parents D/file' work if D is deleted (r1185222)
+   * improve performance of trivial text file merges (issue #4009)
+   * add FSFS sanity check to prevent corruption seen in the wild (r1178280)
+   * improve correctness/performance of recursive info and proplist (r1164426)
+   * fix memory leak in 'merge --reintegrate' (r1180154)
+   * fix handling of directories after 'update --set-depth=empty' (r1185911)
+   * fix 'checksum != NULL' assertions in some upgraded WCs (r1177732)
+   * fix upgrading of WCs containing authz-restricted dirs (r1185738)
+   * make the server tolerate svn:mergeinfo with malformed paths (r1182771)
+   * fix some erroneous warning messages from the svn client (r1185746)
+   * fix WC upgrade with replaced nodes in edge-case (issue #4033)
+
+  Developer-visible changes:
+   * fix object lifetime issues in the JavaHL bindings (r1175888)
+   * fix org.tigris JavaHL wrappers to avoid double finalize (r1179680)
+   * don't write to const memory (r1177492)
+   * improve zlib configuration (r1174761, -98, -806)
+   * improve SQLite runtime init for OS X 10.7 compat (r1181666)
+   * improve test suite correctness (r1174111)
+   * fix potential segfault seen by TSVN (r1183263)
+   * fix backward compat crashes in JavaHL (r1183054, -347)
+   * fill in repos_* fields of svn_wc_status3_t for repos-only nodes (r1181609)
+   * disable the SQLite shared process cache (r1185242, r1185280)
+
 
 Version 1.7.0
-(?? ??? 2011, from /branches/1.7.x)
+(11 Oct 2011, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.0
 
 See the 1.7 release notes for a more verbose overview of the changes since
@@ -24,7 +130,8 @@ the 1.6 release:  http://subversion.apac
     * Less verbose HTTP-based repository access protocol (issue #1161, #3371)
     * Rewritten working copy metadata storage (issue #3357)
     * New 'svn patch' subcommand (issue #511)
-    * Limit FSFS memory consumption (issue #3478, #3593)
+    * Rewritten FSFS in-memory caching for better performance
+    * New remote repository dump/load client 'svnrdump'
 
   - Minor new features and improvements:
     * Better handling of HTTP redirects (issue #2779)
@@ -60,7 +167,7 @@ the 1.6 release:  http://subversion.apac
     * allow subdirs of moved dirs to be moved and committed (issue #1259)
     * improved performance of 'svn mv' with whole directories (issue #1284)
     * 'svn rm B; svn cp A B' now works (issue #1516)
-    * 'svn diff URL1 URL2' now reverse of 'svn diff URL2 URL1) (issue #2333)
+    * 'svn diff URL1 URL2' now reverse of 'svn diff URL2 URL1' (issue #2333)
     * error if relocating to an unused URL (issue #2531)
     * 'svn blame -rWORKING' is now supported (issue #2544)
     * improve correctness of commit on a relocated wc over ra_dav (issue #2578)
@@ -160,8 +267,9 @@ the 1.6 release:  http://subversion.apac
     * match paths against authz rules in case sensitive way (issue #3781)
     * svnserve can now force usernames to upper/lower case (issue #3726)
     * reduce duplicate log messages in 'log -g' (issue #3650)
-    * don't crash on shutdown with SASL in inetd mode (issue #3664)
+    * svnserve: don't crash on shutdown with SASL in inetd mode (issue #3664)
     * disallow arbitrary HTTP headers from committers (issue #2872)
+    * limit FSFS memory consumption (issue #3478, #3593)
     * many other minor bugfixes too numerous to list here
 
   - Other tool improvements and bugfixes:
@@ -192,7 +300,7 @@ the 1.6 release:  http://subversion.apac
     * add information on text and property mods in log APIs (r877688)
     * fixed: svn_ra_local__get_file() leaks file descriptors (issue #3290)
     * svn_ra_neon__get_dir() returns correct dir set for URLs (issue #3093)
-    * swig-py: always set ChangedPath.path (issue #2630)
+    * swig-py: always set ChangedPath.path (also for deletes) (issue #2630)
     * improve conflict resolver API for a specific direction (issue #3049)
 
   - Bindings:
@@ -230,10 +338,10 @@ http://svn.apache.org/repos/asf/subversi
     * fix 'log -g' excessive duplicate output (issue #3650)
     * fix svnsync copyfrom handling bug with BDB (r1036429)
     * server-side validation of svn:mergeinfo syntax during commit (issue #3895)
-    * fix remotely triggerable mod_dav_svn DoS
+    * fix remotely triggerable mod_dav_svn DoS (r1130303)
             See CVE-2011-1783, and descriptive advisory at
             http://subversion.apache.org/security/CVE-2011-1783-advisory.txt
-    * fix potential leak of authz-protected file contents
+    * fix potential leak of authz-protected file contents (r1130303)
             See CVE-2011-1921, and descriptive advisory at
             http://subversion.apache.org/security/CVE-2011-1921-advisory.txt
 

Modified: subversion/branches/revprop-packing/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/INSTALL?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/INSTALL (original)
+++ subversion/branches/revprop-packing/INSTALL Fri Jan 13 21:40:26 2012
@@ -195,10 +195,7 @@ I.    INTRODUCTION
 
       Whenever you want to build any part of Subversion, you need the
       Apache Portable Runtime (APR) and the APR Utility (APR-util)
-      libraries. These are included in the Subversion dependency package -
-      if you are building from a source tarball and wish to use the versions
-      of APR and APR-util included there, just unpack the dependency package
-      and skip ahead to the next requirement.
+      libraries.
 
 
         ****************************************************************
@@ -233,7 +230,7 @@ I.    INTRODUCTION
         | Note that it's *perfectly* safe to use APR 1.X from the      |
         | beginning.  In fact, we recommend it.  If you're building    |
         | Subversion for the first time, there's no compatibility      |
-        | issue to worry about, so grab the latest version of APR.
+        | issue to worry about, so grab the latest version of APR.     |
         |                                                              |
         | If you already have a Subversion installation using APR      |
         | 0.9.x, it's still possible to move to APR 1.X safely.  Just  |
@@ -242,8 +239,8 @@ I.    INTRODUCTION
         |______________________________________________________________|
 
 
-      If you are not building from a tarball with the dependency
-      package, you will need to get these yourself:
+      If you do not have a pre-installed APR and APR-util, you will need
+      to get these yourself:
 
           http://apr.apache.org/download.cgi
 
@@ -452,7 +449,7 @@ I.    INTRODUCTION
       a precompiled version of the Berkeley DB library is available for
       download at the Subversion web site "Documents & files" area:
 
-          http://subversion.tigris.org/servlets/ProjectDocumentList
+          http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
 
       Look in the "Releases > Windows > Windows BDB" section.
 
@@ -627,7 +624,7 @@ II.   INSTALLATION
 
       Download the most recent distribution tarball from:
 
-          http://subversion.tigris.org/servlets/ProjectDocumentList
+          http://subversion.apache.org/download/
 
       Unpack it, and use the standard GNU procedure to compile:
 
@@ -737,7 +734,7 @@ II.   INSTALLATION
       of the libsvn_* libraries.
 
       Note that if you commonly build with the -jN option to make and
-      have unpacked a dependency tarball into your checkout, the make
+      have used the get-deps.sh script to fetch dependencies, the make
       step above may fail, because we don't ensure that third party
       libraries in our source tree will finish building before
       subversion itself.  If you want to use -jN, use the following
@@ -804,7 +801,7 @@ II.   INSTALLATION
       easiest.  Download a Zip (*.zip) or self-extracting installer
       (*-setup.exe) file from:
 
-      http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91
+      http://subversion.apache.org/packages#windows
 
       For a Zip file, run your unzipping utility (WinZIP, ZipGenius,
       UltimateZIP, FreeZIP, whatever) and extract the DLLs and EXEs to
@@ -864,7 +861,7 @@ II.   INSTALLATION
         from http://www.apache.org/dist/apr/.
       * ZLib 1.2 or higher is required and is included in the Subversion
         dependencies zip file or can be obtained from http://www.zlib.org
-      * Either a Subversion client binary from http://subversion.tigris.org/ to
+      * Either a Subversion client binary from http://subversion.apache.org/ to
         do the initial checkout of the Subversion source or the zip file
         source distribution. See the section "Bootstrapping from a Zip or
         Installer File under Windows" above for more.
@@ -890,8 +887,8 @@ II.   INSTALLATION
         libraries is not supported.
       * [Optional] Berkeley DB for backend support of the server
         components -- versions 4.3.27 and 4.4.20 are available from
-        http://subversion.tigris.org/servlets/ProjectDocumentList as
-        db-4.3.27-win32.zip and db-4.4.20-win32.zip.
+        http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
+        as db-4.3.27-win32.zip and db-4.4.20-win32.zip.
         For more information see Section I.5.
       * [Optional] Openssl 0.9.7f or higher can be obtained from
         http://www.openssl.org/source/openssl-0.9.7f.tar.gz

Modified: subversion/branches/revprop-packing/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/Makefile.in?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/Makefile.in (original)
+++ subversion/branches/revprop-packing/Makefile.in Fri Jan 13 21:40:26 2012
@@ -99,6 +99,10 @@ javahl_libdir = @libdir@
 javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work
 javahl_test_srcdir=$(abs_srcdir)/subversion/bindings/javahl
 
+gnome_auth_dir = $(abs_builddir)/subversion/libsvn_auth_gnome_keyring/.libs
+kwallet_auth_dir = $(abs_builddir)/subversion/libsvn_auth_kwallet/.libs
+auth_plugin_dirs = $(gnome_auth_dir):$(kwallet_auth_dir)
+
 MSGFMT = @MSGFMT@
 MSGFMTFLAGS = @MSGFMTFLAGS@
 MSGMERGE = @MSGMERGE@
@@ -432,11 +436,18 @@ clean-javahl:
 
 extraclean-javahl: clean-javahl
 
-check-javahl: javahl javahl-compat
+check-tigris-javahl: javahl-compat
 	@FIX_JAVAHL_LIB@
-	$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
 	$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
 
+check-apache-javahl: javahl
+	@FIX_JAVAHL_LIB@
+	$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
+
+check-javahl: check-apache-javahl
+
+check-all-javahl: check-apache-javahl check-tigris-javahl
+
 # "make check CLEANUP=true" will clean up directories for successful tests.
 # "make check TESTS=subversion/tests/cmdline/basic_tests.py"
 #  will perform only basic tests (likewise for other tests).
@@ -477,6 +488,7 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 	    flags="--list --milestone-filter=$(MILESTONE_FILTER)             \
 		   --mode-filter=$(MODE_FILTER) --log-to-stdout $$flags";    \
 	  fi;                                                                \
+	  LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)'           \
 	  $(PYTHON) $(top_srcdir)/build/run_tests.py                         \
 	            --config-file $(top_srcdir)/subversion/tests/tests.conf  \
 	            $$flags                                                  \

Modified: subversion/branches/revprop-packing/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build.conf?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build.conf (original)
+++ subversion/branches/revprop-packing/build.conf Fri Jan 13 21:40:26 2012
@@ -331,6 +331,7 @@ msvc-export = 
         private\svn_token.h  private\svn_adler32.h
         private\svn_temp_serializer.h private\svn_io_private.h
         private\svn_string_private.h private\svn_magic.h
+        private\svn_subr_private.h private\svn_mutex.h
 
 # Working copy management lib
 [libsvn_wc]
@@ -361,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
@@ -798,6 +808,14 @@ sources = skel-test.c
 install = test
 libs = libsvn_test libsvn_subr apriconv apr
 
+[spillbuf-test]
+description = Test spillbuf in libsvn_subr
+type = exe
+path = subversion/tests/libsvn_subr
+sources = spillbuf-test.c
+install = test
+libs = libsvn_test libsvn_subr apriconv apr
+
 [stream-test]
 description = Test stream library
 type = exe
@@ -1006,6 +1024,14 @@ install = test
 libs = libsvn_wc libsvn_subr apriconv apr
 testing = skip
 
+[wc-incomplete-tester]
+type = exe
+path = subversion/tests/libsvn_wc
+sources = wc-incomplete-tester.c
+install = test
+libs = libsvn_wc libsvn_subr apriconv apr
+testing = skip
+
 # ----------------------------------------------------------------------------
 #
 # EXTERNAL TARGETS (NO BUILD NEEDED)
@@ -1096,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__]
@@ -1107,7 +1133,7 @@ libs = __ALL__
        strings-reps-test changes-test locks-test repos-test
        checksum-test compat-test config-test hashdump-test mergeinfo-test
        opt-test path-test stream-test string-test time-test utf-test
-       target-test error-test cache-test
+       target-test error-test cache-test spillbuf-test
        revision-test
        subst_translate-test
        translate-test
@@ -1115,7 +1141,7 @@ libs = __ALL__
        diff-diff3-test
        ra-local-test
        svndiff-test vdelta-test
-       entries-dump atomic-ra-revprop-change wc-lock-tester
+       entries-dump atomic-ra-revprop-change wc-lock-tester wc-incomplete-tester
        diff diff3 diff4
        client-test
        tree-conflict-data-test db-test pristine-store-test entries-compat-test

Modified: subversion/branches/revprop-packing/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/ac-macros/berkeley-db.m4?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/revprop-packing/build/ac-macros/berkeley-db.m4 Fri Jan 13 21:40:26 2012
@@ -65,11 +65,11 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
 
       if test "$withval" = "yes"; then
         if test "$apu_db_version" -lt "4"; then
-          AC_MSG_ERROR([APR-UTIL wasn't linked against Berkeley DB 4,
-                        while the fs component is required.  Reinstall
-                        APR-UTIL with the appropiate options.])
+          AC_MSG_ERROR([APR-UTIL was linked against Berkeley DB version $apu_db_version,
+                        while version 4 or higher is required.  Reinstall
+                        APR-UTIL with the appropriate options.])
         fi
-        
+
         bdb_status=required
 
       elif test "$apu_found" != "reconfig"; then

Modified: subversion/branches/revprop-packing/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/ac-macros/sqlite.m4?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/revprop-packing/build/ac-macros/sqlite.m4 Fri Jan 13 21:40:26 2012
@@ -106,7 +106,7 @@ AC_DEFUN(SVN_SQLITE_PKG_CONFIG,
       sqlite_version=`$PKG_CONFIG $SQLITE_PKGNAME --modversion --silence-errors`
 
       if test -n "$sqlite_version"; then
-        SVN_SQLITE_VERNUM_PARSE
+        SVN_SQLITE_VERNUM_PARSE([$sqlite_version], [sqlite_ver_num])
 
         if test "$sqlite_ver_num" -ge "$sqlite_min_ver_num"; then
           AC_MSG_RESULT([$sqlite_version])
@@ -198,20 +198,22 @@ SQLITE_VERSION_OKAY
   fi
 ])
 
-dnl SVN_SQLITE_VERNUM_PARSE()
+dnl SVN_SQLITE_VERNUM_PARSE(version_string, result_var)
 dnl
-dnl Parse a x.y[.z] version string sqlite_version into a number sqlite_ver_num.
+dnl Parse a x.y[.z] version string version_string into a number result_var.
 AC_DEFUN(SVN_SQLITE_VERNUM_PARSE,
 [
-  sqlite_major=`expr $sqlite_version : '\([[0-9]]*\)'`
-  sqlite_minor=`expr $sqlite_version : '[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_micro=`expr $sqlite_version : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-  if test -z "$sqlite_micro"; then
-    sqlite_micro=0
+  version_string="$1"
+  
+  major=`expr $version_string : '\([[0-9]]*\)'`
+  minor=`expr $version_string : '[[0-9]]*\.\([[0-9]]*\)'`
+  micro=`expr $version_string : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+  if test -z "$micro"; then
+    micro=0
   fi
-  sqlite_ver_num=`expr $sqlite_major \* 1000000 \
-                    \+ $sqlite_minor \* 1000 \
-                    \+ $sqlite_micro`
+  $2=`expr $major \* 1000000 \
+        \+ $minor \* 1000 \
+        \+ $micro`
 ])
 
 dnl SVN_SQLITE_MIN_VERNUM_PARSE()
@@ -220,12 +222,7 @@ dnl Parse a x.y.z version string SQLITE_
 dnl sqlite_min_ver_num.
 AC_DEFUN(SVN_SQLITE_MIN_VERNUM_PARSE,
 [
-  sqlite_min_major=`expr $SQLITE_MINIMUM_VER : '\([[0-9]]*\)'`
-  sqlite_min_minor=`expr $SQLITE_MINIMUM_VER : '[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_min_micro=`expr $SQLITE_MINIMUM_VER : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_min_ver_num=`expr $sqlite_min_major \* 1000000 \
-                        \+ $sqlite_min_minor \* 1000 \
-                        \+ $sqlite_min_micro`
+  SVN_SQLITE_VERNUM_PARSE([$SQLITE_MINIMUM_VER], [sqlite_min_ver_num])
 ])
 
 dnl SVN_DOWNLOAD_SQLITE()

Modified: subversion/branches/revprop-packing/build/ac-macros/zlib.m4
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/ac-macros/zlib.m4?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/ac-macros/zlib.m4 (original)
+++ subversion/branches/revprop-packing/build/ac-macros/zlib.m4 Fri Jan 13 21:40:26 2012
@@ -31,7 +31,11 @@ AC_DEFUN(SVN_LIB_Z,
                                   [zlib compression library]),
   [
     if test "$withval" = "yes" ; then
-      AC_MSG_ERROR([--with-zlib requires an argument.])
+      AC_CHECK_HEADER(zlib.h, [
+        AC_CHECK_LIB(z, inflate, [zlib_found="builtin"])
+      ])
+    elif test "$withval" = "no" ; then
+      AC_MSG_ERROR([cannot compile without zlib.])
     else
       AC_MSG_NOTICE([zlib library configuration])
       zlib_prefix=$withval
@@ -39,7 +43,7 @@ AC_DEFUN(SVN_LIB_Z,
       CPPFLAGS="$CPPFLAGS -I$zlib_prefix/include"
       AC_CHECK_HEADERS(zlib.h,[
         save_ldflags="$LDFLAGS"
-        LDFLAGS="-L$zlib_prefix/lib"
+        LDFLAGS="$LDFLAGS -L$zlib_prefix/lib"
         AC_CHECK_LIB(z, inflate, [zlib_found="yes"])
         LDFLAGS="$save_ldflags"
       ])

Modified: subversion/branches/revprop-packing/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/generator/gen_win.py?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/generator/gen_win.py (original)
+++ subversion/branches/revprop-packing/build/generator/gen_win.py Fri Jan 13 21:40:26 2012
@@ -834,7 +834,8 @@ class WinGeneratorBase(GeneratorBase):
 
     fakedefines = ["WIN32","_WINDOWS","alloca=_alloca",
                    "_CRT_SECURE_NO_DEPRECATE=",
-                   "_CRT_NONSTDC_NO_DEPRECATE="]
+                   "_CRT_NONSTDC_NO_DEPRECATE=",
+                   "_CRT_SECURE_NO_WARNINGS="]
 
     if self.sqlite_inline:
       fakedefines.append("SVN_SQLITE_INLINE")

Modified: subversion/branches/revprop-packing/build/generator/templates/neon.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/generator/templates/neon.vcxproj.ezt?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/generator/templates/neon.vcxproj.ezt (original)
+++ subversion/branches/revprop-packing/build/generator/templates/neon.vcxproj.ezt Fri Jan 13 21:40:26 2012
@@ -33,6 +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>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/revprop-packing/build/generator/templates/serf.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/generator/templates/serf.vcxproj.ezt?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/generator/templates/serf.vcxproj.ezt (original)
+++ subversion/branches/revprop-packing/build/generator/templates/serf.vcxproj.ezt Fri Jan 13 21:40:26 2012
@@ -34,6 +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>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/revprop-packing/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/generator/templates/vcnet_vcproj.ezt?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/revprop-packing/build/generator/templates/vcnet_vcproj.ezt Fri Jan 13 21:40:26 2012
@@ -46,7 +46,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
 [end]				AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
-				PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
 [is configs.name "Debug"]				MinimalRebuild="TRUE"
 				RuntimeLibrary="3"
 				BasicRuntimeChecks="3"

Modified: subversion/branches/revprop-packing/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/generator/templates/vcnet_vcxproj.ezt?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/revprop-packing/build/generator/templates/vcnet_vcxproj.ezt Fri Jan 13 21:40:26 2012
@@ -56,7 +56,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <StringPooling>true</StringPooling>
 [end]      <AdditionalIncludeDirectories>[for includes][includes];[end]%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][for configs.defines][configs.defines];[end]_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines];[end]%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <BrowseInformation>true</BrowseInformation>

Modified: subversion/branches/revprop-packing/build/generator/templates/zlib.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/generator/templates/zlib.vcxproj.ezt?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/generator/templates/zlib.vcxproj.ezt (original)
+++ subversion/branches/revprop-packing/build/generator/templates/zlib.vcxproj.ezt Fri Jan 13 21:40:26 2012
@@ -33,6 +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>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/revprop-packing/build/getversion.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/getversion.py?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/getversion.py (original)
+++ subversion/branches/revprop-packing/build/getversion.py Fri Jan 13 21:40:26 2012
@@ -85,7 +85,7 @@ def sqlite_extractor(parser, include_fil
 
 extractors = {
   'SVN' : svn_extractor,
-  'SQLITE' : sqlite_extractor,
+  # 'SQLITE' : sqlite_extractor, # not used
   }
 
 def usage_and_exit(msg):

Modified: subversion/branches/revprop-packing/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/run_tests.py?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/run_tests.py (original)
+++ subversion/branches/revprop-packing/build/run_tests.py Fri Jan 13 21:40:26 2012
@@ -301,7 +301,6 @@ class TestHarness:
                  '--srcdir=' + os.path.join(self.srcdir, progdir)]
       if self.config_file is not None:
         cmdline.append('--config-file=' + self.config_file)
-      cmdline.append('--trap-assertion-failures')
     else:
       print('Don\'t know what to do about ' + progbase)
       sys.exit(1)

Modified: subversion/branches/revprop-packing/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/transform_sql.py?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/transform_sql.py (original)
+++ subversion/branches/revprop-packing/build/transform_sql.py Fri Jan 13 21:40:26 2012
@@ -129,7 +129,7 @@ class Processor(object):
         # got something besides whitespace. write it out. include some whitespace
         # to separate the SQL commands. and a backslash to continue the string
         # onto the next line.
-        self.output.write('  "%s " \\\n' % line)
+        self.output.write('  "%s " \\\n' % line.rstrip())
 
     # previous line had a continuation. end the madness.
     self.close_define()

Modified: subversion/branches/revprop-packing/build/win32/svn.rc
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/build/win32/svn.rc?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/build/win32/svn.rc (original)
+++ subversion/branches/revprop-packing/build/win32/svn.rc Fri Jan 13 21:40:26 2012
@@ -66,7 +66,7 @@ BEGIN
       VALUE "FileDescription", APR_STRINGIFY(SVN_FILE_DESCRIPTION) "\0"
       VALUE "FileVersion", SVN_VER_NUMBER "\0"
       VALUE "InternalName", "SVN\0"
-      VALUE "LegalCopyright", "Copyright (c) 2009 The Apache Software Foundation\0"
+      VALUE "LegalCopyright", "Copyright (c) 2011 The Apache Software Foundation\0"
       VALUE "OriginalFilename", APR_STRINGIFY(SVN_FILE_NAME) "\0"
       VALUE "ProductName", "Subversion\0"
       VALUE "ProductVersion", SVN_VERSION "\0"

Modified: subversion/branches/revprop-packing/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/configure.ac?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/configure.ac (original)
+++ subversion/branches/revprop-packing/configure.ac Fri Jan 13 21:40:26 2012
@@ -172,6 +172,18 @@ SQLITE_URL="http://www.sqlite.org/sqlite
 SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
                ${SQLITE_URL})
 
+AC_ARG_ENABLE(sqlite-compatibility-version,
+  AS_HELP_STRING([--enable-sqlite-compatibility-version=X.Y.Z],
+                 [Allow binary to run against SQLite as old as ARG]),
+  [sqlite_compat_ver=$enableval],[sqlite_compat_ver=no])
+
+if test -n "$sqlite_compat_ver" && test "$sqlite_compat_ver" != no; then
+  SVN_SQLITE_VERNUM_PARSE([$sqlite_compat_ver],
+                          [sqlite_compat_ver_num])
+  CFLAGS="-DSVN_SQLITE_MIN_VERSION='\"$sqlite_compat_ver\"' $CFLAGS"
+  CFLAGS="-DSVN_SQLITE_MIN_VERSION_NUMBER=$sqlite_compat_ver_num $CFLAGS"
+fi
+
 dnl Set up a number of directories ---------------------
 
 dnl Create SVN_BINDIR for proper substitution
@@ -572,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)])
@@ -780,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 -------------------
 

Modified: subversion/branches/revprop-packing/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/contrib/client-side/emacs/dsvn.el?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/revprop-packing/contrib/client-side/emacs/dsvn.el Fri Jan 13 21:40:26 2012
@@ -130,12 +130,19 @@
   :type 'boolean
   :group 'dsvn)
 
+;; start-file-process and process-file are needed for tramp but only appeared
+;; in Emacs 23 and 22 respectively.
+(setq svn-start-file-process
+  (if (fboundp 'start-file-process) 'start-file-process 'start-process))
+(setq svn-process-file
+  (if (fboundp 'process-file) 'process-file 'call-process))
+
 (defun svn-call-process (program buffer &rest args)
   "Run svn and wait for it to finish.
 Argument PROGRAM is the svn binary to run.
 Argument BUFFER is the buffer in which to insert output.
 Optional argument ARGS are the arguments to svn."
-  (let ((proc (apply 'start-process "svn" buffer program args)))
+  (let ((proc (apply svn-start-file-process "svn" buffer program args)))
     (set-process-coding-system proc 'utf-8)
     (set-process-filter proc 'svn-output-filter)
     (while (eq (process-status proc) 'run)
@@ -161,7 +168,7 @@ Return non-NIL if there was any output."
       (setq buffer-read-only t)
       (let ((cmd `(,svn-program ,subcommand ,@args))
             proc)
-        (setq proc (apply 'start-process "svn" buf cmd))
+        (setq proc (apply svn-start-file-process "svn" buf cmd))
         (set-process-coding-system proc 'utf-8)
         (set-process-filter proc 'svn-output-filter)
         (while (eq (process-status proc) 'run)
@@ -184,7 +191,7 @@ Returns the buffer that holds the output
     (with-current-buffer buf
       (erase-buffer)
       (setq default-directory dir))
-    (apply 'call-process svn-program nil buf nil (symbol-name command) args)
+    (apply svn-process-file svn-program nil buf nil (symbol-name command) args)
     buf))
 
 (defun svn-run-for-stdout (command args)
@@ -192,7 +199,7 @@ Returns the buffer that holds the output
 Argument COMMAND is the svn subcommand to run.
 Optional argument ARGS is a list of arguments."
   (let ((output-buffer (generate-new-buffer "*svn-stdout*")))
-    (apply 'call-process svn-program nil (list output-buffer nil) nil
+    (apply svn-process-file svn-program nil (list output-buffer nil) nil
 	   (symbol-name command) args)
     (let ((stdout (with-current-buffer output-buffer (buffer-string))))
       (kill-buffer output-buffer)
@@ -255,7 +262,7 @@ buffer to describe what is going on."
             args (cons "-v" args)))
     (unless (memq command svn-noninteractive-blacklist)
       (setq args (cons "--non-interactive" args)))
-    (setq proc (apply 'start-process "svn" (current-buffer)
+    (setq proc (apply svn-start-file-process "svn" (current-buffer)
                       svn-program command-s args))
     (if (fboundp filter-func)
         (set-process-filter proc filter-func)
@@ -1154,7 +1161,8 @@ With prefix arg, prompt for REVISION."
     (?D . "Deleted")
     (?U . "Updated")
     (?G . "Merged")
-    (?C . "Conflict")))
+    (?C . "Conflict")
+    (?E . "Existed")))
 
 (defvar svn-merging nil)
 
@@ -1182,7 +1190,7 @@ With prefix arg, prompt for REVISION."
       (goto-char svn-output-marker)
       (while (not nomore)
         (cond ((looking-at
-                "\\([ ADUCG][ ADUCG][ B]\\)  \\(.*\\)\n")
+                "\\([ ADUCGE][ ADUCGE][ B]\\)  \\(.*\\)\n")
                (let* ((status (match-string 1))
                       (file-status (elt status 0))
                       (prop-status (elt status 1))

Modified: subversion/branches/revprop-packing/contrib/client-side/emacs/vc-svn.el
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/contrib/client-side/emacs/vc-svn.el?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/contrib/client-side/emacs/vc-svn.el (original)
+++ subversion/branches/revprop-packing/contrib/client-side/emacs/vc-svn.el Fri Jan 13 21:40:26 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/revprop-packing/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/get-deps.sh?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/get-deps.sh (original)
+++ subversion/branches/revprop-packing/get-deps.sh Fri Jan 13 21:40:26 2012
@@ -28,10 +28,10 @@ APR_UTIL=apr-util-1.3.12
 NEON=neon-0.29.6
 SERF=serf-0.7.2
 ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.7.6.3
+SQLITE_VERSION=3.7.8
 SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
 
-HTTPD=httpd-2.2.19
+HTTPD=httpd-2.2.21
 APR_ICONV=apr-iconv-1.2.1
 
 BASEDIR=`pwd`

Modified: subversion/branches/revprop-packing/notes/editor-v2.txt
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/notes/editor-v2.txt?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/notes/editor-v2.txt (original)
+++ subversion/branches/revprop-packing/notes/editor-v2.txt Fri Jan 13 21:40:26 2012
@@ -1,3 +1,11 @@
+###
+###
+### THIS FILE IS HISTORICAL ONLY. FOR CURRENT INFORMATION, PLEASE SEE:
+###     include/svn_editor.h
+###
+###
+
+
 NOTES on a revamped editor interface
 
 -- all paths are relpaths

Modified: subversion/branches/revprop-packing/notes/fsfs-improvements.txt
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/notes/fsfs-improvements.txt?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/notes/fsfs-improvements.txt (original)
+++ subversion/branches/revprop-packing/notes/fsfs-improvements.txt Fri Jan 13 21:40:26 2012
@@ -1,3 +1,8 @@
+[ At the time of writing (1.7-dev), FSFS format 5 was current.  Since then
+format 5 has been retracted; it was never released.  1.7 shipped with f4 and
+1.8 will most likely ship with f6.  Format 5 was current during 1.7-dev and
+packed revprops into an authoritative SQLite database. ]
+
 Introduction
 ------------
 

Modified: subversion/branches/revprop-packing/notes/http-and-webdav/webdav-protocol
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/notes/http-and-webdav/webdav-protocol?rev=1231318&r1=1231317&r2=1231318&view=diff
==============================================================================
--- subversion/branches/revprop-packing/notes/http-and-webdav/webdav-protocol (original)
+++ subversion/branches/revprop-packing/notes/http-and-webdav/webdav-protocol Fri Jan 13 21:40:26 2012
@@ -354,6 +354,7 @@ Request:
     <S:discover-changed-paths/> (optional)
     <S:strict-node-history/> (optional)
     <S:include-merged-revisions/> (optional)
+    <S:encode-binary-props> (optional)
     <S:revprop>REVPROP</S:revprop>... | <S:all-revprops/> | <S:no-revprops/>
       ('revprop', 'all-revprops', and 'no-revprops' are all optional)
     <S:path></S:path>... (optional)
@@ -369,6 +370,7 @@ Response:
       <S:date>2006-02-27T18:44:26.149336Z</S:date>
       <D:comment>Add doo-hickey</D:comment>
       <S:revprop name="REVPROP">value</S:revprop>... (optional)
+      <S:revprop name="REVPROP" encoding="base64">encoded value</S:revprop>... (optional)
       <S:has-children/> (optional)
       <S:added-path( copyfrom-path="PATH" copyfrom-rev="REVNUM">PATH</S:added-path>... (optional)
       <S:replaced-path( copyfrom-path="PATH" copyfrom-rev="REVNUM">PATH</S:replaced-path>... (optional)



Mime
View raw message