You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/10/11 21:52:46 UTC
svn commit: r1182053 [1/30] - in /subversion/branches/svn_mutex: ./ build/
build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ contrib/client-side/
contrib/hook-scripts/enforcer/ contrib/server-side/ notes/ notes/merge-tr...
Author: stefan2
Date: Tue Oct 11 19:52:34 2011
New Revision: 1182053
URL: http://svn.apache.org/viewvc?rev=1182053&view=rev
Log:
On svn_mutex branch: Bring up-to-date with /trunk.
Added:
subversion/branches/svn_mutex/notes/diff-data-flows.txt
- copied unchanged from r1181870, subversion/trunk/notes/diff-data-flows.txt
subversion/branches/svn_mutex/notes/hold
- copied unchanged from r1181870, subversion/trunk/notes/hold
subversion/branches/svn_mutex/notes/moves
- copied unchanged from r1181870, subversion/trunk/notes/moves
subversion/branches/svn_mutex/notes/ra-serf-testing.txt
- copied unchanged from r1181870, subversion/trunk/notes/ra-serf-testing.txt
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
- copied unchanged from r1181870, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
subversion/branches/svn_mutex/subversion/include/private/svn_subr_private.h
- copied unchanged from r1181870, subversion/trunk/subversion/include/private/svn_subr_private.h
subversion/branches/svn_mutex/subversion/include/svn_editor.h
- copied unchanged from r1181870, subversion/trunk/subversion/include/svn_editor.h
subversion/branches/svn_mutex/subversion/libsvn_client/diff_summarize.c
- copied unchanged from r1181870, subversion/trunk/subversion/libsvn_client/diff_summarize.c
subversion/branches/svn_mutex/subversion/libsvn_subr/gpg_agent.c
- copied unchanged from r1181870, subversion/trunk/subversion/libsvn_subr/gpg_agent.c
subversion/branches/svn_mutex/subversion/libsvn_subr/spillbuf.c
- copied unchanged from r1181870, subversion/trunk/subversion/libsvn_subr/spillbuf.c
subversion/branches/svn_mutex/subversion/libsvn_subr/svn_types.c
- copied unchanged from r1181870, subversion/trunk/subversion/libsvn_subr/svn_types.c
subversion/branches/svn_mutex/subversion/tests/cmdline/svnmucc_tests.py
- copied unchanged from r1181870, subversion/trunk/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/upgrade_tests_data/upgrade_file_externals.tar.bz2
- copied unchanged from r1181870, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_file_externals.tar.bz2
subversion/branches/svn_mutex/subversion/tests/cmdline/upgrade_tests_data/upgrade_locked.tar.bz2
- copied unchanged from r1181870, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_locked.tar.bz2
subversion/branches/svn_mutex/subversion/tests/libsvn_delta/editor-test.c
- copied unchanged from r1181870, subversion/trunk/subversion/tests/libsvn_delta/editor-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_subr/spillbuf-test.c
- copied unchanged from r1181870, subversion/trunk/subversion/tests/libsvn_subr/spillbuf-test.c
subversion/branches/svn_mutex/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/
- copied from r1181870, subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/
subversion/branches/svn_mutex/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/
- copied from r1181870, subversion/trunk/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/
subversion/branches/svn_mutex/tools/client-side/detach.py
- copied unchanged from r1181870, subversion/trunk/tools/client-side/detach.py
subversion/branches/svn_mutex/tools/client-side/mergeinfo-sanitizer.py
- copied unchanged from r1181870, subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
subversion/branches/svn_mutex/tools/dev/histogram.py
- copied unchanged from r1181870, subversion/trunk/tools/dev/histogram.py
subversion/branches/svn_mutex/tools/dist/_gnupg.py
- copied unchanged from r1181870, subversion/trunk/tools/dist/_gnupg.py
subversion/branches/svn_mutex/tools/dist/templates/download.ezt
- copied unchanged from r1181870, subversion/trunk/tools/dist/templates/download.ezt
subversion/branches/svn_mutex/tools/dist/templates/htaccess.ezt
- copied unchanged from r1181870, subversion/trunk/tools/dist/templates/htaccess.ezt
subversion/branches/svn_mutex/tools/dist/templates/rc-release-ann.ezt
- copied unchanged from r1181870, subversion/trunk/tools/dist/templates/rc-release-ann.ezt
subversion/branches/svn_mutex/tools/dist/templates/stable-news.ezt
- copied unchanged from r1181870, subversion/trunk/tools/dist/templates/stable-news.ezt
subversion/branches/svn_mutex/tools/server-side/svnpredumpfilter.py
- copied unchanged from r1181870, subversion/trunk/tools/server-side/svnpredumpfilter.py
Removed:
subversion/branches/svn_mutex/build/config.guess
subversion/branches/svn_mutex/build/config.sub
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java
subversion/branches/svn_mutex/subversion/include/private/svn_editor.h
subversion/branches/svn_mutex/subversion/libsvn_client/repos_diff_summarize.c
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/revprops-db.sql
subversion/branches/svn_mutex/subversion/libsvn_subr/constructors.c
subversion/branches/svn_mutex/subversion/libsvn_subr/kitchensink.c
subversion/branches/svn_mutex/tools/buildbot/slaves/osx10.4-gcc4.0.1-ia32/
subversion/branches/svn_mutex/tools/buildbot/slaves/osx10.6-x64/
subversion/branches/svn_mutex/tools/dist/getsigs.py
Modified:
subversion/branches/svn_mutex/ (props changed)
subversion/branches/svn_mutex/CHANGES
subversion/branches/svn_mutex/INSTALL
subversion/branches/svn_mutex/Makefile.in
subversion/branches/svn_mutex/autogen.sh
subversion/branches/svn_mutex/build/ (props changed)
subversion/branches/svn_mutex/build.conf
subversion/branches/svn_mutex/build/ac-macros/apache.m4
subversion/branches/svn_mutex/build/ac-macros/apr.m4
subversion/branches/svn_mutex/build/ac-macros/apr_memcache.m4
subversion/branches/svn_mutex/build/ac-macros/aprutil.m4
subversion/branches/svn_mutex/build/ac-macros/berkeley-db.m4
subversion/branches/svn_mutex/build/ac-macros/neon.m4
subversion/branches/svn_mutex/build/ac-macros/serf.m4
subversion/branches/svn_mutex/build/ac-macros/zlib.m4
subversion/branches/svn_mutex/build/buildcheck.sh
subversion/branches/svn_mutex/build/generator/extractor.py
subversion/branches/svn_mutex/build/generator/gen_make.py
subversion/branches/svn_mutex/build/generator/gen_win.py
subversion/branches/svn_mutex/build/generator/swig/__init__.py
subversion/branches/svn_mutex/build/generator/swig/header_wrappers.py
subversion/branches/svn_mutex/build/generator/templates/neon.vcxproj.ezt
subversion/branches/svn_mutex/build/generator/templates/serf.vcxproj.ezt
subversion/branches/svn_mutex/build/generator/templates/zlib.vcxproj.ezt
subversion/branches/svn_mutex/build/run_tests.py
subversion/branches/svn_mutex/build/transform_sql.py
subversion/branches/svn_mutex/configure.ac
subversion/branches/svn_mutex/contrib/client-side/svn-clean
subversion/branches/svn_mutex/contrib/hook-scripts/enforcer/enforcer
subversion/branches/svn_mutex/contrib/server-side/fsfsverify.py
subversion/branches/svn_mutex/get-deps.sh
subversion/branches/svn_mutex/notes/fsfs-improvements.txt
subversion/branches/svn_mutex/notes/knobs
subversion/branches/svn_mutex/notes/merge-tracking/func-spec.html
subversion/branches/svn_mutex/notes/wc-ng/transitions
subversion/branches/svn_mutex/subversion/bindings/ctypes-python/csvn/repos.py
subversion/branches/svn_mutex/subversion/bindings/ctypes-python/csvn/wc.py
subversion/branches/svn_mutex/subversion/bindings/ctypes-python/test/localrepos.py
subversion/branches/svn_mutex/subversion/bindings/ctypes-python/test/remoterepos.py
subversion/branches/svn_mutex/subversion/bindings/ctypes-python/test/setup_path.py
subversion/branches/svn_mutex/subversion/bindings/ctypes-python/test/svntypes.py
subversion/branches/svn_mutex/subversion/bindings/ctypes-python/test/wc.py
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Array.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/ClientContext.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/CopySources.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/File.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/JNIThreadData.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/JNIThreadData.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/OutputStream.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Path.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Path.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Pool.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Pool.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Prompter.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/SVNBase.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/SVNBase.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/StringArray.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Targets.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/native/Targets.h
subversion/branches/svn_mutex/subversion/bindings/javahl/native/libsvnjavahl.la.c
subversion/branches/svn_mutex/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java (props changed)
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Tristate.java (props changed)
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallback3.java (props changed)
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/branches/svn_mutex/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
subversion/branches/svn_mutex/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/svn_mutex/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/svn_mutex/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/svn_mutex/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
subversion/branches/svn_mutex/subversion/bindings/swig/core.i
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/Base.pm
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/Client.pm
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/Core.pm
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/Delta.pm
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/Fs.pm
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/Makefile.PL.in
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/Ra.pm
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/Repos.pm
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/scripts/compile_all.pl
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/scripts/fast_svnbase.pl
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/t/1repos.t
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/t/2fs.t
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/t/3client.t
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/t/4pool.t
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/t/5delta-compat.t
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/t/5delta.t
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/t/7editor.t
subversion/branches/svn_mutex/subversion/bindings/swig/perl/native/t/8lock.t
subversion/branches/svn_mutex/subversion/bindings/swig/python/svn/repos.py
subversion/branches/svn_mutex/subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py
subversion/branches/svn_mutex/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/svn_mutex/subversion/bindings/swig/ruby/test/util.rb
subversion/branches/svn_mutex/subversion/include/private/svn_adler32.h (props changed)
subversion/branches/svn_mutex/subversion/include/private/svn_auth_private.h
subversion/branches/svn_mutex/subversion/include/private/svn_client_private.h
subversion/branches/svn_mutex/subversion/include/private/svn_dav_protocol.h
subversion/branches/svn_mutex/subversion/include/private/svn_dep_compat.h
subversion/branches/svn_mutex/subversion/include/private/svn_sqlite.h
subversion/branches/svn_mutex/subversion/include/private/svn_string_private.h (contents, props changed)
subversion/branches/svn_mutex/subversion/include/private/svn_temp_serializer.h (props changed)
subversion/branches/svn_mutex/subversion/include/private/svn_wc_private.h
subversion/branches/svn_mutex/subversion/include/svn_auth.h
subversion/branches/svn_mutex/subversion/include/svn_client.h
subversion/branches/svn_mutex/subversion/include/svn_config.h
subversion/branches/svn_mutex/subversion/include/svn_dav.h
subversion/branches/svn_mutex/subversion/include/svn_delta.h
subversion/branches/svn_mutex/subversion/include/svn_diff.h
subversion/branches/svn_mutex/subversion/include/svn_dirent_uri.h
subversion/branches/svn_mutex/subversion/include/svn_error.h
subversion/branches/svn_mutex/subversion/include/svn_error_codes.h
subversion/branches/svn_mutex/subversion/include/svn_fs.h
subversion/branches/svn_mutex/subversion/include/svn_io.h
subversion/branches/svn_mutex/subversion/include/svn_mergeinfo.h
subversion/branches/svn_mutex/subversion/include/svn_ra.h
subversion/branches/svn_mutex/subversion/include/svn_ra_svn.h
subversion/branches/svn_mutex/subversion/include/svn_repos.h
subversion/branches/svn_mutex/subversion/include/svn_sorts.h
subversion/branches/svn_mutex/subversion/include/svn_types.h
subversion/branches/svn_mutex/subversion/include/svn_version.h
subversion/branches/svn_mutex/subversion/include/svn_wc.h
subversion/branches/svn_mutex/subversion/libsvn_client/blame.c
subversion/branches/svn_mutex/subversion/libsvn_client/cat.c
subversion/branches/svn_mutex/subversion/libsvn_client/cleanup.c
subversion/branches/svn_mutex/subversion/libsvn_client/client.h
subversion/branches/svn_mutex/subversion/libsvn_client/cmdline.c
subversion/branches/svn_mutex/subversion/libsvn_client/commit.c
subversion/branches/svn_mutex/subversion/libsvn_client/commit_util.c
subversion/branches/svn_mutex/subversion/libsvn_client/copy.c
subversion/branches/svn_mutex/subversion/libsvn_client/deprecated.c
subversion/branches/svn_mutex/subversion/libsvn_client/diff.c
subversion/branches/svn_mutex/subversion/libsvn_client/export.c
subversion/branches/svn_mutex/subversion/libsvn_client/externals.c
subversion/branches/svn_mutex/subversion/libsvn_client/info.c
subversion/branches/svn_mutex/subversion/libsvn_client/locking_commands.c
subversion/branches/svn_mutex/subversion/libsvn_client/log.c
subversion/branches/svn_mutex/subversion/libsvn_client/merge.c
subversion/branches/svn_mutex/subversion/libsvn_client/mergeinfo.c
subversion/branches/svn_mutex/subversion/libsvn_client/mergeinfo.h
subversion/branches/svn_mutex/subversion/libsvn_client/patch.c
subversion/branches/svn_mutex/subversion/libsvn_client/ra.c
subversion/branches/svn_mutex/subversion/libsvn_client/relocate.c
subversion/branches/svn_mutex/subversion/libsvn_client/repos_diff.c
subversion/branches/svn_mutex/subversion/libsvn_client/status.c
subversion/branches/svn_mutex/subversion/libsvn_client/update.c
subversion/branches/svn_mutex/subversion/libsvn_client/url.c
subversion/branches/svn_mutex/subversion/libsvn_client/util.c
subversion/branches/svn_mutex/subversion/libsvn_delta/compat.c
subversion/branches/svn_mutex/subversion/libsvn_delta/editor.c
subversion/branches/svn_mutex/subversion/libsvn_delta/svndiff.c
subversion/branches/svn_mutex/subversion/libsvn_diff/diff_file.c
subversion/branches/svn_mutex/subversion/libsvn_diff/diff_memory.c
subversion/branches/svn_mutex/subversion/libsvn_diff/parse-diff.c
subversion/branches/svn_mutex/subversion/libsvn_fs/fs-loader.c
subversion/branches/svn_mutex/subversion/libsvn_fs/fs-loader.h
subversion/branches/svn_mutex/subversion/libsvn_fs_base/bdb/locks-table.c
subversion/branches/svn_mutex/subversion/libsvn_fs_base/fs.c
subversion/branches/svn_mutex/subversion/libsvn_fs_base/tree.c
subversion/branches/svn_mutex/subversion/libsvn_fs_base/tree.h
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/caching.c
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/fs.c
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/fs.h
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/id.c
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/key-gen.c
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/rep-cache.h
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/structure
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/temp_serializer.c (props changed)
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/temp_serializer.h (props changed)
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/tree.c
subversion/branches/svn_mutex/subversion/libsvn_fs_fs/tree.h
subversion/branches/svn_mutex/subversion/libsvn_ra/deprecated.c
subversion/branches/svn_mutex/subversion/libsvn_ra/ra_loader.c
subversion/branches/svn_mutex/subversion/libsvn_ra/ra_loader.h
subversion/branches/svn_mutex/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/commit.c
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/fetch.c
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/log.c
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/mergeinfo.c
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/options.c
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/props.c
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/session.c
subversion/branches/svn_mutex/subversion/libsvn_ra_neon/util.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/blame.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/commit.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/locks.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/log.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/merge.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/options.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/replay.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/serf.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/update.c
subversion/branches/svn_mutex/subversion/libsvn_ra_serf/util.c
subversion/branches/svn_mutex/subversion/libsvn_ra_svn/client.c
subversion/branches/svn_mutex/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/svn_mutex/subversion/libsvn_ra_svn/editorp.c
subversion/branches/svn_mutex/subversion/libsvn_ra_svn/marshal.c
subversion/branches/svn_mutex/subversion/libsvn_ra_svn/protocol
subversion/branches/svn_mutex/subversion/libsvn_repos/authz.c
subversion/branches/svn_mutex/subversion/libsvn_repos/commit.c
subversion/branches/svn_mutex/subversion/libsvn_repos/dump.c
subversion/branches/svn_mutex/subversion/libsvn_repos/fs-wrap.c
subversion/branches/svn_mutex/subversion/libsvn_repos/hooks.c
subversion/branches/svn_mutex/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/svn_mutex/subversion/libsvn_repos/log.c
subversion/branches/svn_mutex/subversion/libsvn_repos/replay.c
subversion/branches/svn_mutex/subversion/libsvn_repos/reporter.c
subversion/branches/svn_mutex/subversion/libsvn_repos/repos.c
subversion/branches/svn_mutex/subversion/libsvn_repos/rev_hunt.c
subversion/branches/svn_mutex/subversion/libsvn_subr/adler32.c (props changed)
subversion/branches/svn_mutex/subversion/libsvn_subr/auth.c
subversion/branches/svn_mutex/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/svn_mutex/subversion/libsvn_subr/cmdline.c
subversion/branches/svn_mutex/subversion/libsvn_subr/config_file.c
subversion/branches/svn_mutex/subversion/libsvn_subr/deprecated.c
subversion/branches/svn_mutex/subversion/libsvn_subr/dirent_uri.c
subversion/branches/svn_mutex/subversion/libsvn_subr/dso.c
subversion/branches/svn_mutex/subversion/libsvn_subr/error.c
subversion/branches/svn_mutex/subversion/libsvn_subr/hash.c (contents, props changed)
subversion/branches/svn_mutex/subversion/libsvn_subr/io.c
subversion/branches/svn_mutex/subversion/libsvn_subr/iter.c
subversion/branches/svn_mutex/subversion/libsvn_subr/magic.c
subversion/branches/svn_mutex/subversion/libsvn_subr/mergeinfo.c
subversion/branches/svn_mutex/subversion/libsvn_subr/properties.c
subversion/branches/svn_mutex/subversion/libsvn_subr/simple_providers.c
subversion/branches/svn_mutex/subversion/libsvn_subr/sorts.c
subversion/branches/svn_mutex/subversion/libsvn_subr/sqlite.c
subversion/branches/svn_mutex/subversion/libsvn_subr/subst.c
subversion/branches/svn_mutex/subversion/libsvn_subr/svn_base64.c
subversion/branches/svn_mutex/subversion/libsvn_subr/svn_cache_config.c
subversion/branches/svn_mutex/subversion/libsvn_subr/svn_string.c
subversion/branches/svn_mutex/subversion/libsvn_subr/svn_temp_serializer.c (props changed)
subversion/branches/svn_mutex/subversion/libsvn_subr/target.c
subversion/branches/svn_mutex/subversion/libsvn_subr/utf.c
subversion/branches/svn_mutex/subversion/libsvn_subr/validate.c
subversion/branches/svn_mutex/subversion/libsvn_wc/adm_crawler.c
subversion/branches/svn_mutex/subversion/libsvn_wc/adm_files.c
subversion/branches/svn_mutex/subversion/libsvn_wc/adm_ops.c
subversion/branches/svn_mutex/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/branches/svn_mutex/subversion/libsvn_wc/cleanup.c
subversion/branches/svn_mutex/subversion/libsvn_wc/conflicts.c
subversion/branches/svn_mutex/subversion/libsvn_wc/conflicts.h
subversion/branches/svn_mutex/subversion/libsvn_wc/copy.c
subversion/branches/svn_mutex/subversion/libsvn_wc/crop.c
subversion/branches/svn_mutex/subversion/libsvn_wc/deprecated.c
subversion/branches/svn_mutex/subversion/libsvn_wc/diff_editor.c
subversion/branches/svn_mutex/subversion/libsvn_wc/diff_local.c
subversion/branches/svn_mutex/subversion/libsvn_wc/entries.c
subversion/branches/svn_mutex/subversion/libsvn_wc/externals.c
subversion/branches/svn_mutex/subversion/libsvn_wc/info.c
subversion/branches/svn_mutex/subversion/libsvn_wc/lock.c
subversion/branches/svn_mutex/subversion/libsvn_wc/merge.c
subversion/branches/svn_mutex/subversion/libsvn_wc/node.c
subversion/branches/svn_mutex/subversion/libsvn_wc/props.c
subversion/branches/svn_mutex/subversion/libsvn_wc/props.h
subversion/branches/svn_mutex/subversion/libsvn_wc/questions.c
subversion/branches/svn_mutex/subversion/libsvn_wc/relocate.c
subversion/branches/svn_mutex/subversion/libsvn_wc/status.c
subversion/branches/svn_mutex/subversion/libsvn_wc/translate.c
subversion/branches/svn_mutex/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/svn_mutex/subversion/libsvn_wc/update_editor.c
subversion/branches/svn_mutex/subversion/libsvn_wc/upgrade.c
subversion/branches/svn_mutex/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/svn_mutex/subversion/libsvn_wc/wc-queries.sql
subversion/branches/svn_mutex/subversion/libsvn_wc/wc.h
subversion/branches/svn_mutex/subversion/libsvn_wc/wc_db.c
subversion/branches/svn_mutex/subversion/libsvn_wc/wc_db.h
subversion/branches/svn_mutex/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/svn_mutex/subversion/libsvn_wc/workqueue.c
subversion/branches/svn_mutex/subversion/libsvn_wc/workqueue.h
subversion/branches/svn_mutex/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/svn_mutex/subversion/mod_dav_svn/dav_svn.h
subversion/branches/svn_mutex/subversion/mod_dav_svn/liveprops.c
subversion/branches/svn_mutex/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/svn_mutex/subversion/mod_dav_svn/reports/mergeinfo.c
subversion/branches/svn_mutex/subversion/mod_dav_svn/reports/update.c
subversion/branches/svn_mutex/subversion/mod_dav_svn/repos.c
subversion/branches/svn_mutex/subversion/mod_dav_svn/util.c
subversion/branches/svn_mutex/subversion/mod_dav_svn/version.c
subversion/branches/svn_mutex/subversion/po/de.po
subversion/branches/svn_mutex/subversion/po/fr.po
subversion/branches/svn_mutex/subversion/po/zh_CN.po
subversion/branches/svn_mutex/subversion/svn/changelist-cmd.c
subversion/branches/svn_mutex/subversion/svn/copy-cmd.c
subversion/branches/svn_mutex/subversion/svn/diff-cmd.c
subversion/branches/svn_mutex/subversion/svn/info-cmd.c
subversion/branches/svn_mutex/subversion/svn/log-cmd.c
subversion/branches/svn_mutex/subversion/svn/main.c
subversion/branches/svn_mutex/subversion/svn/notify.c
subversion/branches/svn_mutex/subversion/svn/propedit-cmd.c
subversion/branches/svn_mutex/subversion/svn/proplist-cmd.c
subversion/branches/svn_mutex/subversion/svn/resolve-cmd.c
subversion/branches/svn_mutex/subversion/svn/schema/diff.rnc
subversion/branches/svn_mutex/subversion/svn/schema/info.rnc
subversion/branches/svn_mutex/subversion/svn/schema/status.rnc
subversion/branches/svn_mutex/subversion/svn/status.c
subversion/branches/svn_mutex/subversion/svn/tree-conflicts.c
subversion/branches/svn_mutex/subversion/svnadmin/main.c
subversion/branches/svn_mutex/subversion/svndumpfilter/main.c
subversion/branches/svn_mutex/subversion/svnrdump/dump_editor.c
subversion/branches/svn_mutex/subversion/svnrdump/svnrdump.c
subversion/branches/svn_mutex/subversion/svnserve/serve.c
subversion/branches/svn_mutex/subversion/svnsync/main.c
subversion/branches/svn_mutex/subversion/svnversion/main.c
subversion/branches/svn_mutex/subversion/tests/cmdline/authz_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/basic_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/changelist_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/copy_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/depth_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/diff_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/externals_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/svn_mutex/subversion/tests/cmdline/import_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/info_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/input_validation_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/lock_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/log_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/merge_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/patch_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/prop_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/resolve_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/revert_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/special_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/stat_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svntest/actions.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svntest/factory.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svntest/main.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svntest/wc.py
subversion/branches/svn_mutex/subversion/tests/cmdline/svnversion_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/switch_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/update_tests.py
subversion/branches/svn_mutex/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/svn_mutex/subversion/tests/libsvn_client/client-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_delta/ (props changed)
subversion/branches/svn_mutex/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_subr/ (props changed)
subversion/branches/svn_mutex/subversion/tests/libsvn_subr/auth-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
subversion/branches/svn_mutex/subversion/tests/libsvn_wc/db-test.c
subversion/branches/svn_mutex/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/svn_mutex/subversion/tests/svn_test.h
subversion/branches/svn_mutex/subversion/tests/svn_test_fs.c
subversion/branches/svn_mutex/subversion/tests/svn_test_fs.h
subversion/branches/svn_mutex/subversion/tests/svn_test_main.c
subversion/branches/svn_mutex/tools/client-side/bash_completion
subversion/branches/svn_mutex/tools/client-side/bash_completion_test
subversion/branches/svn_mutex/tools/client-side/svn-viewspec.py
subversion/branches/svn_mutex/tools/client-side/svnmucc/svnmucc.c
subversion/branches/svn_mutex/tools/dev/benchmarks/suite1/benchmark.py
subversion/branches/svn_mutex/tools/dev/benchmarks/suite1/cronjob
subversion/branches/svn_mutex/tools/dev/benchmarks/suite1/run
subversion/branches/svn_mutex/tools/dev/unix-build/Makefile.svn
subversion/branches/svn_mutex/tools/dev/wc-format.py
subversion/branches/svn_mutex/tools/dev/which-error.py
subversion/branches/svn_mutex/tools/dev/windows-build/README
subversion/branches/svn_mutex/tools/dev/windows-build/document-version.pl (contents, props changed)
subversion/branches/svn_mutex/tools/dist/backport.pl (contents, props changed)
subversion/branches/svn_mutex/tools/dist/collect_sigs.py
subversion/branches/svn_mutex/tools/dist/dist.sh
subversion/branches/svn_mutex/tools/dist/nightly.sh
subversion/branches/svn_mutex/tools/dist/rat-excludes
subversion/branches/svn_mutex/tools/dist/release.py
subversion/branches/svn_mutex/tools/dist/templates/nightly-candidates.ezt
subversion/branches/svn_mutex/tools/dist/templates/rc-candidates.ezt
subversion/branches/svn_mutex/tools/dist/templates/rc-news.ezt
subversion/branches/svn_mutex/tools/dist/templates/stable-candidates.ezt
subversion/branches/svn_mutex/tools/dist/templates/stable-release-ann.ezt
subversion/branches/svn_mutex/tools/examples/get-location-segments.py
subversion/branches/svn_mutex/tools/hook-scripts/svnperms.py
subversion/branches/svn_mutex/tools/server-side/svn-populate-node-origins-index.c
subversion/branches/svn_mutex/tools/server-side/svn-rep-sharing-stats.c
subversion/branches/svn_mutex/win-tests.py
Propchange: subversion/branches/svn_mutex/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 11 19:52:34 2011
@@ -18,7 +18,7 @@ autogen-standalone.mk
autom4te.cache
gen-make.opts
tests.log*
-fails.log
+fails.log*
db4-win32
db
*.o
Propchange: subversion/branches/svn_mutex/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 11 19:52:34 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.7.x-fs-verify:1146708,1161180
/subversion/branches/atomic-revprop:965046-1000689
/subversion/branches/bdb-reverse-deltas:872050-872529
/subversion/branches/diff-callbacks3:870059-870761
@@ -11,6 +12,7 @@
/subversion/branches/fs-rep-sharing:869036-873803
/subversion/branches/fsfs-pack:873717-874575
/subversion/branches/gnome-keyring:870558-871410
+/subversion/branches/gpg-agent-password-store:1005036-1150766
/subversion/branches/http-protocol-v2:874395-876041
/subversion/branches/in-memory-cache:869829-871452
/subversion/branches/integrate-cache-item-serialization:1068724-1068739
@@ -30,7 +32,7 @@
/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
@@ -39,6 +41,7 @@
/subversion/branches/py-tests-as-modules:956579-1033052
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
/subversion/branches/svn-patch-improvements:918519-934609
@@ -52,4 +55,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1141684-1142212
+/subversion/trunk:1141684-1142212,1142216-1181870
Modified: subversion/branches/svn_mutex/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/CHANGES?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/CHANGES (original)
+++ subversion/branches/svn_mutex/CHANGES Tue Oct 11 19:52:34 2011
@@ -1,5 +1,16 @@
+Version 1.8.0
+(?? ??? 2011, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.0
+
+ User-visible changes:
+
+ Developer-visible changes:
+ - API changes:
+ * fix inconsistent handling of log revs without changed paths (issue #3694)
+
+
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
@@ -13,12 +24,11 @@ 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)
- * Property packing on FSFS backends (issue #3444)
- * 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)
- * make Serf the default DAV access method, if available (r875974)
* Improved and much more consistent path handling (issue #2028, and others)
* 'svnadmin load' rewrites changed revnums in mergeinfo (issue #3020)
* Error message and help text improvements
@@ -42,6 +52,8 @@ the 1.6 release: http://subversion.apac
* add configurable caching to svnadmin (r1078357)
* make server-side network data compression rate configurable (r1072288)
* added support for auto-detecting mime-types with libmagic (r1131120)
+ * 'svn rm url1 url2 url3' uses single txn per repo (issue #1199)
+ * don't leave unversioned files when reverting copies (issue #3101)
- Client-side bugfixes:
* 'svn cp A B; svn mv B C' is equivalent to 'svn cp A C' (issue #756)
@@ -49,7 +61,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)
@@ -80,6 +92,12 @@ the 1.6 release: http://subversion.apac
* can now commit multiple wc paths lacking a common parent (issue #2381)
* 'svn export --depth $WC' now works correctly (issue #3800)
* added support for case-only renames on Windows (issue #3702)
+ * 'svn delete --force' removes tree conflicts (issue #3805)
+ * don't throw an error when skipping tree conflicts in update (issue #3329)
+ * don't break commits of wc->wc copies with file externals (issue #3589)
+ * allow 'svn info' to work on symlinks to working copies (issue #2305)
+ * allow 'svn st --show-updates' to work across symlinks (issue #3117)
+ * 'svn revert' shouldn't loop on symlinks (issue #3972)
* fixed: wc-to-wc copy of a switch source (issue #1802)
* fixed: 'svn st' reports symlinks as obstructed items (issue #2284)
* fixed: 'cd e:\; svn up e:\' fails (issue #2556)
@@ -114,9 +132,16 @@ the 1.6 release: http://subversion.apac
* fixed: executable flag of binary file lost during merge (issue #3686)
* fixed: merging a symlink-turned-regular-file breaks the wc (issue #2530)
* fixed: can't remove file externals (issue #3351)
- * fixed: 'svn unlock' attempts to unlock wrong token on DAV (issue #3794)
+ * fixed: 'svn unlock' attempts to unlock wrong token on DAV (issue #3794)
* fixed: forced DAV 'svn unlock' results in 403, not warning (issue #3801)
* fixed: rm -> ci -> cp = missing directory (issue #2763)
+ * fixed: 'svn info' returns parent info on missing dirs (issue #3178)
+ * fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919)
+ * fixed: 'svn --version' fails with non-existant $HOME (issue #3947)
+ * fixed: unforced export silently overwites existing file (issue #3799)
+ * fixed: reverse merge which adds subtree mergeinfo fails (issue #3978)
+ * fixed: 'svn up -r{R>HEAD}' hangs client over ra_svn (issue #3963)
+ * fixed: 'svn up' updates file externals in target siblings (issue #3819)
* many other minor bugfixes, optimizations, plugs of memory leaks, etc
- Server-side bugfixes:
@@ -124,7 +149,7 @@ the 1.6 release: http://subversion.apac
* allow SVNListParentPath to be used with authz (issue #2753)
* allow nav to repo list from repo top with SVNListParentPath (issue #3159)
* allow repositories in the root of a drive on windows (issue #3535)
- * don't destroy mergeinnfo with 'svnadmin load --parent-dir' (issue #3547)
+ * don't destroy mergeinfo with 'svnadmin load --parent-dir' (issue #3547)
* fixed: 'svnadmin hotcopy' does not duplicate symlinks (issue #2591)
* fixed: post-revprop-change errors cancel commit (issue #2990)
* fixed: mod_dav_svn runs pre-revprop-change hook twice (issue #3085)
@@ -132,9 +157,13 @@ the 1.6 release: http://subversion.apac
* fixed: hotcopy may corrupt target rep-cache.db (issue #3596)
* fixed: mod_dav_svn can cause spurious merge conflicts (issue #3657)
* fixed: DAV can overwrite directories during copy (issue #3314)
+ * fixed: 'svn log' returns log of unrelated path (issue #3931)
* 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)
+ * 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:
@@ -153,6 +182,7 @@ the 1.6 release: http://subversion.apac
* support running tests against older servers (r876016)
* notification of unversioned obstructions (r877344)
* removed virtually all abort() calls (issue #2780)
+ * don't include client-specific suggestions in error msgs (issue #3887)
- API changes:
* don't crash svn_client_copy if ctx->log_msg_func is NULL (issue #3234)
@@ -163,6 +193,9 @@ the 1.6 release: http://subversion.apac
* notifications sent when mergeinfo changes (r877588)
* 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 (also for deletes) (issue #2630)
+ * improve conflict resolver API for a specific direction (issue #3049)
- Bindings:
* New JavaHL package: org.apache.subversion
Modified: subversion/branches/svn_mutex/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/INSTALL?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/INSTALL (original)
+++ subversion/branches/svn_mutex/INSTALL Tue Oct 11 19:52:34 2011
@@ -96,9 +96,9 @@ I. INTRODUCTION
These diff streams are used everywhere -- over the network,
in the repository, and in the client's working copy.
- * libserf (OPTIONAL for client)
+ * libserf or libneon (OPTIONAL for client)
- The Serf libraries both allow the Subversion 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,
@@ -106,14 +106,19 @@ I. INTRODUCTION
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.
+ protocols. Your client can be compiled against either
+ libserf or libneon (or both), as they offer competing
+ implementations.
* OpenSSL (OPTIONAL for client and server)
OpenSSL enables your client to access SSL-encrypted https://
- 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.
+ 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.
* Berkeley DB (OPTIONAL for client and server)
@@ -190,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.
****************************************************************
@@ -228,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 |
@@ -237,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
@@ -311,31 +313,43 @@ I. INTRODUCTION
newer. The autogen.sh script knows about that.
- 5. An HTTP client library: serf. (OPTIONAL)
+ 5. An HTTP client library: serf or neon. (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
- serf. Though optional, we strongly recommend this.
-
- Serf is at http://code.google.com/p/serf/, and the 0.3.0
- release is at:
- http://serf.googlecode.com/files/serf-0.3.0.tar.bz2
-
- serf is a library for HTTP and WebDAV which is used to access
- Subversion repositories over http:// and https:// URLs. serf
- is designed as an asynchronous library which can take
- advantage of multiple connections and HTTP pipelining.
-
- 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
+ at least one of these libraries. Though optional, we strongly
+ recommend this.
- --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.
+ (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 0.7.1 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
+
+ --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".
6. OpenSSL (OPTIONAL)
@@ -344,46 +358,51 @@ I. INTRODUCTION
### finding OpenSSL, but we may need more docco here. and w.r.t
### zlib.
- The Serf library has support for SSL encryption by relying on
- the OpenSSL library.
+ The Serf and Neon libraries have 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, if you are building neon as part of the
- Subversion build process (as described in section I.4 above),
- you can pass flags to Subversion's "./configure", and they will
- be passed on to neon's "./configure". 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"
- 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. The zlib library is included in the Subversion
- dependencies package, but if you are compiling Neon from a
- different source you can also specify a path to the library
- using "--with-libs". Consult the Neon documentation for more
- information on how to use these parameters and versions of
- libraries you need.
-
- Under Windows, you can specify the paths to these libraries by
- passing the options --with-zlib and --with-openssl to gen-make.py.
-
- You can also add support for these features to an Apache httpd server
- to be used for Subversion using the same support libraries. The
- Subversion build system will not provide them, however. You add them
- by specifying parameters to the "./configure" script of the Apache
- Server instead.
-
- For getting SSL on your server, you would add the "--enable-ssl"
- or "--with-ssl=/path/to/lib" option to Apache's "./configure"
- script. Apache enables zlib support by default, but you can
- specify a nonstandard location for the library with the
- "--with-z=/path/to/dir" option. Consult the Apache documentation
- for more details, and for other modules you may wish to install
- to enhance your Subversion server.
+ 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
+ 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"
+ 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.
+
+ Under Windows, you can specify the paths to these libraries by
+ passing the options --with-zlib and --with-openssl to gen-make.py.
+
+ ### Is that right? In-tree build of Neon was disabled in r875974.
+ This may now apply to Serf, or else gen-make.py should be
+ updated to remove such options.
+
+ c. Using OpenSSL on the Apache server
+
+ You can also add support for these features to an Apache httpd
+ server to be used for Subversion using the same support libraries.
+ The Subversion build system will not provide them, however. You
+ add them by specifying parameters to the "./configure" script of
+ the Apache Server instead.
+
+ For getting SSL on your server, you would add the "--enable-ssl"
+ or "--with-ssl=/path/to/lib" option to Apache's "./configure"
+ script. Apache enables zlib support by default, but you can
+ specify a nonstandard location for the library with the
+ "--with-z=/path/to/dir" option. Consult the Apache documentation
+ for more details, and for other modules you may wish to install
+ to enhance your Subversion server.
If you don't already have it, you can get a copy of OpenSSL,
including instructions for building and packaging on both Unix
@@ -439,7 +458,7 @@ I. INTRODUCTION
If the Simple Authentication and Security Layer (SASL) library
is detected on your system, then the Subversion client and
- svnserve server can utilize its abilities for various form of
+ svnserve server can utilize its abilities for various forms of
authentication. To learn more about SASL or to get the source
code, visit:
@@ -483,7 +502,7 @@ I. INTRODUCTION
with the C compiler. If you're using MSVC 6, and don't have MASM 6,
a free MASM-compatible assembler is available here:
- http://www.masm32.org/
+ http://www.masm32.com/
You only need ML.EXE and ML.ERR from this distribution.
@@ -715,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
@@ -736,7 +755,7 @@ II. INSTALLATION
$ svn co https://svn.apache.org/repos/asf/subversion/trunk svn
$ cd svn
- $ # get neon/apr as required
+ $ # get any dependencies to be built in-tree, if required
$ chmod +x autogen.sh
$ ./autogen.sh
$ mkdir ../obj
Modified: subversion/branches/svn_mutex/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/Makefile.in?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/Makefile.in (original)
+++ subversion/branches/svn_mutex/Makefile.in Tue Oct 11 19:52:34 2011
@@ -47,6 +47,7 @@ SVN_APR_LIBS = @SVN_APR_LIBS@
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
SVN_APR_MEMCACHE_LIBS = @SVN_APR_MEMCACHE_LIBS@
SVN_DB_LIBS = @SVN_DB_LIBS@
+SVN_GPG_AGENT_LIBS = @SVN_GPG_AGENT_LIBS@
SVN_GNOME_KEYRING_LIBS = @SVN_GNOME_KEYRING_LIBS@
SVN_GSSAPI_LIBS = @SVN_GSSAPI_LIBS@
SVN_KWALLET_LIBS = @SVN_KWALLET_LIBS@
@@ -66,6 +67,7 @@ fsmod_libdir = @libdir@
ramod_libdir = @libdir@
bdb_libdir = @libdir@
gnome_keyring_libdir = @libdir@
+gpg_agent_libdir = @libdir@
gssapi_libdir = @libdir@
kwallet_libdir = @libdir@
neon_libdir = @libdir@
@@ -152,21 +154,10 @@ CTYPES_PYTHON_SRC_DIR = $(abs_srcdir)/su
JAVAHL_JAR=subversion/bindings/javahl/svn-javahl.jar
JAVAHL_INCLUDES= @JNI_INCLUDES@ -I$(abs_builddir)/subversion/bindings/javahl/include
-SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
-SVN_APR_PREFIX = @SVN_APR_PREFIX@
SVN_APR_CONFIG = @SVN_APR_CONFIG@
-SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@
-SVN_APRUTIL_PREFIX = @SVN_APRUTIL_PREFIX@
+SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
SVN_APRUTIL_CONFIG = @SVN_APRUTIL_CONFIG@
-
-SVN_APR_MEMCACHE_PREFIX = @SVN_APR_MEMCACHE_PREFIX@
-SVN_APR_MEMCACHE_INCLUDES = @SVN_APR_MEMCACHE_INCLUDES@
-
-SVN_SERF_INCLUDES = @SVN_SERF_INCLUDES@
-SVN_SERF_PREFIX = @SVN_SERF_PREFIX@
-
-SVN_ZLIB_PREFIX = @SVN_ZLIB_PREFIX@
-SVN_ZLIB_INCLUDES = @SVN_ZLIB_INCLUDES@
+SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@
MKDIR = @MKDIR@
@@ -246,6 +237,7 @@ INSTALL_FSMOD_LIB = $(INSTALL_LIB)
INSTALL_RAMOD_LIB = $(INSTALL_LIB)
INSTALL_APR_MEMCACHE_LIB = $(INSTALL_LIB)
INSTALL_BDB_LIB = $(INSTALL_LIB)
+INSTALL_GPG_AGENT_LIB = $(INSTALL_LIB)
INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
INSTALL_GSSAPI_LIB = $(INSTALL_LIB)
INSTALL_KWALLET_LIB = $(INSTALL_LIB)
@@ -396,13 +388,15 @@ local-extraclean: local-distclean extrac
$(top_srcdir)/subversion/svn_private_config.h.in \
$(top_srcdir)/configure \
$(top_srcdir)/gen-make.opts \
- $(top_srcdir)/build/transform_libtool_scripts.sh \
+ $(top_srcdir)/build/config.guess \
+ $(top_srcdir)/build/config.sub \
$(top_srcdir)/build/libtool.m4 \
$(top_srcdir)/build/ltoptions.m4 \
$(top_srcdir)/build/ltsugar.m4 \
$(top_srcdir)/build/ltversion.m4 \
$(top_srcdir)/build/lt~obsolete.m4 \
$(top_srcdir)/build/ltmain.sh \
+ $(top_srcdir)/build/transform_libtool_scripts.sh \
$(EXTRACLEAN_FILES)
@@ -446,7 +440,7 @@ check-javahl: javahl javahl-compat
# "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@
+check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@if test "$(PYTHON)" != "none"; then \
flags="--verbose"; \
if test "$(CLEANUP)" != ""; then \
@@ -495,38 +489,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
+davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
@$(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
+davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
@APXS=$(APXS) bash $(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@
+svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@$(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@
+svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@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@
+svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@$(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@
+svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@$(MAKE) check \
BASE_URL=svn+ssh://localhost`pwd`/subversion/tests/cmdline
-bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@
+bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
@$(MAKE) check FS_TYPE=bdb
check-clean:
@@ -539,6 +533,11 @@ check-clean:
subversion/tests/libsvn_subr/z \
subversion/tests/libsvn_wc/fake-wc \
subversion/tests/libsvn_client/test-patch* \
+ subversion/tests/libsvn_client/test-*/ \
+ subversion/tests/libsvn_diff/B2 \
+ subversion/tests/libsvn_diff/T1 \
+ subversion/tests/libsvn_diff/T2 \
+ subversion/tests/libsvn_diff/T3 \
subversion/tests/svnserveautocheck.pid \
tests.log fails.log
Modified: subversion/branches/svn_mutex/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/autogen.sh?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/autogen.sh (original)
+++ subversion/branches/svn_mutex/autogen.sh Tue Oct 11 19:52:34 2011
@@ -53,6 +53,69 @@ done
# ### sees an empty arg rather than missing one.
./build/buildcheck.sh "$RELEASE_MODE" || exit 1
+# Handle some libtool helper files
+#
+# ### eventually, we can/should toss this in favor of simply using
+# ### APR's libtool. deferring to a second round of change...
+#
+
+libtoolize="`./build/PrintPath glibtoolize libtoolize libtoolize15`"
+lt_major_version=`$libtoolize --version 2>/dev/null | sed -e 's/^[^0-9]*//' -e 's/\..*//' -e '/^$/d' -e 1q`
+
+if [ "x$libtoolize" = "x" ]; then
+ echo "libtoolize not found in path"
+ exit 1
+fi
+
+rm -f build/config.guess build/config.sub
+$libtoolize --copy --automake --force
+
+ltpath="`dirname $libtoolize`"
+ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+
+if [ ! -f $ltfile ]; then
+ echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+ exit 1
+fi
+
+echo "Copying libtool helper: $ltfile"
+# An ancient helper might already be present from previous builds,
+# and it might be write-protected (e.g. mode 444, seen on FreeBSD).
+# This would cause cp to fail and print an error message, but leave
+# behind a potentially outdated libtool helper. So, remove before
+# copying:
+rm -f build/libtool.m4
+cp $ltfile build/libtool.m4
+
+for file in ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4; do
+ rm -f build/$file
+
+ if [ $lt_major_version -ge 2 ]; then
+ ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/$file}
+
+ if [ ! -f $ltfile ]; then
+ echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+ exit 1
+ fi
+
+ echo "Copying libtool helper: $ltfile"
+ cp $ltfile build/$file
+ fi
+done
+
+if [ $lt_major_version -ge 2 ]; then
+ for file in config.guess config.sub; do
+ configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ; pwd`/$file}
+
+ if [ ! -f $configfile ]; then
+ echo "$configfile not found (try setting the LIBTOOL_CONFIG environment variable)"
+ exit 1
+ fi
+
+ cp $configfile build/$file
+ done
+fi
+
# Create the file detailing all of the build outputs for SVN.
#
# Note: this dependency on Python is fine: only SVN developers use autogen.sh
Propchange: subversion/branches/svn_mutex/build/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 11 19:52:34 2011
@@ -6,4 +6,6 @@ ltversion.m4
lt~obsolete.m4
ltmain.sh
pkg.m4
+config.guess
+config.sub
transform_libtool_scripts.sh
Modified: subversion/branches/svn_mutex/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build.conf?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build.conf (original)
+++ subversion/branches/svn_mutex/build.conf Tue Oct 11 19:52:34 2011
@@ -41,7 +41,6 @@ private-includes =
private-built-includes =
subversion/svn_private_config.h
subversion/libsvn_fs_fs/rep-cache-db.h
- subversion/libsvn_fs_fs/revprops-db.h
subversion/libsvn_wc/wc-metadata.h
subversion/libsvn_wc/wc-queries.h
subversion/libsvn_wc/wc-checks.h
@@ -181,7 +180,7 @@ description = Subversion GNOME Keyring L
type = lib
install = gnome-keyring-lib
path = subversion/libsvn_auth_gnome_keyring
-libs = apr gnome-keyring libsvn_subr
+libs = libsvn_subr apr gnome-keyring
# Support for KWallet
[libsvn_auth_kwallet]
@@ -189,7 +188,7 @@ description = Subversion KWallet Library
type = lib
install = kwallet-lib
path = subversion/libsvn_auth_kwallet
-libs = apr kwallet libsvn_subr
+libs = libsvn_subr apr kwallet
link-cmd = $(LINK_CXX_LIB)
# Library needed by all subversion clients
@@ -325,13 +324,14 @@ msvc-export =
svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h
svn_utf.h svn_version.h svn_xml.h
private\svn_atomic.h private\svn_cache.h private\svn_cmdline_private.h
- private\svn_debug.h private\svn_fspath.h
+ private\svn_debug.h private\svn_error_private.h private\svn_fspath.h
private\svn_log.h private\svn_mergeinfo_private.h
private\svn_opt_private.h private\svn_skel.h private\svn_sqlite.h
private\svn_utf_private.h private\svn_eol_private.h
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
# Working copy management lib
[libsvn_wc]
@@ -373,12 +373,6 @@ type = sql-header
path = subversion/libsvn_fs_fs
sources = rep-cache-db.sql
-[revprops]
-description = Schema for revprop packing
-type = sql-header
-path = subversion/libsvn_fs_fs
-sources = revprops-db.sql
-
[wc_queries]
desription = Queries on the WC database
type = sql-header
@@ -805,6 +799,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
@@ -872,6 +874,14 @@ sources = random-test.c
install = test
libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
+[editor-test]
+description = Test the editor v2 interface
+type = exe
+path = subversion/tests/libsvn_delta
+sources = editor-test.c
+install = test
+libs = libsvn_repos libsvn_fs libsvn_test libsvn_delta libsvn_subr apriconv apr
+
[window-test]
description = Test delta window generation
type = exe
@@ -1114,7 +1124,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 editor-test spillbuf-test
revision-test
subst_translate-test
translate-test
Modified: subversion/branches/svn_mutex/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/ac-macros/apache.m4?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/ac-macros/apache.m4 (original)
+++ subversion/branches/svn_mutex/build/ac-macros/apache.m4 Tue Oct 11 19:52:34 2011
@@ -146,7 +146,7 @@ if test -n "$APXS" && test "$APXS" != "n
APACHE_LDFLAGS="-shrext .so"
;;
esac
-else
+elif test x"$APXS" != x"no"; then
echo "=================================================================="
echo "WARNING: skipping the build of mod_dav_svn"
echo " try using --with-apxs"
Modified: subversion/branches/svn_mutex/build/ac-macros/apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/ac-macros/apr.m4?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/ac-macros/apr.m4 (original)
+++ subversion/branches/svn_mutex/build/ac-macros/apr.m4 Tue Oct 11 19:52:34 2011
@@ -88,11 +88,6 @@ AC_DEFUN(SVN_LIB_APR,
AC_MSG_ERROR([apr-config --includes failed])
fi
- SVN_APR_PREFIX="`$apr_config --prefix`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apr-config --prefix failed])
- fi
-
if test "$enable_all_static" = "yes"; then
SVN_APR_LIBS="`$apr_config --link-ld --libs`"
if test $? -ne 0; then
@@ -111,7 +106,6 @@ AC_DEFUN(SVN_LIB_APR,
AC_MSG_ERROR([apr-config --shlib-path-var failed])
fi
- AC_SUBST(SVN_APR_PREFIX)
AC_SUBST(SVN_APR_CONFIG, ["$apr_config"])
AC_SUBST(SVN_APR_INCLUDES)
AC_SUBST(SVN_APR_LIBS)
Modified: subversion/branches/svn_mutex/build/ac-macros/apr_memcache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/ac-macros/apr_memcache.m4?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/ac-macros/apr_memcache.m4 (original)
+++ subversion/branches/svn_mutex/build/ac-macros/apr_memcache.m4 Tue Oct 11 19:52:34 2011
@@ -70,19 +70,16 @@ dnl Try just looking in apr-util (>= 1
if test $apr_memcache_found = "reconfig"; then
SVN_EXTERNAL_PROJECT([apr_memcache], [--with-apr=$apr_config --with-apr-util=$apu_config])
apr_memcache_prefix=$prefix
- SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix"
SVN_APR_MEMCACHE_INCLUDES="-I$srcdir/memcache"
SVN_APR_MEMCACHE_LIBS="$abs_builddir/memcache/libapr_memcache.la"
fi
if test $apr_memcache_found = "standalone"; then
- SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix"
SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0"
SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la"
svn_lib_apr_memcache=yes
elif test $apr_memcache_found = "aprutil"; then
dnl We are already linking apr-util everywhere, so no special treatement needed.
- SVN_APR_MEMCACHE_PREFIX=""
SVN_APR_MEMCACHE_INCLUDES=""
SVN_APR_MEMCACHE_LIBS=""
svn_lib_apr_memcache=yes
@@ -92,7 +89,6 @@ dnl We are already linking apr-util ever
svn_lib_apr_memcache=no
fi
- AC_SUBST(SVN_APR_MEMCACHE_PREFIX)
AC_SUBST(SVN_APR_MEMCACHE_INCLUDES)
AC_SUBST(SVN_APR_MEMCACHE_LIBS)
])
Modified: subversion/branches/svn_mutex/build/ac-macros/aprutil.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/ac-macros/aprutil.m4?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/ac-macros/aprutil.m4 (original)
+++ subversion/branches/svn_mutex/build/ac-macros/aprutil.m4 Tue Oct 11 19:52:34 2011
@@ -92,11 +92,6 @@ AC_DEFUN(SVN_LIB_APRUTIL,
AC_MSG_ERROR([apu-config --includes failed])
fi
- SVN_APRUTIL_PREFIX="`$apu_config --prefix`"
- if test $? -ne 0; then
- AC_MSG_ERROR([apu-config --prefix failed])
- fi
-
if test "$enable_all_static" = "yes"; then
SVN_APRUTIL_LIBS="`$apu_config --link-ld --libs`"
if test $? -ne 0; then
@@ -113,7 +108,6 @@ AC_DEFUN(SVN_LIB_APRUTIL,
AC_SUBST(SVN_APRUTIL_INCLUDES)
AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
AC_SUBST(SVN_APRUTIL_LIBS)
- AC_SUBST(SVN_APRUTIL_PREFIX)
dnl What version of Expat are we using? -----------------
SVN_HAVE_OLD_EXPAT="`$apu_config --old-expat`"
Modified: subversion/branches/svn_mutex/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/ac-macros/berkeley-db.m4?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/svn_mutex/build/ac-macros/berkeley-db.m4 Tue Oct 11 19:52:34 2011
@@ -36,7 +36,7 @@ dnl search is skipped.
AC_DEFUN(SVN_LIB_BERKELEY_DB,
[
db_version=$1.$2.$3
- dnl Process the `with-berkeley-db' switch. We set `status' to one
+ dnl Process the `with-berkeley-db' switch. We set `bdb_status' to one
dnl of the following values:
dnl `required' --- the user specified that they did want to use
dnl Berkeley DB, so abort the configuration if we cannot find it.
@@ -55,7 +55,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
used by APR-UTIL.])],
[
if test "$withval" = "no"; then
- status=skip
+ bdb_status=skip
elif test "$withval" = "yes"; then
apu_db_version="`$apu_config --db-version`"
if test $? -ne 0; then
@@ -70,7 +70,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
APR-UTIL with the appropiate options.])
fi
- status=required
+ bdb_status=required
elif test "$apu_found" != "reconfig"; then
if test "$apu_db_version" -lt 4; then
@@ -78,7 +78,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
possible to use the specified Berkeley DB: $withval])
fi
- status=required
+ bdb_status=required
fi
else
if echo "$withval" | $EGREP ":.*:.*:" > /dev/null; then
@@ -97,7 +97,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
done
SVN_DB_LIBS="${SVN_DB_LIBS## }"
- status=required
+ bdb_status=required
else
AC_MSG_ERROR([Invalid syntax of argument of --with-berkeley-db option])
fi
@@ -114,15 +114,15 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
AC_MSG_WARN([Detected older version of APR-UTIL, trying to determine
whether apr-util is linked against Berkeley DB
$db_version])
- status=try-link
+ bdb_status=try-link
elif test "$apu_db_version" -lt "4"; then
- status=skip
+ bdb_status=skip
else
- status=try-link
+ bdb_status=try-link
fi
])
- if test "$status" = "skip"; then
+ if test "$bdb_status" = "skip"; then
svn_lib_berkeley_db=no
else
AC_MSG_CHECKING([for availability of Berkeley DB])
@@ -133,7 +133,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
else
AC_MSG_RESULT([no])
svn_lib_berkeley_db=no
- if test "$status" = "required"; then
+ if test "$bdb_status" = "required"; then
AC_MSG_ERROR([Berkeley DB $db_version or newer wasn't found.])
fi
fi
@@ -180,7 +180,9 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
# Or that it resides in a non-standard location which we would have
# to compensate with using something like -R`$apu_config --prefix`/lib.
#
- SVN_DB_LIBS=["${SVN_DB_LIBS-`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}"]
+ if test -z "$SVN_DB_LIBS"; then
+ SVN_DB_LIBS=["`$apu_config --libs | $SED -e 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`"]
+ fi
CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS"
LIBS="`$apu_config --ldflags` $SVN_DB_LIBS $LIBS"
Modified: subversion/branches/svn_mutex/build/ac-macros/neon.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/ac-macros/neon.m4?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/ac-macros/neon.m4 (original)
+++ subversion/branches/svn_mutex/build/ac-macros/neon.m4 Tue Oct 11 19:52:34 2011
@@ -121,7 +121,8 @@ int main()
if test "$shared_linking" = "no"; then
NEON_LIBS=`$PKG_CONFIG neon --libs --static`
LIBS="$LIBS $NEON_LIBS"
- AC_LINK_IFELSE([AC_LANG_SOURCE([[$neon_test_code]])], , AC_MSG_ERROR([cannot find Neon]))
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[$neon_test_code]])], ,
+ AC_MSG_ERROR([cannot find a usable Neon library]))
fi
CFLAGS="$old_CFLAGS"
LIBS="$old_LIBS"
Modified: subversion/branches/svn_mutex/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/ac-macros/serf.m4?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/ac-macros/serf.m4 (original)
+++ subversion/branches/svn_mutex/build/ac-macros/serf.m4 Tue Oct 11 19:52:34 2011
@@ -39,7 +39,7 @@ AC_DEFUN(SVN_LIB_SERF,
elif test "$withval" != "no" ; then
AC_MSG_NOTICE([serf library configuration])
serf_prefix=$withval
- for serf_major in serf-1 serf-0; do
+ for serf_major in serf-2 serf-1 serf-0; do
if ! test -d $serf_prefix/include/$serf_major; then continue; fi
save_cppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/$serf_major"
@@ -73,13 +73,11 @@ AC_DEFUN(SVN_LIB_SERF,
SVN_EXTERNAL_PROJECT([serf], [--with-apr=$apr_config --with-apr-util=$apu_config])
serf_major=serf-`$srcdir/serf/build/get-version.sh major $srcdir/serf/serf.h SERF`
serf_prefix=$prefix
- SVN_SERF_PREFIX="$serf_prefix"
SVN_SERF_INCLUDES="-I$srcdir/serf"
SVN_SERF_LIBS="$abs_builddir/serf/lib$serf_major.la"
fi
if test $serf_found = "yes"; then
- SVN_SERF_PREFIX="$serf_prefix"
SVN_SERF_INCLUDES="-I$serf_prefix/include/$serf_major"
if test -e "$serf_prefix/lib/lib$serf_major.la"; then
SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
@@ -93,7 +91,6 @@ AC_DEFUN(SVN_LIB_SERF,
svn_lib_serf=$serf_found
- AC_SUBST(SVN_SERF_PREFIX)
AC_SUBST(SVN_SERF_INCLUDES)
AC_SUBST(SVN_SERF_LIBS)
])
Modified: subversion/branches/svn_mutex/build/ac-macros/zlib.m4
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/ac-macros/zlib.m4?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/ac-macros/zlib.m4 (original)
+++ subversion/branches/svn_mutex/build/ac-macros/zlib.m4 Tue Oct 11 19:52:34 2011
@@ -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"
])
@@ -57,14 +61,12 @@ AC_DEFUN(SVN_LIB_Z,
fi
if test "$zlib_found" = "yes"; then
- SVN_ZLIB_PREFIX="$zlib_prefix"
SVN_ZLIB_INCLUDES="-I$zlib_prefix/include"
LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$zlib_prefix/lib)`"
fi
SVN_ZLIB_LIBS="-lz"
- AC_SUBST(SVN_ZLIB_PREFIX)
AC_SUBST(SVN_ZLIB_INCLUDES)
AC_SUBST(SVN_ZLIB_LIBS)
])
Modified: subversion/branches/svn_mutex/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/buildcheck.sh?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/buildcheck.sh (original)
+++ subversion/branches/svn_mutex/build/buildcheck.sh Tue Oct 11 19:52:34 2011
@@ -76,6 +76,61 @@ fi
echo "buildcheck: autoheader version $ah_version (ok)"
#--------------------------------------------------------------------------
+# libtool 1.4 or newer
+#
+LIBTOOL_WANTED_MAJOR=1
+LIBTOOL_WANTED_MINOR=4
+LIBTOOL_WANTED_PATCH=
+LIBTOOL_WANTED_VERSION=1.4
+
+# The minimum version for source releases is 1.4.3,
+# because it's required by (at least) Solaris.
+if test "$VERSION_CHECK" = "--release"; then
+ LIBTOOL_WANTED_PATCH=3
+ LIBTOOL_WANTED_VERSION=1.4.3
+else
+ case `uname -sr` in
+ SunOS\ 5.*)
+ LIBTOOL_WANTED_PATCH=3
+ LIBTOOL_WANTED_VERSION=1.4.3
+ ;;
+ esac
+fi
+
+libtool=${LIBTOOL:-`./build/PrintPath glibtool libtool libtool15`}
+# Extract the libtool version number: everything from the first number in
+# the version text until a hyphen or space.
+lt_pversion=`$libtool --version 2>/dev/null |
+ sed -e 's/^[^0-9]*//' -e 's/[- ].*//' -e '/^$/d' |
+ sed -e 1q`
+if test -z "$lt_pversion"; then
+ echo "buildcheck: libtool not found."
+ echo " You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
+ exit 1
+fi
+lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+IFS=.; set $lt_version; IFS=' '
+lt_status="good"
+if test "$1" = "$LIBTOOL_WANTED_MAJOR"; then
+ if test "$2" -gt "$LIBTOOL_WANTED_MINOR"; then
+ lt_status="good"
+ elif test "$2" -lt "$LIBTOOL_WANTED_MINOR"; then
+ lt_status="bad"
+ elif test ! -z "$LIBTOOL_WANTED_PATCH"; then
+ if test "$3" -lt "$LIBTOOL_WANTED_PATCH"; then
+ lt_status="bad"
+ fi
+ fi
+fi
+if test $lt_status != "good"; then
+ echo "buildcheck: libtool version $lt_pversion found."
+ echo " You need libtool version $LIBTOOL_WANTED_VERSION or newer installed"
+ exit 1
+fi
+
+echo "buildcheck: libtool version $lt_pversion (ok)"
+
+#--------------------------------------------------------------------------
# check that our local copies of files match up with those in APR(UTIL)
#
if test -d ./apr; then
Modified: subversion/branches/svn_mutex/build/generator/extractor.py
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/generator/extractor.py?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/generator/extractor.py (original)
+++ subversion/branches/svn_mutex/build/generator/extractor.py Tue Oct 11 19:52:34 2011
@@ -55,6 +55,8 @@ _filter_names = [
'svn_auth_get_kwallet_ssl_client_cert_pw_provider',
'svn_auth_gnome_keyring_version',
'svn_auth_kwallet_version',
+ 'svn_auth_get_gpg_agent_simple_provider',
+ 'svn_auth_gpg_agent_version',
]
if __name__ == '__main__':
Modified: subversion/branches/svn_mutex/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/svn_mutex/build/generator/gen_make.py?rev=1182053&r1=1182052&r2=1182053&view=diff
==============================================================================
--- subversion/branches/svn_mutex/build/generator/gen_make.py (original)
+++ subversion/branches/svn_mutex/build/generator/gen_make.py Tue Oct 11 19:52:34 2011
@@ -531,6 +531,8 @@ DIR=`pwd`
''')
libdep_cache = {}
paths = {}
+ for lib in ('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'):
+ paths[lib] = self.sections[lib].options.get('path')
for target_ob in install_sources:
if not isinstance(target_ob, gen_base.TargetExe):
continue
@@ -548,7 +550,7 @@ DIR=`pwd`
def _get_all_lib_deps(self, target_name, libdep_cache, paths):
if not target_name in libdep_cache:
- libs = {}
+ libs = set()
path = None
if target_name in self.sections:
section = self.sections[target_name]
@@ -557,11 +559,12 @@ DIR=`pwd`
if opt_libs:
for lib_name in opt_libs.split():
if lib_name.startswith('libsvn_'):
- libs[lib_name] = True
+ libs.add(lib_name)
for lib in self._get_all_lib_deps(lib_name, libdep_cache, paths):
- libs[lib] = True
- libdep_cache[target_name] = libs.keys()[:]
- libdep_cache[target_name].sort()
+ libs.add(lib)
+ if target_name == 'libsvn_subr':
+ libs.update(('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'))
+ libdep_cache[target_name] = sorted(libs)
return libdep_cache[target_name]
class UnknownDependency(Exception):