You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/08/16 12:18:03 UTC
svn commit: r1373783 [1/50] - in /subversion/branches/compressed-pristines:
./ build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/emacs/ contrib/client-side/svn-push/
contrib/client-side/svnmerge/ contr...
Author: brane
Date: Thu Aug 16 10:17:48 2012
New Revision: 1373783
URL: http://svn.apache.org/viewvc?rev=1373783&view=rev
Log:
Sync compresed-pristines branch with trunk at r1373279.
Added:
subversion/branches/compressed-pristines/build/ac-macros/macosx.m4
- copied unchanged from r1373279, subversion/trunk/build/ac-macros/macosx.m4
subversion/branches/compressed-pristines/build/transform_config_hw.py
- copied unchanged from r1373279, subversion/trunk/build/transform_config_hw.py
subversion/branches/compressed-pristines/notes/api-errata/1.8/
- copied from r1373279, subversion/trunk/notes/api-errata/1.8/
subversion/branches/compressed-pristines/notes/ev2-callbacks-template.c
- copied unchanged from r1373279, subversion/trunk/notes/ev2-callbacks-template.c
subversion/branches/compressed-pristines/notes/wc-ng/conflict-storage-2.0
- copied unchanged from r1373279, subversion/trunk/notes/wc-ng/conflict-storage-2.0
subversion/branches/compressed-pristines/subversion/include/private/svn_delta_private.h
- copied unchanged from r1373279, subversion/trunk/subversion/include/private/svn_delta_private.h
subversion/branches/compressed-pristines/subversion/include/private/svn_named_atomic.h
- copied unchanged from r1373279, subversion/trunk/subversion/include/private/svn_named_atomic.h
subversion/branches/compressed-pristines/subversion/libsvn_delta/deprecated.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_delta/deprecated.c
subversion/branches/compressed-pristines/subversion/libsvn_fs/editor.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_fs/editor.c
subversion/branches/compressed-pristines/subversion/libsvn_ra/editor.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_ra/editor.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/base64.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/base64.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/cache_config.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/cache_config.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/mutex.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/mutex.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/named_atomic.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/named_atomic.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/string.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/string.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/sysinfo.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/sysinfo.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/sysinfo.h
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/sysinfo.h
subversion/branches/compressed-pristines/subversion/libsvn_subr/temp_serializer.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/temp_serializer.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/types.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/types.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/utf_width.c
- copied unchanged from r1373279, subversion/trunk/subversion/libsvn_subr/utf_width.c
subversion/branches/compressed-pristines/subversion/svn/file-merge.c
- copied unchanged from r1373279, subversion/trunk/subversion/svn/file-merge.c
subversion/branches/compressed-pristines/subversion/svnmucc/ (props changed)
- copied from r1373279, subversion/trunk/subversion/svnmucc/
subversion/branches/compressed-pristines/subversion/tests/cmdline/merge_symmetric_tests.py
- copied unchanged from r1373279, subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svndumpfilter_tests_data/simple_v3.dump
- copied unchanged from r1373279, subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/simple_v3.dump
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnsync_authz_tests.py
- copied unchanged from r1373279, subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/wc_tests.py
- copied unchanged from r1373279, subversion/trunk/subversion/tests/cmdline/wc_tests.py
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/io-test.c
- copied unchanged from r1373279, subversion/trunk/subversion/tests/libsvn_subr/io-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/named_atomic-test-common.h
- copied unchanged from r1373279, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test-common.h
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/named_atomic-test-proc.c
- copied unchanged from r1373279, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test-proc.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/named_atomic-test.c
- copied unchanged from r1373279, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/conflict-data-test.c
- copied unchanged from r1373279, subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/wc-queries-test.c
- copied unchanged from r1373279, subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/branches/compressed-pristines/tools/dev/mergegraph/save_as_sh.py
- copied unchanged from r1373279, subversion/trunk/tools/dev/mergegraph/save_as_sh.py
subversion/branches/compressed-pristines/tools/dev/sbox-ospath.py
- copied unchanged from r1373279, subversion/trunk/tools/dev/sbox-ospath.py
Removed:
subversion/branches/compressed-pristines/build/ac-macros/neon.m4
subversion/branches/compressed-pristines/build/generator/templates/neon.dsp.ezt
subversion/branches/compressed-pristines/build/generator/templates/neon.vcproj.ezt
subversion/branches/compressed-pristines/build/generator/templates/neon.vcxproj.ezt
subversion/branches/compressed-pristines/contrib/server-side/svn-fast-backup
subversion/branches/compressed-pristines/subversion/libsvn_ra_neon/
subversion/branches/compressed-pristines/subversion/libsvn_subr/svn_base64.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/svn_cache_config.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/svn_mutex.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/svn_string.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/svn_temp_serializer.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/svn_types.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/tree-conflict-data-test.c
subversion/branches/compressed-pristines/tools/client-side/svnmucc/
Modified:
subversion/branches/compressed-pristines/ (props changed)
subversion/branches/compressed-pristines/CHANGES
subversion/branches/compressed-pristines/COMMITTERS
subversion/branches/compressed-pristines/INSTALL
subversion/branches/compressed-pristines/LICENSE
subversion/branches/compressed-pristines/Makefile.in
subversion/branches/compressed-pristines/NOTICE
subversion/branches/compressed-pristines/aclocal.m4
subversion/branches/compressed-pristines/build.conf
subversion/branches/compressed-pristines/build/ac-macros/svn-macros.m4
subversion/branches/compressed-pristines/build/ac-macros/swig.m4
subversion/branches/compressed-pristines/build/generator/gen_base.py
subversion/branches/compressed-pristines/build/generator/gen_make.py
subversion/branches/compressed-pristines/build/generator/gen_msvc_dsp.py
subversion/branches/compressed-pristines/build/generator/gen_vcnet_vcproj.py
subversion/branches/compressed-pristines/build/generator/gen_win.py
subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt
subversion/branches/compressed-pristines/build/generator/templates/build_zlib.ezt
subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt
subversion/branches/compressed-pristines/build/generator/templates/serf.vcproj.ezt
subversion/branches/compressed-pristines/build/generator/templates/serf.vcxproj.ezt
subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcproj.ezt
subversion/branches/compressed-pristines/build/generator/templates/svn_config.vcxproj.ezt
subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/compressed-pristines/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/compressed-pristines/build/run_tests.py
subversion/branches/compressed-pristines/build/transform_sql.py
subversion/branches/compressed-pristines/build/win32/make_dist.py
subversion/branches/compressed-pristines/build/win32/vc6-build.bat.in
subversion/branches/compressed-pristines/configure.ac
subversion/branches/compressed-pristines/contrib/client-side/emacs/dsvn.el
subversion/branches/compressed-pristines/contrib/client-side/emacs/psvn.el
subversion/branches/compressed-pristines/contrib/client-side/emacs/vc-svn.el
subversion/branches/compressed-pristines/contrib/client-side/svn-push/svn-push.c
subversion/branches/compressed-pristines/contrib/client-side/svnmerge/svnmerge.py
subversion/branches/compressed-pristines/contrib/hook-scripts/enforcer/enforcer
subversion/branches/compressed-pristines/contrib/server-side/fsfsverify.py
subversion/branches/compressed-pristines/gen-make.py
subversion/branches/compressed-pristines/get-deps.sh
subversion/branches/compressed-pristines/notes/authz_policy.txt
subversion/branches/compressed-pristines/notes/directory-index/dirindex.py (contents, props changed)
subversion/branches/compressed-pristines/notes/directory-index/logimport.py (props changed)
subversion/branches/compressed-pristines/notes/directory-index/schema.sql
subversion/branches/compressed-pristines/notes/knobs
subversion/branches/compressed-pristines/notes/merge-tracking/func-spec.html
subversion/branches/compressed-pristines/notes/sparse-directories.txt
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/CreateJ.h
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/JNIStackElement.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNBase.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNBase.h
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNRepos.h
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/Targets.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
subversion/branches/compressed-pristines/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/compressed-pristines/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/compressed-pristines/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/branches/compressed-pristines/subversion/bindings/swig/core.i
subversion/branches/compressed-pristines/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/compressed-pristines/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/compressed-pristines/subversion/bindings/swig/python/svn/fs.py
subversion/branches/compressed-pristines/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/compressed-pristines/subversion/include/private/svn_client_private.h
subversion/branches/compressed-pristines/subversion/include/private/svn_dav_protocol.h
subversion/branches/compressed-pristines/subversion/include/private/svn_fs_util.h
subversion/branches/compressed-pristines/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/compressed-pristines/subversion/include/private/svn_mutex.h (props changed)
subversion/branches/compressed-pristines/subversion/include/private/svn_ra_private.h
subversion/branches/compressed-pristines/subversion/include/private/svn_repos_private.h
subversion/branches/compressed-pristines/subversion/include/private/svn_skel.h
subversion/branches/compressed-pristines/subversion/include/private/svn_sqlite.h
subversion/branches/compressed-pristines/subversion/include/private/svn_subr_private.h (contents, props changed)
subversion/branches/compressed-pristines/subversion/include/private/svn_wc_private.h
subversion/branches/compressed-pristines/subversion/include/svn_auth.h
subversion/branches/compressed-pristines/subversion/include/svn_checksum.h
subversion/branches/compressed-pristines/subversion/include/svn_client.h
subversion/branches/compressed-pristines/subversion/include/svn_dav.h
subversion/branches/compressed-pristines/subversion/include/svn_delta.h
subversion/branches/compressed-pristines/subversion/include/svn_editor.h
subversion/branches/compressed-pristines/subversion/include/svn_error.h
subversion/branches/compressed-pristines/subversion/include/svn_error_codes.h
subversion/branches/compressed-pristines/subversion/include/svn_fs.h
subversion/branches/compressed-pristines/subversion/include/svn_hash.h
subversion/branches/compressed-pristines/subversion/include/svn_io.h
subversion/branches/compressed-pristines/subversion/include/svn_mergeinfo.h
subversion/branches/compressed-pristines/subversion/include/svn_opt.h
subversion/branches/compressed-pristines/subversion/include/svn_path.h
subversion/branches/compressed-pristines/subversion/include/svn_pools.h
subversion/branches/compressed-pristines/subversion/include/svn_props.h
subversion/branches/compressed-pristines/subversion/include/svn_ra.h
subversion/branches/compressed-pristines/subversion/include/svn_repos.h
subversion/branches/compressed-pristines/subversion/include/svn_sorts.h
subversion/branches/compressed-pristines/subversion/include/svn_types.h
subversion/branches/compressed-pristines/subversion/include/svn_utf.h
subversion/branches/compressed-pristines/subversion/include/svn_wc.h
subversion/branches/compressed-pristines/subversion/include/svn_xml.h
subversion/branches/compressed-pristines/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/compressed-pristines/subversion/libsvn_client/add.c
subversion/branches/compressed-pristines/subversion/libsvn_client/blame.c
subversion/branches/compressed-pristines/subversion/libsvn_client/cat.c
subversion/branches/compressed-pristines/subversion/libsvn_client/client.h
subversion/branches/compressed-pristines/subversion/libsvn_client/commit.c
subversion/branches/compressed-pristines/subversion/libsvn_client/commit_util.c
subversion/branches/compressed-pristines/subversion/libsvn_client/copy.c
subversion/branches/compressed-pristines/subversion/libsvn_client/delete.c
subversion/branches/compressed-pristines/subversion/libsvn_client/deprecated.c
subversion/branches/compressed-pristines/subversion/libsvn_client/diff.c
subversion/branches/compressed-pristines/subversion/libsvn_client/export.c
subversion/branches/compressed-pristines/subversion/libsvn_client/externals.c
subversion/branches/compressed-pristines/subversion/libsvn_client/info.c
subversion/branches/compressed-pristines/subversion/libsvn_client/list.c
subversion/branches/compressed-pristines/subversion/libsvn_client/locking_commands.c
subversion/branches/compressed-pristines/subversion/libsvn_client/log.c
subversion/branches/compressed-pristines/subversion/libsvn_client/merge.c
subversion/branches/compressed-pristines/subversion/libsvn_client/mergeinfo.c
subversion/branches/compressed-pristines/subversion/libsvn_client/mergeinfo.h
subversion/branches/compressed-pristines/subversion/libsvn_client/patch.c
subversion/branches/compressed-pristines/subversion/libsvn_client/prop_commands.c
subversion/branches/compressed-pristines/subversion/libsvn_client/ra.c
subversion/branches/compressed-pristines/subversion/libsvn_client/relocate.c
subversion/branches/compressed-pristines/subversion/libsvn_client/repos_diff.c
subversion/branches/compressed-pristines/subversion/libsvn_client/resolved.c
subversion/branches/compressed-pristines/subversion/libsvn_client/revisions.c
subversion/branches/compressed-pristines/subversion/libsvn_client/status.c
subversion/branches/compressed-pristines/subversion/libsvn_client/switch.c
subversion/branches/compressed-pristines/subversion/libsvn_client/update.c
subversion/branches/compressed-pristines/subversion/libsvn_client/util.c
subversion/branches/compressed-pristines/subversion/libsvn_delta/compat.c
subversion/branches/compressed-pristines/subversion/libsvn_delta/debug_editor.c
subversion/branches/compressed-pristines/subversion/libsvn_delta/editor.c
subversion/branches/compressed-pristines/subversion/libsvn_delta/path_driver.c
subversion/branches/compressed-pristines/subversion/libsvn_delta/svndiff.c
subversion/branches/compressed-pristines/subversion/libsvn_delta/text_delta.c
subversion/branches/compressed-pristines/subversion/libsvn_delta/xdelta.c
subversion/branches/compressed-pristines/subversion/libsvn_diff/diff_file.c
subversion/branches/compressed-pristines/subversion/libsvn_diff/diff_memory.c
subversion/branches/compressed-pristines/subversion/libsvn_diff/parse-diff.c
subversion/branches/compressed-pristines/subversion/libsvn_fs/fs-loader.c
subversion/branches/compressed-pristines/subversion/libsvn_fs/fs-loader.h
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/bdb-err.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/changes-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/checksum-reps-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/copies-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/locks-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/node-origins-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/nodes-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/reps-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/rev-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/strings-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/txn-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/bdb/uuids-table.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/dag.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/err.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/fs.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/fs.h
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/lock.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/trail.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/tree.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/util/fs_skels.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/uuid.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_base/uuid.h
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/caching.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/dag.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/fs.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/fs.h
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/key-gen.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/lock.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/structure
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/tree.c
subversion/branches/compressed-pristines/subversion/libsvn_fs_util/fs-util.c
subversion/branches/compressed-pristines/subversion/libsvn_ra/compat.c
subversion/branches/compressed-pristines/subversion/libsvn_ra/debug_reporter.c
subversion/branches/compressed-pristines/subversion/libsvn_ra/ra_loader.c
subversion/branches/compressed-pristines/subversion/libsvn_ra/ra_loader.h
subversion/branches/compressed-pristines/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/blame.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/commit.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/getdate.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/getlocks.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/locks.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/log.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/merge.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/options.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/property.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/replay.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/sb_bucket.c (props changed)
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/serf.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/update.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/util.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/xml.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/client.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/editorp.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/marshal.c
subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/compressed-pristines/subversion/libsvn_repos/commit.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/deprecated.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/dump.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/fs-wrap.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/hooks.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/load.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/log.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/replay.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/reporter.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/repos.c
subversion/branches/compressed-pristines/subversion/libsvn_repos/rev_hunt.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/adler32.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/auth.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/cache-memcache.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/cache.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/checksum.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/config_file.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/crypto.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/crypto.h
subversion/branches/compressed-pristines/subversion/libsvn_subr/debug.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/deprecated.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/dirent_uri.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/error.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/gpg_agent.c (props changed)
subversion/branches/compressed-pristines/subversion/libsvn_subr/hash.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/internal_statements.sql
subversion/branches/compressed-pristines/subversion/libsvn_subr/io.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/lock.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/mergeinfo.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/opt.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/opt.h
subversion/branches/compressed-pristines/subversion/libsvn_subr/path.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/pool.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/properties.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/quoprint.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/simple_providers.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/skel.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/spillbuf.c (contents, props changed)
subversion/branches/compressed-pristines/subversion/libsvn_subr/sqlite.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/stream.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/win32_crashrpt.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/win32_crypto.c
subversion/branches/compressed-pristines/subversion/libsvn_subr/xml.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/adm_crawler.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/adm_files.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/adm_ops.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/cleanup.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/conflicts.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/conflicts.h
subversion/branches/compressed-pristines/subversion/libsvn_wc/copy.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/crop.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/deprecated.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/diff_editor.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/diff_local.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/entries.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/externals.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/info.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/lock.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/merge.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/node.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/old-and-busted.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/props.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/props.h
subversion/branches/compressed-pristines/subversion/libsvn_wc/questions.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/status.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/update_editor.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/upgrade.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/util.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/compressed-pristines/subversion/libsvn_wc/wc-queries.sql
subversion/branches/compressed-pristines/subversion/libsvn_wc/wc.h
subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db.h
subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db_util.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/workqueue.c
subversion/branches/compressed-pristines/subversion/libsvn_wc/workqueue.h
subversion/branches/compressed-pristines/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/compressed-pristines/subversion/mod_dav_svn/dav_svn.h
subversion/branches/compressed-pristines/subversion/mod_dav_svn/liveprops.c
subversion/branches/compressed-pristines/subversion/mod_dav_svn/lock.c
subversion/branches/compressed-pristines/subversion/mod_dav_svn/mirror.c
subversion/branches/compressed-pristines/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/compressed-pristines/subversion/mod_dav_svn/reports/update.c
subversion/branches/compressed-pristines/subversion/mod_dav_svn/repos.c
subversion/branches/compressed-pristines/subversion/mod_dav_svn/util.c
subversion/branches/compressed-pristines/subversion/po/de.po
subversion/branches/compressed-pristines/subversion/po/fr.po
subversion/branches/compressed-pristines/subversion/svn/blame-cmd.c
subversion/branches/compressed-pristines/subversion/svn/cl.h
subversion/branches/compressed-pristines/subversion/svn/conflict-callbacks.c
subversion/branches/compressed-pristines/subversion/svn/diff-cmd.c
subversion/branches/compressed-pristines/subversion/svn/export-cmd.c
subversion/branches/compressed-pristines/subversion/svn/help-cmd.c
subversion/branches/compressed-pristines/subversion/svn/import-cmd.c
subversion/branches/compressed-pristines/subversion/svn/log-cmd.c
subversion/branches/compressed-pristines/subversion/svn/main.c
subversion/branches/compressed-pristines/subversion/svn/merge-cmd.c
subversion/branches/compressed-pristines/subversion/svn/mergeinfo-cmd.c
subversion/branches/compressed-pristines/subversion/svn/notify.c
subversion/branches/compressed-pristines/subversion/svn/propget-cmd.c
subversion/branches/compressed-pristines/subversion/svn/props.c
subversion/branches/compressed-pristines/subversion/svn/resolve-cmd.c
subversion/branches/compressed-pristines/subversion/svn/status-cmd.c
subversion/branches/compressed-pristines/subversion/svn/status.c
subversion/branches/compressed-pristines/subversion/svn/switch-cmd.c
subversion/branches/compressed-pristines/subversion/svn/update-cmd.c
subversion/branches/compressed-pristines/subversion/svn_private_config.hw
subversion/branches/compressed-pristines/subversion/svnadmin/main.c
subversion/branches/compressed-pristines/subversion/svndumpfilter/main.c
subversion/branches/compressed-pristines/subversion/svnlook/main.c
subversion/branches/compressed-pristines/subversion/svnrdump/dump_editor.c
subversion/branches/compressed-pristines/subversion/svnrdump/load_editor.c
subversion/branches/compressed-pristines/subversion/svnrdump/svnrdump.c
subversion/branches/compressed-pristines/subversion/svnserve/cyrus_auth.c
subversion/branches/compressed-pristines/subversion/svnserve/main.c
subversion/branches/compressed-pristines/subversion/svnserve/serve.c
subversion/branches/compressed-pristines/subversion/svnserve/server.h
subversion/branches/compressed-pristines/subversion/svnsync/main.c
subversion/branches/compressed-pristines/subversion/svnsync/sync.c
subversion/branches/compressed-pristines/subversion/svnversion/main.c
subversion/branches/compressed-pristines/subversion/tests/cmdline/atomic-ra-revprop-change.c
subversion/branches/compressed-pristines/subversion/tests/cmdline/authz_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/autoprop_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/basic_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/blame_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/changelist_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/commit_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/copy_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/davautocheck.sh
subversion/branches/compressed-pristines/subversion/tests/cmdline/depth_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/diff_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/entries-dump.c
subversion/branches/compressed-pristines/subversion/tests/cmdline/entries_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/export_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/externals_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/getopt_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/lock_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/log_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/merge_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/patch_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/prop_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/revert_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/schedule_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/special_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/stat_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump
subversion/branches/compressed-pristines/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
subversion/branches/compressed-pristines/subversion/tests/cmdline/svntest/actions.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svntest/err.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svntest/main.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/svntest/wc.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/switch_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/compressed-pristines/subversion/tests/cmdline/update_tests.py
subversion/branches/compressed-pristines/subversion/tests/libsvn_client/client-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_delta/random-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_delta/svndiff-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_delta/vdelta-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_delta/window-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_fs/locks-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/ (props changed)
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/skel-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/spillbuf-test.c (props changed)
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/string-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/utf-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/ (props changed)
subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/db-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/utils.c
subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/wc-incomplete-tester.c (props changed)
subversion/branches/compressed-pristines/subversion/tests/svn_test.h
subversion/branches/compressed-pristines/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
subversion/branches/compressed-pristines/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
subversion/branches/compressed-pristines/tools/buildbot/slaves/bb-openbsd/svncheck.sh
subversion/branches/compressed-pristines/tools/buildbot/slaves/bb-openbsd/svnclean.sh
subversion/branches/compressed-pristines/tools/buildbot/slaves/centos/svnbuild.sh
subversion/branches/compressed-pristines/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/compressed-pristines/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/compressed-pristines/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
subversion/branches/compressed-pristines/tools/client-side/bash_completion
subversion/branches/compressed-pristines/tools/client-side/mergeinfo-sanitizer.py (props changed)
subversion/branches/compressed-pristines/tools/dev/benchmarks/large_dirs/create_bigdir.sh
subversion/branches/compressed-pristines/tools/dev/benchmarks/suite1/benchmark.py
subversion/branches/compressed-pristines/tools/dev/benchmarks/suite1/run
subversion/branches/compressed-pristines/tools/dev/benchmarks/suite1/run.bat
subversion/branches/compressed-pristines/tools/dev/gdb-py/svndbg/__init__.py (props changed)
subversion/branches/compressed-pristines/tools/dev/gdb-py/svndbg/printers.py (contents, props changed)
subversion/branches/compressed-pristines/tools/dev/gen-py-errors.py
subversion/branches/compressed-pristines/tools/dev/histogram.py (props changed)
subversion/branches/compressed-pristines/tools/dev/mergegraph/mergegraph.py
subversion/branches/compressed-pristines/tools/dev/svnraisetreeconflict/main.c
subversion/branches/compressed-pristines/tools/dev/unix-build/Makefile.svn
subversion/branches/compressed-pristines/tools/dev/unix-build/README
subversion/branches/compressed-pristines/tools/dev/windows-build/Makefile
subversion/branches/compressed-pristines/tools/dist/nightly.sh
subversion/branches/compressed-pristines/tools/dist/release.py
subversion/branches/compressed-pristines/tools/server-side/svn-rep-sharing-stats.c
subversion/branches/compressed-pristines/tools/server-side/svnauthz-validate.c
subversion/branches/compressed-pristines/tools/server-side/svnpredumpfilter.py (props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/commit-hook.py (props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/daemonize.py (props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/example.conf
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnpubsub/__init__.py (props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnpubsub/client.py (props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnpubsub/server.py (props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svntweet.py (contents, props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnwcsub.py (contents, props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/testserver.py (props changed)
subversion/branches/compressed-pristines/tools/server-side/svnpubsub/watcher.py (props changed)
subversion/branches/compressed-pristines/win-tests.py
Propchange: subversion/branches/compressed-pristines/
------------------------------------------------------------------------------
Merged /subversion/branches/javahl-ra:r1342682,1344977
Merged /subversion/trunk:r1326090-1373279
Merged /subversion/branches/ev2-export:r1325914,1332738
Merged /subversion/branches/revprop-cache:r1298521-1326293
Modified: subversion/branches/compressed-pristines/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/CHANGES?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/CHANGES (original)
+++ subversion/branches/compressed-pristines/CHANGES Thu Aug 16 10:17:48 2012
@@ -19,9 +19,15 @@ http://svn.apache.org/repos/asf/subversi
* 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 --properties-only option for 'svn diff' (r1336110)
* new --patch-compatible option for 'svn diff' (r1239561)
* new SvnPubSub distributed commit hooks (tools/server-side/svnpubsub)
* 'svn diff' can compare arbitrary files and directories (r1310291, et al)
+ * ra_serf avoids re-downloading content present in pristine store (r1333936)
+ * 'svn mergeinfo' now honors the --revision (-r) option (issue #4199)
+ * new --search and --isearch options for 'svn log' (r1354666, -830)
+ * new built-in interactive text conflict merge tool (r1357864, et al)
+ * new 'svn --version --verbose' option shows runtime environment info
- Client-side bugfixes:
*
@@ -30,7 +36,7 @@ http://svn.apache.org/repos/asf/subversi
*
- Other tool improvements and bugfixes:
- *
+ * 'svnmucc' promoted to first-class supported utility (issue #3308)
Developer-visible changes:
- General:
@@ -43,25 +49,101 @@ http://svn.apache.org/repos/asf/subversi
*
+Version 1.7.6
+(15 Aug 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.6
+
+ User-visible changes:
+ - Client- and server-side bugfixes:
+
+ - Client-side bugfixes:
+ * Fix "svn status -u --depth empty FILE" (r1348822, r1349215)
+ * Fix example output of 'svn help status' (issue #3962)
+ * svn propset of svn:eol-style might not notice related text changes (r1353572)
+ * sort output of 'svn propget -R' (r1355699)
+ * sort output of 'svn proplist' (r1355698)
+ * sort output of 'svn status' (r1341012)
+ * avoid a filestat per working copy find operation (r1340556)
+ * optimize 'svn upgrade' performance on large working copies (r1342984)
+ * allow 'file:///C:\repos' style arguments on Windows, like 1.6 (r1346765)
+ * fix ra_serf against Subversion 1.2 servers (r1349367)
+ * fix 'svn upgrade' on working copies with certain tree conflicts (r1345482)
+ * avoid workqueue references to system temp dir (r1367854)
+ * allow non-existant canonical paths (r1367853)
+ * fix 'svn revert --depth files' to operate on files (r1365554)
+ * fix ra_serf XML namespace handling against malicious server (r1337441)
+ * fix relocate with server-relative externals (issue 4216)
+ * change two asserts into errors for TortoiseSVN (r1368128, r1368065)
+ * don't attempt to anchor an operation outside a wc root (r1361341)
+
+ - Server-side bugfixes:
+ * partial sync drops properties when converting to adds (issue #4184)
+ * replaying a copy and delete of an unreadable child fails (issue #4121)
+ * allow svnlook to operate on r0 (r1362508)
+ * make FSFS revision files independent of APR hash order (r1367498)
+
+ - Other tool improvements and bugfixes:
+ * move mod_dontdothat to install-tools (r1307177)
+
+ Developer-visible changes:
+ - General:
+ * fix running tests against httpd 2.4 (r1291594)
+ * use constant struct initialisers for C89 compatibility (r1352068)
+
+ - Bindings:
+ * JavaHL: Don't assert on some invalid input (r1354626, r1354652)
+ * JavaHL: Add missing new in 1.7 notifications (r1351772)
+
+
Version 1.7.5
-(26 Apr 2012, from /branches/1.7.x)
+(17 May 2012, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.5
- User-visible changes:
+ User-visible changes:
+ - Client- and server-side bugfixes:
+ * http: report deleted-revision upon delete during update (r1327474)
+
+ - Client-side bugfixes:
* avoid potential segfault when canonicalizing properties (r1296369)
- * fix non-fatal FSFS corruption bug with concurrent commits (issue #4129)
* improve memory and file-handle management with externals (issue #4130)
- * ra_serf: convert assertions to errors: MERGE fails (r1302417)
- * mod_dav_svn: error on MERGE of non-existent resource (r1298343)
+ * serf: convert assertions to "MERGE failed" errors (r1302417)
* fix undefined behaviour during multi-segment reverse merges (issue #4144)
- * fix potential pool lifetime problem in the diff code (r1311935)
- * libsvn_wc: reduce resources use while looking for the wc root (r1306334)
+ * fix potential use of already freed memory during diff operation (r1311935)
+ * improve performance of scan for the working copy root (r1306334)
* cmdline: fix segfault during 'svn diff' argument processing (r1311702)
- * fix regression with deep commit followed by depthy update (issue #4136)
+ * fix regression from 1.6 in update with --depth option (issue #4136)
+ * propset: avoid undefined behaviour in error path (r1325361)
+ * reset sqlite statements, partly for sqlite-3.7.11 compat (r1328846, et al)
+ * fix assertion during 'svn diff -r BASE:HEAD ^/trunk' (issue #4161)
+ * notify upon 'update' just removing locks on files (r1329876)
+ * neon: fix potential use of freed memory during commits (r1329388)
+ * 'status --xml' doesn't show repository deletes correctly (issue #4167)
+ * fix assert on svn:externals with drive letter on Windows (issue #4073)
+ * fix 'svn update --depth=empty' against 1.4 servers (issue #4046)
+ * handle missing svn:date reported by svnserve gracefully (r1306111)
+ * fix merges which first add a subtree and then delete it (issue #4166)
+ * fix a regression with checkout of file externals (issue #4087)
+ * don't add spurious mergeinfo to subtrees in edge-case merge (issue #4169)
+ * improve performance of status on large working copies (issue #4178)
- Developer-visible changes:
+ - Server-side bugfixes:
+ * fix non-fatal FSFS corruption bug with concurrent commits (issue #4129)
+ * mod_dav_svn: raise an error on MERGE of non-existent resource (r1298343)
+ * mod_dav_svn: support compiling/running under httpd-2.4 (r1232267)
+ * mod_dav_svn: forbid BDB repositories under httpd's event MPM (issue #4157)
+
+ - Other tool improvements and bugfixes:
+ * emacs support: updates to dsvn.el and vc-svn.el (r1200896, et al)
+
+ Developer-visible changes:
+ - General:
+ * windows example distribution scripts: include svnrdump (r1295007)
+ * fix running the test suite with jsvn (r1335555)
+
+ - Bindings:
* swig-py tests: avoid FAILs on APR hash order (r1296137, r1292248)
* swig-rb tests: avoid FAILs on APR hash order (r1310535, r1310594)
+ * swig-pl: Improved perl detection in gen-make.py (r1291797, r1291810)
Version 1.7.4
Modified: subversion/branches/compressed-pristines/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/COMMITTERS?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/COMMITTERS [UTF-8] (original)
+++ subversion/branches/compressed-pristines/COMMITTERS [UTF-8] Thu Aug 16 10:17:48 2012
@@ -13,7 +13,7 @@ Blanket commit access:
sussman Ben Collins-Sussman <su...@red-bean.com>
kfogel Karl Fogel <kf...@red-bean.com>
gstein Greg Stein <gs...@gmail.com>
- brane Branko Čibej <br...@xbc.nu>
+ brane Branko Čibej <br...@apache.org>
jorton Joe Orton <jo...@manyfish.co.uk>
ghudson Greg Hudson <gh...@mit.edu>
fitz Brian W. Fitzpatrick <fi...@red-bean.com>
@@ -39,7 +39,7 @@ Blanket commit access:
pburba Paul Burba <pb...@collab.net>
glasser David Glasser <gl...@davidglasser.net>
lgo Lieven Govaerts <lg...@mobsol.be>
- hwright Hyrum Wright <hy...@wandisco.com>
+ hwright Hyrum Wright <hy...@hyrumwright.org>
vgeorgescu Vlad Georgescu <vg...@gmail.com>
kameshj Kamesh Jayachandran <ka...@collab.net>
markphip Mark Phippard <mp...@collab.net>
@@ -93,8 +93,9 @@ Commit access for specific areas:
clkao Chia-liang Kao <cl...@clkao.org> (Swig-Perl b.)
joeswatosh Joe Swatosh <jo...@gmail.com> (Swig-Ruby b.)
jrvernooij Jelmer Vernooij <je...@samba.org> (Python bindings)
- sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python bindings)
- rdonch Роман Донченко <DX...@yandex.ru> (Swig-Python b.)
+ sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python b.)
+ rdonch Роман Донченко <dp...@corrigendum.ru> (Swig-Python b.)
+ vmpn Vladimir Berezniker <vm...@hitechman.com> (JavaHL bindings)
Packages:
@@ -201,6 +202,7 @@ giorgio_valoti Giorgio Valoti <giorgio
br.)
holden Holden Karau <ho...@pigscanfly.ca> (scheme-bindings br.)
moklo Morten Kloster <mo...@gmail.com> (diff-improvements br.)
+ vmpn Vladimir Berezniker <vm...@hitechman.com> (javahl-ra br.)
Subprojects that are complete, abandoned or have moved elsewhere:
Modified: subversion/branches/compressed-pristines/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/INSTALL?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/INSTALL (original)
+++ subversion/branches/compressed-pristines/INSTALL Thu Aug 16 10:17:48 2012
@@ -96,29 +96,23 @@ I. INTRODUCTION
These diff streams are used everywhere -- over the network,
in the repository, and in the client's working copy.
- * libserf or libneon (OPTIONAL for client)
+ * libserf (OPTIONAL for client)
- The Serf and Neon libraries both allow the Subversion client
- to send HTTP requests. This is necessary if you want your
- client to access a repository served by the Apache HTTP
- server. There is an alternate 'svnserve' server as well,
- though, and clients automatically know how to speak the
- svnserve protocol. Thus it's not strictly necessary for your
- client to be able to speak HTTP... though we still recommend
- that your client be built to speak both HTTP and svnserve
- protocols. Your client can be compiled against either
- libserf or libneon (or both), as they offer competing
- implementations.
+ The Serf library allows the Subversion client to send HTTP
+ requests. This is necessary if you want your client to access
+ a repository served by the Apache HTTP server. There is an
+ alternate 'svnserve' server as well, though, and clients
+ automatically know how to speak the svnserve protocol.
+ Thus it's not strictly necessary for your client to be able
+ to speak HTTP... though we still recommend that your client
+ be built to speak both HTTP and svnserve protocols.
* OpenSSL (OPTIONAL for client and server)
OpenSSL enables your client to access SSL-encrypted https://
- URLs (using libserf or libneon) in addition to unencrypted
- http:// URLs. To use SSL with Subversion's WebDAV server,
- Apache needs to be compiled with OpenSSL as well.
-
- The Neon library can use the GnuTLS library as an alternative
- to OpenSSL.
+ URLs (using libserf) in addition to unencrypted http:// URLs.
+ To use SSL with Subversion's WebDAV server, Apache needs to be
+ compiled with OpenSSL as well.
* Berkeley DB (OPTIONAL for client and server)
@@ -177,10 +171,10 @@ I. INTRODUCTION
team has created a script that downloads the minimal prerequisite
libraries (Apache Portable Runtime, Sqlite, and Zlib). The script,
'get-deps.sh', is available in the same directory as this file.
- When run, it will place 'apr', 'apr-util', 'serf', 'neon',
- 'zlib', and 'sqlite-amalgamation' directories directly into your
- unpacked Subversion distribution, where they will be automatically
- configured and built by Subversion's build process.
+ When run, it will place 'apr', 'apr-util', 'serf', 'zlib', and
+ 'sqlite-amalgamation' directories directly into your unpacked Subversion
+ distribution, where they will be automatically configured and built by
+ Subversion's build process.
Note: there are optional dependencies (such as openssl, swig, and httpd)
which get-deps.sh does not download and Subversion does not attempt to
@@ -313,44 +307,22 @@ I. INTRODUCTION
newer. The autogen.sh script knows about that.
- 5. An HTTP client library: serf or neon. (OPTIONAL)
+ 5. Serf library 1.1 or newer (http://code.google.com/p/serf/) (OPTIONAL)
If you want your client to be able to speak to an Apache
server (via a http:// or https:// URL), you must link against
- at least one of these libraries. Though optional, we strongly
- recommend this.
+ serf. Though optional, we strongly recommend this.
- (If you link against both, Subversion will use ra_serf by
- default. Add "http-library = neon" to the [global] section of
- your ~/.subversion/servers file to use ra_neon instead.)
-
- a. Serf library 1.1.0 or newer (http://code.google.com/p/serf/)
-
- In order to use ra_serf, you must install serf, and run
- Subversion's ./configure with the argument --with-serf. If
- serf is installed in a non-standard place, you should use
+ In order to use ra_serf, you must install serf, and run Subversion's
+ ./configure with the argument --with-serf. If serf is installed in a
+ non-standard place, you should use
--with-serf=/path/to/serf/install
- instead.
-
- For more information on serf and Subversion's ra_serf, see
- the file subversion/libsvn_ra_serf/README.
-
- b. Neon library 0.25 through 0.29 (http://www.webdav.org/neon/)
-
- In order to use ra_neon, you must install neon, and run
- Subversion's ./configure with the argument --with-neon.
- Subversion's configuration mechanism should then detect the
- installed Neon. If it does not, you may need to set the
- LDFLAGS environment variable when you run "./configure", or
- specify Neon's location by passing the "--with-neon="
- option to "./configure". Look for the "neon-config" script
- in a "bin/" subdirectory of the target of "--with-neon".
- For example, if you pass "--with-neon=/usr/local/myneon/",
- then there should be a file
- "/usr/local/myneon/bin/neon-config".
+ instead.
+ For more information on serf and Subversion's ra_serf, see the file
+ subversion/libsvn_ra_serf/README.
6. OpenSSL (OPTIONAL)
@@ -358,28 +330,19 @@ I. INTRODUCTION
### finding OpenSSL, but we may need more docco here. and w.r.t
### zlib.
- The Serf and Neon libraries have support for SSL encryption by
- relying on the OpenSSL library.
+ The Serf library has support for SSL encryption by relying on the
+ OpenSSL library.
a. Using OpenSSL on the client through Serf
- b. Using OpenSSL on the client through Neon
-
- When Neon is created with this dependency, then the Subversion
- client inherits the ability to support SSL connections. Neon
- also has support for sending compressed data using the zlib
- library which a Subversion client can take advantage of.
-
- On Unix systems, to build Neon with OpenSSL, you need OpenSSL
+ On Unix systems, to build Serf with OpenSSL, you need OpenSSL
installed on your system, and you must add "--with-ssl" as a
"./configure" parameter. If your OpenSSL installation is hard
- for Neon to find, you may need to use "--with-libs=/path/to/lib"
+ for Serf to find, you may need to use "--with-libs=/path/to/lib"
in addition. In particular, on Red Hat (but not Fedora Core) it
is necessary to specify "--with-libs=/usr/kerberos" for OpenSSL
to be found. You can also specify a path to the zlib library
- using "--with-libs". Consult the Neon documentation for more
- information on how to use these parameters and versions of
- libraries you need.
+ using "--with-libs".
Under Windows, you can specify the paths to these libraries by
passing the options --with-zlib and --with-openssl to gen-make.py.
@@ -651,7 +614,6 @@ II. INSTALLATION
db*.i386.rpm (Version 4.0.14 or greater; version 4.3.27 or
4.2.52 is preferred however)
expat (Comes with RedHat)
- neon (Version 0.25.5)
After downloading, install it (as root user):
@@ -683,7 +645,7 @@ II. INSTALLATION
# rm -f /usr/local/lib/libsvn*
# rm -f /usr/local/lib/libapr*
# rm -f /usr/local/lib/libexpat*
- # rm -f /usr/local/lib/libneon*
+ # rm -f /usr/local/lib/libserf*
Start the process by running "autogen.sh":
@@ -845,15 +807,10 @@ II. INSTALLATION
* 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
+ * Awk (from http://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
needed to compile Apache or APR. Note that this is the actual awk
program, not an installer - just rename it to awk.exe and it is
ready to use.
- * Neon 0.26.1 or higher, downloaded from
- http://www.webdav.org/neon/neon-0.26.1.tar.gz which is required
- for building the client components. Neon is included in the zip file
- distribution. (0.25.0+ compiles, but does not properly support all
- HTTP auth types.)
* Apache apr, apr-util, and optionally apr-iconv libraries, version
0.9.12 or later. Included in both the Subversion dependencies ZIP file
and the Apache 2 source zip. If you are building from a Subversion
@@ -907,7 +864,7 @@ II. INSTALLATION
E.2 Notes
- The Neon library supports secure connections with OpenSSL and
+ The Serf library supports secure connections with OpenSSL and
on-the-wire compression with zlib. If you want to use the
secure connections feature, you should pass the option
"--with-openssl" to the gen-make.py script. See Section I.11 for
@@ -955,9 +912,8 @@ II. INSTALLATION
server dso modules and are using Visual Studio 6. You must build
and install it from source if you are not using Visual Studio 6 and
want to build and/or test the server modules.
- * If you checked out Subversion from the repository then extract neon
- into SVN\src-trunk\neon, the zip file source distribution includes
- neon.
+ * If you checked out Subversion from the repository then install the serf
+ sources into SVN\src-trunk\serf.
* If you want BDB backend support, extract the Berkeley DB files
into SVN\src-trunk\db4-win32. It's a good idea to add
SVN\src-trunk\db4-win32\bin to your PATH, so that Subversion can find
Modified: subversion/branches/compressed-pristines/LICENSE
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/LICENSE?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/LICENSE (original)
+++ subversion/branches/compressed-pristines/LICENSE Thu Aug 16 10:17:48 2012
@@ -260,3 +260,11 @@ subversion/bindings/swig/python/tests/tr
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+For the file subversion/libsvn_subr/utf_width.c
+
+ * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * for any purpose and without fee is hereby granted. The author
+ * disclaims all warranties with regard to this software.
Modified: subversion/branches/compressed-pristines/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/Makefile.in?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/Makefile.in (original)
+++ subversion/branches/compressed-pristines/Makefile.in Thu Aug 16 10:17:48 2012
@@ -42,7 +42,6 @@ SVN_EXTERNAL_PROJECT_SUBDIRS = @SVN_EXTE
SCHEMA_DIR = subversion/svn/schema
-NEON_LIBS = @NEON_LIBS@
SVN_APR_LIBS = @SVN_APR_LIBS@
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
SVN_APR_MEMCACHE_LIBS = @SVN_APR_MEMCACHE_LIBS@
@@ -70,7 +69,6 @@ gnome_keyring_libdir = @libdir@
gpg_agent_libdir = @libdir@
gssapi_libdir = @libdir@
kwallet_libdir = @libdir@
-neon_libdir = @libdir@
serf_libdir = @libdir@
bindir = @bindir@
includedir = @includedir@
@@ -129,13 +127,12 @@ LT_CXX_LIBADD = @LT_CXX_LIBADD@
INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \
@SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_APR_MEMCACHE_INCLUDES@ \
@SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ @SVN_GSSAPI_INCLUDES@ \
- @SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ @SVN_NEON_INCLUDES@ \
+ @SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ \
@SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ @SVN_SQLITE_INCLUDES@ \
@SVN_XML_INCLUDES@ @SVN_ZLIB_INCLUDES@
APACHE_INCLUDES = @APACHE_INCLUDES@
APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
-APACHE_LIBEXECDIR_TOOLS = $(DESTDIR)@APACHE_LIBEXECDIR@/svn-tools
APACHE_LDFLAGS = @APACHE_LDFLAGS@
SWIG = @SWIG@
@@ -219,7 +216,6 @@ libsvn_fs_fs_LDFLAGS = @libsvn_fs_fs_LDF
libsvn_fs_util_LDFLAGS = @libsvn_fs_util_LDFLAGS@
libsvn_ra_LDFLAGS = @libsvn_ra_LDFLAGS@
libsvn_ra_local_LDFLAGS = @libsvn_ra_local_LDFLAGS@
-libsvn_ra_neon_LDFLAGS = @libsvn_ra_neon_LDFLAGS@
libsvn_ra_serf_LDFLAGS = @libsvn_ra_serf_LDFLAGS@
libsvn_ra_svn_LDFLAGS = @libsvn_ra_svn_LDFLAGS@
libsvn_repos_LDFLAGS = @libsvn_repos_LDFLAGS@
@@ -246,14 +242,12 @@ INSTALL_GPG_AGENT_LIB = $(INSTALL_LIB)
INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
INSTALL_GSSAPI_LIB = $(INSTALL_LIB)
INSTALL_KWALLET_LIB = $(INSTALL_LIB)
-INSTALL_NEON_LIB = $(INSTALL_LIB)
INSTALL_SERF_LIB = $(INSTALL_LIB)
INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_INCLUDE = $(INSTALL) -m 644
INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
-INSTALL_MOD_SHARED_TOOLS = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR_TOOLS)"
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_LOCALE = $(INSTALL_DATA)
@@ -453,7 +447,7 @@ check-all-javahl: check-apache-javahl ch
# "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).
-check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
+check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@
@if test "$(PYTHON)" != "none"; then \
flags="--verbose"; \
if test "$(CLEANUP)" != ""; then \
@@ -490,6 +484,12 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
flags="--list --milestone-filter=$(MILESTONE_FILTER) \
--mode-filter=$(MODE_FILTER) --log-to-stdout $$flags"; \
fi; \
+ if test "$(SET_LOG_LEVEL)" != ""; then \
+ flags="--set-log-level $(SET_LOG_LEVEL) $$flags"; \
+ fi; \
+ if test "$(SSL_CERT)" != ""; then \
+ flags="--ssl-cert $(SSL_CERT) $$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 \
@@ -503,38 +503,38 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
# First, set up Apache as documented in
# subversion/tests/cmdline/README.
-davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
+davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
@$(MAKE) check BASE_URL=http://localhost
# Automatically configure and run Apache httpd on a random port, and then
# run make check.
-davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
+davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
- @APXS=$(APXS) bash $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
+ @APXS=$(APXS) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
# First, run:
# subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline
-svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
+svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
@$(MAKE) check BASE_URL=svn://127.0.0.1
# 'make svnserveautocheck' runs svnserve for you and kills it.
-svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
+svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@
@env PYTHON=$(PYTHON) THREADED=$(THREADED) \
$(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh
# First, run:
# subversion/svnserve/svnserve --listen-host "::1" -d -r `pwd`/subversion/tests/cmdline
-svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
+svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@
@$(MAKE) check BASE_URL=svn://\[::1\]
# First make sure you can ssh to localhost and that "svnserve" is in
# the path of the resulting shell.
-svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
+svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
@$(MAKE) check \
BASE_URL=svn+ssh://localhost`pwd`/subversion/tests/cmdline
-bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
+bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
@$(MAKE) check FS_TYPE=bdb
check-clean:
@@ -583,15 +583,9 @@ external-clean external-distclean extern
revlist="$$i $$revlist"; \
done; \
for i in $$revlist; do \
- if test "$$i" = "neon" -a "$$target" = "extraclean"; then \
- echo "------ making distclean (no extraclean) in $$i"; \
- (cd $$i && $(MAKE) distclean) || exit 1; \
- echo "------ completed distclean (no extraclean) in $$i"; \
- else \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- fi; \
+ echo "------ making $$target in $$i"; \
+ (cd $$i && $(MAKE) $$target) || exit 1; \
+ echo "------ completed $$target in $$i"; \
done;
@@ -862,3 +856,11 @@ clean-ctypes-python:
# manually describe a dependency, which we won't otherwise detect
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-checks.sql
+
+# Compatibility symlink.
+# This runs after the target of the same name in build-outputs.mk.
+INSTALL_EXTRA_TOOLS=\
+ $(MKDIR) $(DESTDIR)$(bindir); \
+ test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
+ ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
+ ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
Modified: subversion/branches/compressed-pristines/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/NOTICE?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/NOTICE (original)
+++ subversion/branches/compressed-pristines/NOTICE Thu Aug 16 10:17:48 2012
@@ -13,4 +13,6 @@ For more information, see LICENSE.
This product includes software developed under the X Consortium License
see: build/install-sh
+This product includes software developed by Markus Kuhn under a permissive
+license, see LICENSE.
Modified: subversion/branches/compressed-pristines/aclocal.m4
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/aclocal.m4?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/aclocal.m4 (original)
+++ subversion/branches/compressed-pristines/aclocal.m4 Thu Aug 16 10:17:48 2012
@@ -46,6 +46,7 @@ sinclude(build/ac-macros/sqlite.m4)
sinclude(build/ac-macros/swig.m4)
sinclude(build/ac-macros/zlib.m4)
sinclude(build/ac-macros/kwallet.m4)
+sinclude(build/ac-macros/macosx.m4)
# Include the libtool macros
sinclude(build/libtool.m4)
Modified: subversion/branches/compressed-pristines/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build.conf?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build.conf (original)
+++ subversion/branches/compressed-pristines/build.conf Thu Aug 16 10:17:48 2012
@@ -84,32 +84,13 @@ swig-checkout-files = common.swg swigrun
# BUILD TARGETS
#
-# Explanation for the seemingly-spurious mention of 'neon' in the libs lines
-# for svn, svnsync, ra-local-test, client-test, svn-push and svnmucc:
-# This is a workaround for a libtool bug, which manifests on Linux and similar
-# ELF platforms, when linking to an installed Neon, and there are old
-# Subversion libraries in the same directory as the installed Neon. In such
-# cases, the run-before-installing version of the executables (.libs/lt-foo),
-# gets given an ELF RPATH which includes the install directory *before* all the
-# uninstalled libsvn_foo/.libs directories have been mentioned. This occurs
-# because when libtool is at the point of handling Neon, it adds an RPATH entry
-# pointing to its directory, but fails to correctly consider that it should
-# prioritize all the RPATH entries for *un*installed libraries before all those
-# for installed libraries, to avoid this bug. As a kludgy workaround, we add
-# a mention of 'neon' to the end of the libs lines for executables which
-# indirectly link to libsvn_ra_neon, which has the effect of 'pulling' the
-# harmful RPATH entry toward the end of RPATH, enabling the executables to run
-# correctly before installation, even when old versions of the Subversion
-# libraries are present.
-# This bug was last confirmed to be present in libtool 1.5.22.
-
# The subversion command-line client
[svn]
description = Subversion Client
type = exe
path = subversion/svn
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr
- apriconv apr neon
+ apriconv apr
manpages = subversion/svn/svn.1
install = bin
@@ -154,7 +135,7 @@ msvc-libs = advapi32.lib ws2_32.lib
description = Subversion repository replicator
type = exe
path = subversion/svnsync
-libs = libsvn_ra libsvn_delta libsvn_subr apr neon
+libs = libsvn_ra libsvn_delta libsvn_subr apr
install = bin
manpages = subversion/svnsync/svnsync.1
@@ -174,6 +155,14 @@ libs = libsvn_client libsvn_ra libsvn_re
install = bin
manpages = subversion/svnrdump/svnrdump.1
+[svnmucc]
+description = Subversion Multiple URL Command Client
+type = exe
+path = subversion/svnmucc
+libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
+install = bin
+manpages = subversion/svnmucc/svnmucc.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -207,7 +196,7 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_delta
libs = libsvn_subr aprutil apriconv apr zlib
-msvc-export = svn_delta.h
+msvc-export = svn_delta.h svn_editor.h private/svn_delta_private.h
# Routines for diffing
[libsvn_diff]
@@ -266,14 +255,6 @@ add-install-deps = $(SVN_RA_LIB_INSTALL_
install = lib
msvc-export = svn_ra.h private\svn_ra_private.h
-# Accessing repositories via DAV through neon
-[libsvn_ra_neon]
-type = ra-module
-path = subversion/libsvn_ra_neon
-install = neon-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
-msvc-static = yes
-
# Accessing repositories via DAV through serf
[libsvn_ra_serf]
type = ra-module
@@ -315,7 +296,8 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_subr
libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic
-msvc-libs = advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib
+msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
+ crypt32.lib version.lib psapi.lib
msvc-export =
svn_auth.h svn_base64.h svn_cache_config.h svn_checksum.h svn_cmdline.h
svn_compat.h svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h
@@ -331,7 +313,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
+ private\svn_subr_private.h private\svn_mutex.h private\svn_named_atomic.h
# Working copy management lib
[libsvn_wc]
@@ -607,7 +589,7 @@ description = Subversion Java HighLevel
type = lib
path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
- libsvn_subr libsvn_fs aprutil apriconv apr neon
+ libsvn_subr libsvn_fs aprutil apriconv apr
sources = *.cpp *.c
add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS)
install = javahl-lib
@@ -776,6 +758,14 @@ sources = hashdump-test.c
install = test
libs = libsvn_test libsvn_subr apriconv apr
+[io-test]
+description = Test I/O Operations
+type = exe
+path = subversion/tests/libsvn_subr
+sources = io-test.c
+install = test
+libs = libsvn_test libsvn_subr apriconv apr
+
[opt-test]
description = Test options library
type = exe
@@ -792,6 +782,22 @@ sources = mergeinfo-test.c
install = test
libs = libsvn_test libsvn_subr apr
+[named_atomic-test]
+description = Test named atomics
+type = exe
+path = subversion/tests/libsvn_subr
+sources = named_atomic-test.c
+install = test
+libs = libsvn_test libsvn_subr apr
+
+[named_atomic-proc-test]
+description = Sub-process for named atomics
+type = exe
+path = subversion/tests/libsvn_subr
+sources = named_atomic-test-proc.c
+install = sub-test
+libs = libsvn_subr apr
+
[path-test]
description = Test path library
type = exe
@@ -908,7 +914,7 @@ type = exe
path = subversion/tests/libsvn_client
sources = client-test.c
install = test
-libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr neon
+libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
@@ -939,16 +945,16 @@ path = subversion/tests/libsvn_ra_local
sources = ra-local-test.c
install = test
libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr
- apriconv apr neon
+ apriconv apr
# ----------------------------------------------------------------------------
# Tests for libsvn_wc
-[tree-conflict-data-test]
+[conflict-data-test]
description = Test the storage of tree conflict data
type = exe
path = subversion/tests/libsvn_wc
-sources = tree-conflict-data-test.c utils.c
+sources = conflict-data-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
@@ -977,13 +983,21 @@ install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
[op-depth-test]
-description = Test the main WC API functions
+description = Test layered tree changes
type = exe
path = subversion/tests/libsvn_wc
sources = op-depth-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+[wc-queries-test]
+description = Test Sqlite query evaluation
+type = exe
+path = subversion/tests/libsvn_wc
+sources = wc-queries-test.c
+install = test
+libs = libsvn_test libsvn_subr apriconv apr sqlite
+
# ----------------------------------------------------------------------------
# These are not unit tests at all, they are small programs that exercise
# parts of the libsvn_delta API from the command line. They are stuck here
@@ -1088,14 +1102,6 @@ external-lib = $(SVN_ZLIB_LIBS)
external-project = zlib
msvc-static = yes
-[neon]
-type = lib
-external-lib = $(NEON_LIBS)
-external-project = neon/neon
-libs = xml
-msvc-libs = ws2_32.lib
-msvc-static = yes
-
[apr_memcache]
type = lib
external-lib = $(SVN_APR_MEMCACHE_LIBS)
@@ -1118,7 +1124,7 @@ external-lib = $(SVN_XML_LIBS)
[ra-libs]
type = lib
external-lib = $(SVN_RA_LIB_LINK)
-libs = libsvn_ra_neon libsvn_ra_serf libsvn_ra_local libsvn_ra_svn
+libs = libsvn_ra_serf libsvn_ra_local libsvn_ra_svn
[fs-libs]
type = lib
@@ -1142,8 +1148,8 @@ libs = __ALL__
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 spillbuf-test crypto-test
- revision-test
- subst_translate-test
+ named_atomic-test named_atomic-proc-test revision-test
+ subst_translate-test io-test
translate-test
random-test window-test
diff-diff3-test
@@ -1152,8 +1158,8 @@ libs = __ALL__
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
- op-depth-test dirent_uri-test
+ conflict-data-test db-test pristine-store-test entries-compat-test
+ op-depth-test dirent_uri-test wc-queries-test
auth-test
parse-diff-test
svn-rep-sharing-stats svn-populate-node-origins-index
@@ -1162,7 +1168,7 @@ libs = __ALL__
type = project
path = build/win32
libs = fs-libs ra-libs libsvn_client libsvn_subr libsvn_wc
- aprutil apriconv apr neon
+ aprutil apriconv apr
[__CONFIG__]
type = lib
@@ -1199,13 +1205,6 @@ libs = __JAVAHL__ javahl-tests javahl-co
# ----------------------------------------------------------------------------
# Contrib and tools
-[svnmucc]
-type = exe
-path = tools/client-side/svnmucc
-sources = svnmucc.c
-install = tools
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon
-
[diff]
type = exe
path = tools/diff
Modified: subversion/branches/compressed-pristines/build/ac-macros/svn-macros.m4
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/ac-macros/svn-macros.m4?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/ac-macros/svn-macros.m4 (original)
+++ subversion/branches/compressed-pristines/build/ac-macros/svn-macros.m4 Thu Aug 16 10:17:48 2012
@@ -202,3 +202,44 @@ AC_DEFUN([SVN_REMOVE_STANDARD_LIB_DIRS],
printf "%s" "${output_flags# }"
fi
])
+
+AC_DEFUN([SVN_CHECK_FOR_ATOMIC_BUILTINS],
+[
+ AC_CACHE_CHECK([whether the compiler provides atomic builtins], [svn_cv_atomic_builtins],
+ [AC_TRY_RUN([
+ int main()
+ {
+ unsigned long long val = 1010, tmp, *mem = &val;
+
+ if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020)
+ return 1;
+
+ tmp = val;
+
+ if (__sync_fetch_and_sub(mem, 1010) != tmp || val != 1010)
+ return 1;
+
+ if (__sync_sub_and_fetch(&val, 1010) != 0 || val != 0)
+ return 1;
+
+ tmp = 3030;
+
+ if (__sync_val_compare_and_swap(mem, 0, tmp) != 0 || val != tmp)
+ return 1;
+
+ if (__sync_lock_test_and_set(&val, 4040) != 3030)
+ return 1;
+
+ mem = &tmp;
+
+ if (__sync_val_compare_and_swap(&mem, &tmp, &val) != &tmp)
+ return 1;
+
+ __sync_synchronize();
+
+ if (mem != &val)
+ return 1;
+
+ return 0;
+ }], [svn_cv_atomic_builtins=yes], [svn_cv_atomic_builtins=no], [svn_cv_atomic_builtins=no])])
+])
Modified: subversion/branches/compressed-pristines/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/ac-macros/swig.m4?rev=1373783&r1=1373782&r2=1373783&view=diff
==============================================================================
--- subversion/branches/compressed-pristines/build/ac-macros/swig.m4 (original)
+++ subversion/branches/compressed-pristines/build/ac-macros/swig.m4 Thu Aug 16 10:17:48 2012
@@ -120,6 +120,10 @@ AC_DEFUN(SVN_FIND_SWIG,
])
SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+ dnl Swig-generated code results in a number of shadowed variables, so
+ dnl ignore those warnings when compiling swig-py
+ SWIG_PY_COMPILE=`echo "$SWIG_PY_COMPILE" | $SED -e 's/-Wshadow //'`
+
AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
])
@@ -187,7 +191,7 @@ AC_DEFUN(SVN_FIND_SWIG,
for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
rubyhdrdir sitedir sitelibdir sitearchdir libdir
do
- rbconfig_tmp=`$rbconfig "print Config::CONFIG@<:@'$var_name'@:>@"`
+ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
eval "rbconfig_$var_name=\"$rbconfig_tmp\""
done