You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/05/16 22:32:54 UTC
svn commit: r1339349 [1/37] - in /subversion/branches/fix-rdump-editor: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/emacs/ contrib/client-side/vim/
contrib/server-side/ notes/ notes/api-errata...
Author: hwright
Date: Wed May 16 20:32:43 2012
New Revision: 1339349
URL: http://svn.apache.org/viewvc?rev=1339349&view=rev
Log:
On the fix-rdump-editor branch:
Bring up-to-date with trunk.
Added:
subversion/branches/fix-rdump-editor/notes/api-errata/1.8/
- copied from r1339328, subversion/trunk/notes/api-errata/1.8/
subversion/branches/fix-rdump-editor/notes/ev2-callbacks-template.c
- copied unchanged from r1339328, subversion/trunk/notes/ev2-callbacks-template.c
subversion/branches/fix-rdump-editor/subversion/include/private/svn_delta_private.h
- copied unchanged from r1339328, subversion/trunk/subversion/include/private/svn_delta_private.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_named_atomic.h
- copied unchanged from r1339328, subversion/trunk/subversion/include/private/svn_named_atomic.h
subversion/branches/fix-rdump-editor/subversion/libsvn_delta/deprecated.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_delta/deprecated.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs/editor.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_fs/editor.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra/editor.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_ra/editor.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/sb_bucket.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_ra_serf/sb_bucket.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/base64.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/base64.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/cache_config.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/cache_config.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/crypto.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/crypto.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/crypto.h
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/crypto.h
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/mutex.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/mutex.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/named_atomic.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/named_atomic.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/string.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/string.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/temp_serializer.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/temp_serializer.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/types.c
- copied unchanged from r1339328, subversion/trunk/subversion/libsvn_subr/types.c
subversion/branches/fix-rdump-editor/subversion/svnmucc/ (props changed)
- copied from r1339328, subversion/trunk/subversion/svnmucc/
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/merge_symmetric_tests.py
- copied unchanged from r1339328, subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_subr/crypto-test.c
- copied unchanged from r1339328, subversion/trunk/subversion/tests/libsvn_subr/crypto-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_subr/named_atomic-test-common.h
- copied unchanged from r1339328, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test-common.h
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_subr/named_atomic-test-proc.c
- copied unchanged from r1339328, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test-proc.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_subr/named_atomic-test.c
- copied unchanged from r1339328, subversion/trunk/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/fix-rdump-editor/tools/dev/aprerr.txt
- copied unchanged from r1339328, subversion/trunk/tools/dev/aprerr.txt
subversion/branches/fix-rdump-editor/tools/dev/sbox-ospath.py
- copied unchanged from r1339328, subversion/trunk/tools/dev/sbox-ospath.py
subversion/branches/fix-rdump-editor/tools/dist/make-deps-tarball.sh (props changed)
- copied unchanged from r1339328, subversion/trunk/tools/dist/make-deps-tarball.sh
Removed:
subversion/branches/fix-rdump-editor/contrib/client-side/vim/svn.vim
subversion/branches/fix-rdump-editor/contrib/server-side/svn-fast-backup
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/svn_base64.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/svn_cache_config.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/svn_mutex.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/svn_string.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/svn_temp_serializer.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/svn_types.c
subversion/branches/fix-rdump-editor/tools/client-side/svnmucc/
subversion/branches/fix-rdump-editor/tools/dist/templates/htaccess.ezt
subversion/branches/fix-rdump-editor/tools/dist/templates/rc-candidates.ezt
subversion/branches/fix-rdump-editor/tools/dist/templates/stable-candidates.ezt
Modified:
subversion/branches/fix-rdump-editor/ (props changed)
subversion/branches/fix-rdump-editor/CHANGES
subversion/branches/fix-rdump-editor/COMMITTERS
subversion/branches/fix-rdump-editor/INSTALL
subversion/branches/fix-rdump-editor/Makefile.in
subversion/branches/fix-rdump-editor/build.conf
subversion/branches/fix-rdump-editor/build/ac-macros/serf.m4
subversion/branches/fix-rdump-editor/build/ac-macros/svn-macros.m4
subversion/branches/fix-rdump-editor/build/ac-macros/swig.m4
subversion/branches/fix-rdump-editor/build/generator/gen_base.py
subversion/branches/fix-rdump-editor/build/generator/gen_make.py
subversion/branches/fix-rdump-editor/build/generator/templates/build_zlib.ezt
subversion/branches/fix-rdump-editor/build/generator/templates/makefile.ezt
subversion/branches/fix-rdump-editor/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/fix-rdump-editor/build/run_tests.py
subversion/branches/fix-rdump-editor/build/win32/make_dist.py
subversion/branches/fix-rdump-editor/build/win32/vc6-build.bat.in
subversion/branches/fix-rdump-editor/configure.ac
subversion/branches/fix-rdump-editor/contrib/client-side/emacs/dsvn.el
subversion/branches/fix-rdump-editor/contrib/client-side/emacs/vc-svn.el
subversion/branches/fix-rdump-editor/notes/directory-index/dirindex.py
subversion/branches/fix-rdump-editor/notes/directory-index/logimport.py
subversion/branches/fix-rdump-editor/notes/directory-index/schema.sql
subversion/branches/fix-rdump-editor/notes/knobs
subversion/branches/fix-rdump-editor/notes/merge-tracking/func-spec.html
subversion/branches/fix-rdump-editor/notes/moves
subversion/branches/fix-rdump-editor/notes/ra-serf-testing.txt
subversion/branches/fix-rdump-editor/notes/sparse-directories.txt
subversion/branches/fix-rdump-editor/notes/wc-ng/conflict-storage
subversion/branches/fix-rdump-editor/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/fix-rdump-editor/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/fix-rdump-editor/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/fix-rdump-editor/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/fix-rdump-editor/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/fix-rdump-editor/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/fix-rdump-editor/subversion/bindings/swig/perl/native/t/3client.t
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/svn/client.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/svn/core.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/svn/delta.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/svn/diff.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/svn/fs.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/svn/ra.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/svn/repos.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/svn/wc.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/python/tests/pool.py
subversion/branches/fix-rdump-editor/subversion/bindings/swig/ruby/svn/fs.rb
subversion/branches/fix-rdump-editor/subversion/bindings/swig/ruby/test/test_client.rb
subversion/branches/fix-rdump-editor/subversion/bindings/swig/ruby/test/test_wc.rb
subversion/branches/fix-rdump-editor/subversion/include/private/svn_auth_private.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_cache.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_client_private.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_fs_util.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_mutex.h (contents, props changed)
subversion/branches/fix-rdump-editor/subversion/include/private/svn_ra_private.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_repos_private.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_sqlite.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_string_private.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_subr_private.h (contents, props changed)
subversion/branches/fix-rdump-editor/subversion/include/private/svn_temp_serializer.h
subversion/branches/fix-rdump-editor/subversion/include/private/svn_wc_private.h
subversion/branches/fix-rdump-editor/subversion/include/svn_checksum.h
subversion/branches/fix-rdump-editor/subversion/include/svn_client.h
subversion/branches/fix-rdump-editor/subversion/include/svn_config.h
subversion/branches/fix-rdump-editor/subversion/include/svn_delta.h
subversion/branches/fix-rdump-editor/subversion/include/svn_diff.h
subversion/branches/fix-rdump-editor/subversion/include/svn_editor.h
subversion/branches/fix-rdump-editor/subversion/include/svn_error.h
subversion/branches/fix-rdump-editor/subversion/include/svn_error_codes.h
subversion/branches/fix-rdump-editor/subversion/include/svn_fs.h
subversion/branches/fix-rdump-editor/subversion/include/svn_hash.h
subversion/branches/fix-rdump-editor/subversion/include/svn_io.h
subversion/branches/fix-rdump-editor/subversion/include/svn_pools.h
subversion/branches/fix-rdump-editor/subversion/include/svn_props.h
subversion/branches/fix-rdump-editor/subversion/include/svn_ra.h
subversion/branches/fix-rdump-editor/subversion/include/svn_repos.h
subversion/branches/fix-rdump-editor/subversion/include/svn_sorts.h
subversion/branches/fix-rdump-editor/subversion/include/svn_string.h
subversion/branches/fix-rdump-editor/subversion/include/svn_types.h
subversion/branches/fix-rdump-editor/subversion/include/svn_wc.h
subversion/branches/fix-rdump-editor/subversion/include/svn_xml.h
subversion/branches/fix-rdump-editor/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
subversion/branches/fix-rdump-editor/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/fix-rdump-editor/subversion/libsvn_client/add.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/blame.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/cat.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/checkout.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/client.h
subversion/branches/fix-rdump-editor/subversion/libsvn_client/commit.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/commit_util.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/copy.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/deprecated.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/diff.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/export.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/externals.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/info.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/list.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/locking_commands.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/log.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/merge.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/mergeinfo.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/mergeinfo.h
subversion/branches/fix-rdump-editor/subversion/libsvn_client/patch.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/prop_commands.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/ra.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/repos_diff.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/resolved.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/revisions.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/status.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/switch.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/update.c
subversion/branches/fix-rdump-editor/subversion/libsvn_client/util.c
subversion/branches/fix-rdump-editor/subversion/libsvn_delta/compat.c
subversion/branches/fix-rdump-editor/subversion/libsvn_delta/debug_editor.c
subversion/branches/fix-rdump-editor/subversion/libsvn_delta/editor.c
subversion/branches/fix-rdump-editor/subversion/libsvn_delta/path_driver.c
subversion/branches/fix-rdump-editor/subversion/libsvn_delta/text_delta.c
subversion/branches/fix-rdump-editor/subversion/libsvn_delta/xdelta.c
subversion/branches/fix-rdump-editor/subversion/libsvn_diff/diff_file.c
subversion/branches/fix-rdump-editor/subversion/libsvn_diff/diff_memory.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs/fs-loader.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs/fs-loader.h
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/bdb/locks-table.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/err.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/fs.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/fs.h
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/lock.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/tree.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/util/fs_skels.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/uuid.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_base/uuid.h
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/caching.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/dag.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/dag.h
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/fs.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/fs.h
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/id.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/lock.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/temp_serializer.h
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/tree.c
subversion/branches/fix-rdump-editor/subversion/libsvn_fs_fs/tree.h
subversion/branches/fix-rdump-editor/subversion/libsvn_ra/compat.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra/debug_reporter.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra/ra_loader.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra/ra_loader.h
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_neon/commit.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_neon/fetch.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_neon/session.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_neon/util.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/blame.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/commit.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/getdate.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/getlocks.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/locks.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/log.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/merge.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/options.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/property.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/replay.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/serf.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/update.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/util.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_serf/xml.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_svn/client.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_svn/editorp.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_svn/marshal.c
subversion/branches/fix-rdump-editor/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/commit.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/deprecated.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/dump.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/fs-wrap.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/hooks.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/log.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/replay.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/reporter.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/repos.c
subversion/branches/fix-rdump-editor/subversion/libsvn_repos/rev_hunt.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/cache-memcache.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/checksum.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/config.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/config_file.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/error.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/gpg_agent.c (contents, props changed)
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/hash.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/io.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/lock.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/macos_keychain.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/mergeinfo.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/path.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/pool.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/properties.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/simple_providers.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/skel.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/spillbuf.c (contents, props changed)
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/sqlite.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/stream.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/time.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/win32_crashrpt.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/win32_crypto.c
subversion/branches/fix-rdump-editor/subversion/libsvn_subr/xml.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_crawler.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_files.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/adm_ops.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/conflicts.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/deprecated.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/diff_editor.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/entries.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/info.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/merge.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/node.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/props.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/questions.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/status.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/update_editor.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/wc-queries.sql
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/wc.h
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/wc_db.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/wc_db.h
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/wc_db_util.c
subversion/branches/fix-rdump-editor/subversion/libsvn_wc/workqueue.h
subversion/branches/fix-rdump-editor/subversion/mod_dav_svn/dav_svn.h
subversion/branches/fix-rdump-editor/subversion/mod_dav_svn/lock.c
subversion/branches/fix-rdump-editor/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/fix-rdump-editor/subversion/mod_dav_svn/reports/update.c
subversion/branches/fix-rdump-editor/subversion/mod_dav_svn/repos.c
subversion/branches/fix-rdump-editor/subversion/mod_dav_svn/util.c
subversion/branches/fix-rdump-editor/subversion/po/de.po
subversion/branches/fix-rdump-editor/subversion/po/fr.po
subversion/branches/fix-rdump-editor/subversion/po/ja.po
subversion/branches/fix-rdump-editor/subversion/svn/blame-cmd.c
subversion/branches/fix-rdump-editor/subversion/svn/cl.h
subversion/branches/fix-rdump-editor/subversion/svn/conflict-callbacks.c
subversion/branches/fix-rdump-editor/subversion/svn/diff-cmd.c
subversion/branches/fix-rdump-editor/subversion/svn/log-cmd.c
subversion/branches/fix-rdump-editor/subversion/svn/main.c
subversion/branches/fix-rdump-editor/subversion/svn/merge-cmd.c
subversion/branches/fix-rdump-editor/subversion/svn/notify.c
subversion/branches/fix-rdump-editor/subversion/svn/props.c
subversion/branches/fix-rdump-editor/subversion/svn/resolve-cmd.c
subversion/branches/fix-rdump-editor/subversion/svn/status.c
subversion/branches/fix-rdump-editor/subversion/svnadmin/main.c
subversion/branches/fix-rdump-editor/subversion/svndumpfilter/main.c
subversion/branches/fix-rdump-editor/subversion/svnlook/main.c
subversion/branches/fix-rdump-editor/subversion/svnrdump/dump_editor.c
subversion/branches/fix-rdump-editor/subversion/svnrdump/load_editor.c
subversion/branches/fix-rdump-editor/subversion/svnrdump/svnrdump.c
subversion/branches/fix-rdump-editor/subversion/svnserve/main.c
subversion/branches/fix-rdump-editor/subversion/svnserve/serve.c
subversion/branches/fix-rdump-editor/subversion/svnserve/server.h
subversion/branches/fix-rdump-editor/subversion/svnsync/main.c
subversion/branches/fix-rdump-editor/subversion/svnsync/sync.c
subversion/branches/fix-rdump-editor/subversion/svnversion/main.c
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/authz_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/basic_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/commit_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/copy_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/davautocheck.sh
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/depth_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/diff_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/entries_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/externals_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/import_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/info_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/lock_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/log_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/merge_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/patch_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/prop_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/revert_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/schedule_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/special_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/stat_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/svntest/err.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/svntest/main.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/svntest/wc.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/switch_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/trans_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/update_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_client/ (props changed)
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_client/client-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_delta/random-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_delta/window-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_fs/locks-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_subr/ (props changed)
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_subr/cache-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_subr/spillbuf-test.c (contents, props changed)
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_subr/string-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_wc/db-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/fix-rdump-editor/subversion/tests/libsvn_wc/wc-incomplete-tester.c (props changed)
subversion/branches/fix-rdump-editor/subversion/tests/svn_test.h
subversion/branches/fix-rdump-editor/subversion/tests/svn_test_main.c
subversion/branches/fix-rdump-editor/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
subversion/branches/fix-rdump-editor/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/fix-rdump-editor/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/fix-rdump-editor/tools/client-side/mergeinfo-sanitizer.py (contents, props changed)
subversion/branches/fix-rdump-editor/tools/dev/gdb-py/svndbg/printers.py
subversion/branches/fix-rdump-editor/tools/dev/gen-py-errors.py
subversion/branches/fix-rdump-editor/tools/dev/merge-graph.py
subversion/branches/fix-rdump-editor/tools/dev/mergegraph/mergegraph.py
subversion/branches/fix-rdump-editor/tools/dev/svnraisetreeconflict/main.c
subversion/branches/fix-rdump-editor/tools/dev/unix-build/Makefile.svn
subversion/branches/fix-rdump-editor/tools/dev/unix-build/README
subversion/branches/fix-rdump-editor/tools/dev/which-error.py
subversion/branches/fix-rdump-editor/tools/dev/windows-build/Makefile
subversion/branches/fix-rdump-editor/tools/dist/_gnupg.py
subversion/branches/fix-rdump-editor/tools/dist/dist.sh
subversion/branches/fix-rdump-editor/tools/dist/nightly.sh
subversion/branches/fix-rdump-editor/tools/dist/release.py
subversion/branches/fix-rdump-editor/tools/server-side/mod_dontdothat/mod_dontdothat.c
subversion/branches/fix-rdump-editor/tools/server-side/svn-rep-sharing-stats.c
subversion/branches/fix-rdump-editor/tools/server-side/svnpubsub/example.conf
subversion/branches/fix-rdump-editor/tools/server-side/svnpubsub/svntweet.py
subversion/branches/fix-rdump-editor/tools/server-side/svnpubsub/svnwcsub.py
subversion/branches/fix-rdump-editor/win-tests.py
Propchange: subversion/branches/fix-rdump-editor/
------------------------------------------------------------------------------
Merged /subversion/branches/multi-layer-moves:r1239019-1300930
Merged /subversion/trunk:r1300691-1339328
Merged /subversion/branches/ev2-export:r1325914,1332738
Merged /subversion/branches/node_pool:r1304828-1305388
Merged /subversion/branches/revprop-cache:r1298521-1326293
Modified: subversion/branches/fix-rdump-editor/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/CHANGES?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/CHANGES (original)
+++ subversion/branches/fix-rdump-editor/CHANGES Wed May 16 20:32:43 2012
@@ -19,8 +19,11 @@ 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)
- Client-side bugfixes:
*
@@ -29,7 +32,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:
@@ -42,6 +45,57 @@ http://svn.apache.org/repos/asf/subversi
*
+Version 1.7.5
+(17 May 2012, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.5
+
+ 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)
+ * improve memory and file-handle management with externals (issue #4130)
+ * serf: convert assertions to "MERGE failed" errors (r1302417)
+ * fix undefined behaviour during multi-segment reverse merges (issue #4144)
+ * 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 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)
+
+ - 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
(08 Mar 2012, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.4
@@ -384,6 +438,30 @@ the 1.6 release: http://subversion.apac
* fix type mapping of svn_txdelta_window_t in python bindings (issue #3688)
+Version 1.6.18
+(29 Mar 2012, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.18
+
+ User-visible changes:
+ * reject invalid svn:mergeinfo at commit time over DAV (issue #3953)
+ * fix reintegrate merge regression introduced in 1.6.13 (issue #3957)
+ * make the stderr output of the post-commit hook XML-safe (r893478)
+ * fix a rare source of FSFS corruption (r1240752)
+ * plug a memory leak in the bdb backend (r1205726)
+ * server-side performance fix for "log -g" (r1152282)
+ * fix description of svndumpfilter's --targets option (r1151911)
+ * fix datastream corruption during resumed transfer in ra_serf (r1154733)
+ * fix a crash in ra_svn SASL authentication (r1166555, -678)
+ * fix potential corruption on 32-bit FSFS with large files (r1230212)
+ * make website links point to subversion.apache.org (r896893, -901, r915036)
+ * fix non-fatal FSFS corruption bug with concurrent commits (issue #4129)
+
+ Developer-visible changes:
+ * fix sqlite distfile retrieval in get-deps.sh (r1134734)
+ * fix swig-py memory leak (r1235264, -296, -302, -736)
+ * allow passing --with-jdk to gen-make.py on Windows (r966167)
+
+
Version 1.6.17
(01 Jun 2011, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.17
Modified: subversion/branches/fix-rdump-editor/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/COMMITTERS?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/COMMITTERS [UTF-8] (original)
+++ subversion/branches/fix-rdump-editor/COMMITTERS [UTF-8] Wed May 16 20:32:43 2012
@@ -57,6 +57,7 @@ Blanket commit access:
dannas Daniel Näslund <da...@dannas.name>
stefan2 Stefan Fuhrmann <st...@alice-dsl.de>
jcorvel Johan Corveleyn <jc...@gmail.com>
+ trent Trent Nelson <tr...@snakebite.org>
[[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
@@ -92,7 +93,7 @@ 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)
+ sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python b.)
rdonch Роман Донченко <DX...@yandex.ru> (Swig-Python b.)
Packages:
@@ -186,6 +187,8 @@ giorgio_valoti Giorgio Valoti <giorgio
Experimental branches:
+ ashod Ashod Nakashian <as...@apache.org> (compressed-
+ pristines br.)
gthompson Glenn A. Thompson <gt...@cdr.net> (pluggable-db br.)
sigfred Sigfred Håversen <bs...@mumak.com> (svnserve-ssl br.)
[EMAIL IS BOUNCING]
Modified: subversion/branches/fix-rdump-editor/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/INSTALL?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/INSTALL (original)
+++ subversion/branches/fix-rdump-editor/INSTALL Wed May 16 20:32:43 2012
@@ -324,7 +324,7 @@ I. INTRODUCTION
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/)
+ 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
Modified: subversion/branches/fix-rdump-editor/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/Makefile.in?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/Makefile.in (original)
+++ subversion/branches/fix-rdump-editor/Makefile.in Wed May 16 20:32:43 2012
@@ -381,16 +381,18 @@ fast-clean: doc-clean
$(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline/svntest \
-name "*.pyc" -exec rm {} ';'
-# clean all but bulky test output, returning to before './configure' was run.
+# clean everything, returning to before './configure' was run.
SVN_CONFIG_SCRIPT_FILES = @SVN_CONFIG_SCRIPT_FILES@
-fast-distclean: fast-clean
- rm -fr Makefile config.cache config.log config.nice config.status \
- libtool mkmf.log subversion/svn_private_config.h \
- subversion/bindings/javahl/classes subversion/bindings/javahl/include \
+local-distclean: local-clean
+ rm -fr config.cache config.log config.nice config.status \
+ libtool mkmf.log subversion/svn_private_config.h \
+ subversion/bindings/javahl/classes \
+ subversion/bindings/javahl/include \
$(SVN_CONFIG_SCRIPT_FILES)
+ rm -f Makefile
# clean everything out, returning to before './autogen.sh' was run.
-local-extraclean: local-distclean extraclean-swig extraclean-ctypes-python extraclean-javahl
+local-extraclean: extraclean-bindings local-distclean
rm -f $(top_srcdir)/build-outputs.mk \
$(top_srcdir)/subversion/svn_private_config.h.in \
$(top_srcdir)/configure \
@@ -408,10 +410,7 @@ local-extraclean: local-distclean extrac
# clean everything, including test output.
-local-clean: fast-clean check-clean clean-swig clean-ctypes-python clean-javahl
-
-# clean everything, including test output.
-local-distclean: fast-distclean check-clean
+local-clean: check-clean clean-bindings fast-clean
local-install: @INSTALL_RULES@
@@ -437,8 +436,6 @@ clean-javahl:
rm -f $(libsvnjavahl_PATH)/*.lo
rm -f $(libsvnjavahl_PATH)/*.o
-extraclean-javahl: clean-javahl
-
check-tigris-javahl: javahl-compat
@FIX_JAVAHL_LIB@
$(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
@@ -454,7 +451,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 \
@@ -491,6 +488,9 @@ 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; \
LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)' \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
@@ -504,38 +504,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:
@@ -575,36 +575,24 @@ external-all external-install:
done;
### apr-util relies on generated files in apr, so reverse the
-### list so that it is cleaned before apr.
-external-clean external-distclean:
+### list so that it is cleaned before apr. also note that Neon does
+### not have an extraclean target, so get "close" with distclean
+external-clean external-distclean external-extraclean:
@target=`echo $@ | sed s/external-//`; \
list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)'; \
for i in $$list; do \
revlist="$$i $$revlist"; \
done; \
for i in $$revlist; do \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- done;
-
-### temporary hack. Neon does not have an "extraclean" and neither does db
-### If we don't have extraclean -- do the next best thing.
-external-extraclean:
- @list='$(SVN_EXTERNAL_PROJECT_SUBDIRS)'; \
- for i in $$list; do \
- revlist="$$i $$revlist"; \
- done; \
- for i in $$revlist; do \
- if test "$$i" = "neon" || test "$$i" = "db/dist"; then \
- echo "------ making distclean(no extraclean) in $$i"; \
+ 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"; \
+ echo "------ completed distclean (no extraclean) in $$i"; \
else \
- echo "------ making extraclean in $$i"; \
- (cd $$i && $(MAKE) extraclean) || exit 1; \
- echo "------ completed extraclean in $$i"; \
- fi; \
+ echo "------ making $$target in $$i"; \
+ (cd $$i && $(MAKE) $$target) || exit 1; \
+ echo "------ completed $$target in $$i"; \
+ fi; \
done;
@@ -729,10 +717,15 @@ install-man:
install-swig-py: install-swig-py-lib
install-swig-rb: install-swig-rb-lib
+clean-bindings: clean-swig clean-ctypes-python clean-javahl
+
+extraclean-bindings: clean-swig extraclean-swig-headers \
+ extraclean-swig-py extraclean-swig-rb \
+ extraclean-swig-pl \
+ clean-ctypes-python clean-javahl \
+
clean-swig: clean-swig-headers clean-swig-py clean-swig-rb clean-swig-pl
@rm -f .swig_checked
-extraclean-swig: extraclean-swig-headers extraclean-swig-py \
- extraclean-swig-rb extraclean-swig-pl
EXTRACLEAN_SWIG_HEADERS=rm -f $(SWIG_SRC_DIR)/proxy/*.swg
@@ -866,9 +859,15 @@ clean-ctypes-python:
cd $(CTYPES_PYTHON_SRC_DIR); \
$(PYTHON) setup.py clean --all
-extraclean-ctypes-python: 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/fix-rdump-editor/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build.conf?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build.conf (original)
+++ subversion/branches/fix-rdump-editor/build.conf Wed May 16 20:32:43 2012
@@ -174,6 +174,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 neon
+install = bin
+manpages = subversion/svnmucc/svnmucc.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -207,7 +215,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]
@@ -331,7 +339,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]
@@ -368,7 +376,7 @@ type = apache-mod
path = tools/server-side/mod_dontdothat
nonlibs = mod_dav_svn apr aprutil
libs = libsvn_subr xml
-install = apache-mod
+install = tools
msvc-libs = libhttpd.lib
# ----------------------------------------------------------------------------
@@ -744,6 +752,14 @@ sources = config-test.c
install = test
libs = libsvn_test libsvn_subr apriconv apr
+[crypto-test]
+description = Test svn_crypto utilities
+type = exe
+path = subversion/tests/libsvn_subr
+sources = crypto-test.c
+install = test
+libs = libsvn_test libsvn_subr aprutil apr
+
[dirent_uri-test]
description = Test dirent_uri library
type = exe
@@ -784,6 +800,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
@@ -969,7 +1001,7 @@ 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
@@ -1133,8 +1165,8 @@ 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 spillbuf-test
- revision-test
+ target-test error-test cache-test spillbuf-test crypto-test
+ named_atomic-test named_atomic-proc-test revision-test
subst_translate-test
translate-test
random-test window-test
@@ -1191,13 +1223,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/fix-rdump-editor/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/ac-macros/serf.m4?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/ac-macros/serf.m4 (original)
+++ subversion/branches/fix-rdump-editor/build/ac-macros/serf.m4 Wed May 16 20:32:43 2012
@@ -32,14 +32,14 @@ AC_DEFUN(SVN_LIB_SERF,
serf_check_patch="$3"
AC_ARG_WITH(serf,AS_HELP_STRING([--with-serf=PREFIX],
- [Serf WebDAV client library]),
+ [Serf HTTP client library]),
[
if test "$withval" = "yes" ; then
AC_MSG_ERROR([--with-serf requires an argument.])
elif test "$withval" != "no" ; then
AC_MSG_NOTICE([serf library configuration])
serf_prefix=$withval
- for serf_major in serf-2 serf-1 serf-0; do
+ for serf_major in serf-2 serf-1; 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"
@@ -62,20 +62,7 @@ AC_DEFUN(SVN_LIB_SERF,
test $serf_found = yes && break
done
fi
- ], [
- if test -d "$srcdir/serf"; then
- serf_found=reconfig
- fi
- ])
-
-
- if test $serf_found = "reconfig"; then
- 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_INCLUDES="-I$srcdir/serf"
- SVN_SERF_LIBS="$abs_builddir/serf/lib$serf_major.la"
- fi
+ ])
if test $serf_found = "yes"; then
SVN_SERF_INCLUDES="-I$serf_prefix/include/$serf_major"
@@ -85,8 +72,6 @@ AC_DEFUN(SVN_LIB_SERF,
SVN_SERF_LIBS="-l$serf_major"
LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
fi
- elif test $serf_found = "reconfig"; then
- serf_found=yes
fi
svn_lib_serf=$serf_found
Modified: subversion/branches/fix-rdump-editor/build/ac-macros/svn-macros.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/ac-macros/svn-macros.m4?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/ac-macros/svn-macros.m4 (original)
+++ subversion/branches/fix-rdump-editor/build/ac-macros/svn-macros.m4 Wed May 16 20:32:43 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/fix-rdump-editor/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/ac-macros/swig.m4?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/ac-macros/swig.m4 (original)
+++ subversion/branches/fix-rdump-editor/build/ac-macros/swig.m4 Wed May 16 20:32:43 2012
@@ -187,7 +187,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
Modified: subversion/branches/fix-rdump-editor/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/generator/gen_base.py?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/generator/gen_base.py (original)
+++ subversion/branches/fix-rdump-editor/build/generator/gen_base.py Wed May 16 20:32:43 2012
@@ -117,6 +117,7 @@ class GeneratorBase:
# Lists of pathnames of various kinds
self.test_deps = [] # Non-BDB dependent items to build for the tests
self.test_progs = [] # Subset of the above to actually execute
+ self.test_helpers = [] # $ {test_deps} \setminus {test_progs} $
self.bdb_test_deps = [] # BDB-dependent items to build for the tests
self.bdb_test_progs = [] # Subset of the above to actually execute
self.target_dirs = [] # Directories in which files are built
@@ -470,6 +471,8 @@ class TargetExe(TargetLinked):
self.gen_obj.test_deps.append(self.filename)
if self.testing != 'skip':
self.gen_obj.test_progs.append(self.filename)
+ else:
+ self.gen_obj.test_helpers.append(self.filename)
elif self.install == 'bdb-test':
self.gen_obj.bdb_test_deps.append(self.filename)
if self.testing != 'skip':
Modified: subversion/branches/fix-rdump-editor/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/generator/gen_make.py?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/generator/gen_make.py (original)
+++ subversion/branches/fix-rdump-editor/build/generator/gen_make.py Wed May 16 20:32:43 2012
@@ -141,6 +141,7 @@ class Generator(gen_base.GeneratorBase):
data.bdb_test_progs = self.bdb_test_progs + self.bdb_scripts
data.test_deps = self.test_deps + self.scripts
data.test_progs = self.test_progs + self.scripts
+ data.test_helpers = self.test_helpers
# write list of all manpages
data.manpages = self.manpages
@@ -369,18 +370,21 @@ class Generator(gen_base.GeneratorBase):
# get the output files for these targets, sorted in dependency order
files = gen_base._sorted_files(self.graph, area)
- ezt_area = _eztdata(type=area, files=[ ], extra_install=None)
+ ezt_area = _eztdata(type=area, files=[ ], apache_files=[ ],
+ extra_install=None)
- if area == 'apache-mod':
- data.areas.append(ezt_area)
-
- for file in files:
+ def apache_file_to_eztdata(file):
# cd to dirname before install to work around libtool 1.4.2 bug.
dirname, fname = build_path_splitfile(file)
base, ext = os.path.splitext(fname)
name = base.replace('mod_', '')
- ezt_area.files.append(_eztdata(fullname=file, dirname=dirname,
- name=name, filename=fname))
+ return _eztdata(fullname=file, dirname=dirname,
+ name=name, filename=fname)
+ if area == 'apache-mod':
+ data.areas.append(ezt_area)
+
+ for file in files:
+ ezt_area.files.append(apache_file_to_eztdata(file))
elif area != 'test' and area != 'bdb-test':
data.areas.append(ezt_area)
@@ -390,6 +394,14 @@ class Generator(gen_base.GeneratorBase):
ezt_area.varname = area_var
ezt_area.uppervar = upper_var
+ # ### TODO: This is a hack. See discussion here:
+ # ### http://mid.gmane.org/20120316191639.GA28451@daniel3.local
+ apache_files = [t.filename for t in inst_targets
+ if isinstance(t, gen_base.TargetApacheMod)]
+
+ files = [f for f in files if f not in apache_files]
+ for file in apache_files:
+ ezt_area.apache_files.append(apache_file_to_eztdata(file))
for file in files:
# cd to dirname before install to work around libtool 1.4.2 bug.
dirname, fname = build_path_splitfile(file)
@@ -410,7 +422,8 @@ class Generator(gen_base.GeneratorBase):
# in Makefile.in
### we should turn AREA into an object, then test it instead of this
if area[:5] == 'swig-' and area[-4:] != '-lib' or \
- area[:7] == 'javahl-':
+ area[:7] == 'javahl-' \
+ or area == 'tools':
ezt_area.extra_install = 'yes'
########################################
Modified: subversion/branches/fix-rdump-editor/build/generator/templates/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/generator/templates/build_zlib.ezt?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/generator/templates/build_zlib.ezt (original)
+++ subversion/branches/fix-rdump-editor/build/generator/templates/build_zlib.ezt Wed May 16 20:32:43 2012
@@ -55,7 +55,7 @@ set OBJA=contrib\masmx86\gvmat32c.obj co
set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
[else]
if /i "%2" == "Win32" (
- set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"
+ set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj" "AS=ml -safeseh"
) else if /i "%2" == "x64" (
set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" AS=ml64
)
Modified: subversion/branches/fix-rdump-editor/build/generator/templates/makefile.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/generator/templates/makefile.ezt?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/generator/templates/makefile.ezt (original)
+++ subversion/branches/fix-rdump-editor/build/generator/templates/makefile.ezt Wed May 16 20:32:43 2012
@@ -38,6 +38,8 @@ TEST_DEPS =[for test_deps] [test_deps][e
TEST_PROGRAMS =[for test_progs] [test_progs][end]
+check-deps test-deps: [for test_helpers] [test_helpers][end]
+
MANPAGES =[for manpages] [manpages][end]
CLEAN_FILES =[for cfiles] [cfiles][end]
@@ -126,11 +128,12 @@ $([target.varname]_OBJECTS): $([target.v
[for areas]
[is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for areas.files]
cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
-[else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
+[else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end] [for areas.apache_files] [areas.apache_files.fullname][end]
$(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type "locale"]
$(MKDIR) [areas.files.installdir]
cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
- cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end]
+ cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for areas.apache_files]
+ cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
[if-any areas.extra_install] $(INSTALL_EXTRA_[areas.uppervar])
[end][end][end]
Modified: subversion/branches/fix-rdump-editor/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/generator/templates/vcnet_vcxproj.ezt?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/fix-rdump-editor/build/generator/templates/vcnet_vcxproj.ezt Wed May 16 20:32:43 2012
@@ -33,7 +33,8 @@
[for platforms][for configs] <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'" Label="Configuration">
<ConfigurationType>[config_type]</ConfigurationType>
<UseDebugLibraries>[is configs.name "Debug"]true[else]false[end]</UseDebugLibraries>
- <PlatformToolset>[toolset_version]</PlatformToolset>
+[is configs.name "Release"] <WholeProgramOptimization>true</WholeProgramOptimization>
+[end] <PlatformToolset>[toolset_version]</PlatformToolset>
</PropertyGroup>
[end][end] <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: subversion/branches/fix-rdump-editor/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/run_tests.py?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/run_tests.py (original)
+++ subversion/branches/fix-rdump-editor/build/run_tests.py Wed May 16 20:32:43 2012
@@ -84,7 +84,15 @@ def _get_term_width():
return None
return cr
- cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
+ cr = None
+ if not cr:
+ try:
+ cr = (os.environ['SVN_MAKE_CHECK_LINES'],
+ os.environ['SVN_MAKE_CHECK_COLUMNS'])
+ except:
+ cr = None
+ if not cr:
+ cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
if not cr:
try:
fd = os.open(os.ctermid(), os.O_RDONLY)
@@ -94,12 +102,15 @@ def _get_term_width():
pass
if not cr:
try:
- cr = (env['LINES'], env['COLUMNS'])
+ cr = (os.environ['LINES'], os.environ['COLUMNS'])
except:
cr = None
if not cr:
# Default
- cr = (25, 80)
+ if sys.platform == 'win32':
+ cr = (25, 79)
+ else:
+ cr = (25, 80)
return int(cr[1])
@@ -113,7 +124,7 @@ class TestHarness:
cleanup=None, enable_sasl=None, parallel=None, config_file=None,
fsfs_sharding=None, fsfs_packing=None,
list_tests=None, svn_bin=None, mode_filter=None,
- milestone_filter=None):
+ milestone_filter=None, set_log_level=None):
'''Construct a TestHarness instance.
ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -160,6 +171,7 @@ class TestHarness:
self.config_file = os.path.abspath(config_file)
self.list_tests = list_tests
self.milestone_filter = milestone_filter
+ self.set_log_level = set_log_level
self.svn_bin = svn_bin
self.mode_filter = mode_filter
self.log = None
@@ -393,6 +405,10 @@ class TestHarness:
line = prog.stdout.readline()
+ # If we didn't run any tests, still print out the dots
+ if not tests_completed:
+ os.write(sys.stdout.fileno(), '.' * dot_count)
+
prog.wait()
return prog.returncode
@@ -436,6 +452,13 @@ class TestHarness:
svntest.main.options.list_tests = True
if self.milestone_filter is not None:
svntest.main.options.milestone_filter = self.milestone_filter
+ if self.set_log_level is not None:
+ # Somehow the logger is not setup correctly from win-tests.py, so
+ # setting the log level would fail. ### Please fix
+ if svntest.main.logger is None:
+ import logging
+ svntest.main.logger = logging.getLogger()
+ svntest.main.logger.setLevel(self.set_log_level)
if self.svn_bin is not None:
svntest.main.options.svn_bin = self.svn_bin
if self.fsfs_sharding is not None:
@@ -600,7 +623,7 @@ def main():
'fsfs-packing', 'fsfs-sharding=',
'enable-sasl', 'parallel', 'config-file=',
'log-to-stdout', 'list', 'milestone-filter=',
- 'mode-filter='])
+ 'mode-filter=', 'set-log-level='])
except getopt.GetoptError:
args = []
@@ -610,9 +633,10 @@ def main():
base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
- config_file, log_to_stdout, list_tests, mode_filter, milestone_filter= \
+ config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
+ set_log_level = \
None, None, None, None, None, None, None, None, None, None, None, \
- None, None, None, None
+ None, None, None, None, None
for opt, val in opts:
if opt in ['-u', '--url']:
base_url = val
@@ -644,6 +668,8 @@ def main():
milestone_filter = val
elif opt in ['--mode-filter']:
mode_filter = val
+ elif opt in ['--set-log-level']:
+ set_log_level = val
else:
raise getopt.GetoptError
@@ -658,7 +684,8 @@ def main():
base_url, fs_type, http_library, server_minor_version,
verbose, cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing, list_tests,
- mode_filter=mode_filter, milestone_filter=milestone_filter)
+ mode_filter=mode_filter, milestone_filter=milestone_filter,
+ set_log_level=set_log_level)
failed = th.run(args[2:])
if failed:
Modified: subversion/branches/fix-rdump-editor/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/win32/make_dist.py?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/win32/make_dist.py (original)
+++ subversion/branches/fix-rdump-editor/build/win32/make_dist.py Wed May 16 20:32:43 2012
@@ -211,10 +211,10 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(blddir)s/svnversion/svnversion.pdb'),
File('%(blddir)s/svnrdump/svnrdump.exe'),
File('%(blddir)s/svnrdump/svnrdump.pdb'),
+ File('%(blddir)s/svnmucc/svnmucc.exe'),
+ File('%(blddir)s/svnmucc/svnmucc.pdb'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'),
File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'),
- File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.exe'),
- File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.pdb'),
File('%(blddir)s/../tools/server-side/svnauthz-validate.exe'),
File('%(blddir)s/../tools/server-side/svnauthz-validate.pdb'),
File('%(blddir)s/../tools/server-side/svn-populate-node-origins-index.exe'),
Modified: subversion/branches/fix-rdump-editor/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/build/win32/vc6-build.bat.in?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/build/win32/vc6-build.bat.in (original)
+++ subversion/branches/fix-rdump-editor/build/win32/vc6-build.bat.in Wed May 16 20:32:43 2012
@@ -137,6 +137,7 @@ copy src-%DIR%\Release\subversion\svnloo
copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin
+copy src-%DIR%\Release\subversion\svnmucc\svnmucc.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so svn-win32-%VER%\httpd
copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so svn-win32-%VER%\httpd
copy svn-win32-%VER%\bin\intl.dll "%APACHEDIR%\bin"
Modified: subversion/branches/fix-rdump-editor/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/configure.ac?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/configure.ac (original)
+++ subversion/branches/fix-rdump-editor/configure.ac Wed May 16 20:32:43 2012
@@ -138,7 +138,7 @@ if test "$svn_lib_neon" = "yes"; then
fi
dnl Search for serf as an alternative to neon
-SVN_LIB_SERF(0,7,1)
+SVN_LIB_SERF(1,0,0)
if test "$svn_lib_serf" = "yes"; then
AC_DEFINE([SVN_HAVE_SERF], 1,
@@ -184,6 +184,12 @@ if test -n "$sqlite_compat_ver" && test
CFLAGS="-DSVN_SQLITE_MIN_VERSION_NUMBER=$sqlite_compat_ver_num $CFLAGS"
fi
+SVN_CHECK_FOR_ATOMIC_BUILTINS
+
+if test "$svn_cv_atomic_builtins" = "yes"; then
+ AC_DEFINE(SVN_HAS_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins])
+fi
+
dnl Set up a number of directories ---------------------
dnl Create SVN_BINDIR for proper substitution
@@ -654,6 +660,19 @@ AC_SUBST(SVN_GNOME_KEYRING_INCLUDES)
AC_SUBST(SVN_GNOME_KEYRING_LIBS)
+dnl Ev2 experimental feature ----------------------
+dnl Note: The Ev2 compat code will be built unconditionally, but by providing
+dnl this flag, users can enforce Ev2 compliance for testing purposes
+AC_ARG_ENABLE(ev2-shims,
+ AS_HELP_STRING([--enable-ev2-shims],
+ [Compile with Ev2 translation [EXPERIMENTAL]]),
+ [enable_ev2_shims=$enableval],[enable_ev2_shims=no])
+if test "$enable_ev2_shims" = "yes"; then
+ AC_DEFINE(ENABLE_EV2_SHIMS, 1,
+ [Define to 1 if Ev2 should be interjected into editor stacks.])
+fi
+
+
dnl I18n -------------------
AC_ARG_ENABLE(nls,
@@ -812,7 +831,7 @@ dnl Build and install rules ------------
INSTALL_STATIC_RULES="install-bin install-docs"
INSTALL_RULES="install-fsmod-lib install-ramod-lib install-lib install-include install-static"
INSTALL_RULES="$INSTALL_RULES $INSTALL_APACHE_RULE"
-BUILD_RULES="fsmod-lib ramod-lib lib bin test $BUILD_APACHE_RULE tools"
+BUILD_RULES="fsmod-lib ramod-lib lib bin test sub-test $BUILD_APACHE_RULE tools"
if test "$svn_lib_berkeley_db" = "yes"; then
BUILD_RULES="$BUILD_RULES bdb-lib bdb-test"
@@ -1165,12 +1184,12 @@ if test "$RUBY" != "none"; then
AC_PATH_PROGS(RDOC, rdoc rdoc1.8 rdoc18, none)
fi
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
- svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
+ svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MAJOR))'`"
])
RUBY_MAJOR="$svn_cv_ruby_major"
AC_CACHE_CHECK([for Ruby minor version], [svn_cv_ruby_minor],[
- svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MINOR))'`"
+ svn_cv_ruby_minor="`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.fetch(%q(MINOR))'`"
])
RUBY_MINOR="$svn_cv_ruby_minor"
Modified: subversion/branches/fix-rdump-editor/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/contrib/client-side/emacs/dsvn.el?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/fix-rdump-editor/contrib/client-side/emacs/dsvn.el Wed May 16 20:32:43 2012
@@ -137,12 +137,34 @@
(setq svn-process-file
(if (fboundp 'process-file) 'process-file 'call-process))
-(defun svn-call-process (program buffer &rest args)
+;; Run svn with default (US-English) messages, since we are going to
+;; parse them.
+(setq svn-process-environment '("LC_MESSAGES=C"))
+
+(defun svn-call-in-svn-environment (func)
+ ;; Dynamic rebinding of process-environment
+ (let ((process-environment
+ (append svn-process-environment process-environment)))
+ (funcall func)))
+
+(defun svn-start-svn-process (buffer args)
+ "Start an svn process associated to BUFFER, with command-line
+arguments ARGS. Return the process object for it."
+ (svn-call-in-svn-environment
+ (lambda ()
+ (apply svn-start-file-process "svn" buffer svn-program args))))
+
+(defun svn-call-svn (infile buffer display args)
+ "Call svn synchronously. Arguments are like process-file."
+ (svn-call-in-svn-environment
+ (lambda ()
+ (apply svn-process-file svn-program infile buffer display args))))
+
+(defun svn-call-process (buffer &rest args)
"Run svn and wait for it to finish.
-Argument PROGRAM is the svn binary to run.
Argument BUFFER is the buffer in which to insert output.
Optional argument ARGS are the arguments to svn."
- (let ((proc (apply svn-start-file-process "svn" buffer program args)))
+ (let ((proc (svn-start-svn-process buffer args)))
(set-process-coding-system proc 'utf-8)
(set-process-filter proc 'svn-output-filter)
(while (eq (process-status proc) 'run)
@@ -166,9 +188,7 @@ Return non-NIL if there was any output."
(fundamental-mode))
(setq default-directory dir)
(setq buffer-read-only t)
- (let ((cmd `(,svn-program ,subcommand ,@args))
- proc)
- (setq proc (apply svn-start-file-process "svn" buf cmd))
+ (let ((proc (svn-start-svn-process buf (cons subcommand args))))
(set-process-coding-system proc 'utf-8)
(set-process-filter proc 'svn-output-filter)
(while (eq (process-status proc) 'run)
@@ -191,7 +211,7 @@ Returns the buffer that holds the output
(with-current-buffer buf
(erase-buffer)
(setq default-directory dir))
- (apply svn-process-file svn-program nil buf nil (symbol-name command) args)
+ (svn-call-svn nil buf nil (cons (symbol-name command) args))
buf))
(defun svn-run-for-stdout (command args)
@@ -199,8 +219,8 @@ Returns the buffer that holds the output
Argument COMMAND is the svn subcommand to run.
Optional argument ARGS is a list of arguments."
(let ((output-buffer (generate-new-buffer "*svn-stdout*")))
- (apply svn-process-file svn-program nil (list output-buffer nil) nil
- (symbol-name command) args)
+ (svn-call-svn nil (list output-buffer nil) nil
+ (cons (symbol-name command) args))
(let ((stdout (with-current-buffer output-buffer (buffer-string))))
(kill-buffer output-buffer)
stdout)))
@@ -262,8 +282,7 @@ buffer to describe what is going on."
args (cons "-v" args)))
(unless (memq command svn-noninteractive-blacklist)
(setq args (cons "--non-interactive" args)))
- (setq proc (apply svn-start-file-process "svn" (current-buffer)
- svn-program command-s args))
+ (setq proc (svn-start-svn-process (current-buffer) (cons command-s args)))
(if (fboundp filter-func)
(set-process-filter proc filter-func)
(set-process-filter proc 'svn-default-filter))
@@ -553,7 +572,7 @@ VERBOSE-P."
(setq buffer-read-only t)
(erase-buffer)
(setq default-directory dir)
- (svn-call-process svn-program diff-buf
+ (svn-call-process diff-buf
"diff" "-r"
(format "%d:%d" (1- commit-id) commit-id)))))
@@ -1064,19 +1083,24 @@ outside."
(goto-char (point-max))
(insert str)
(goto-char svn-output-marker)
- (while (cond ((looking-at
- "\\([ ACDGIMRX?!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? \\([^ ].*\\)\n")
- (let ((status (match-string 1))
- (filename (svn-normalise-path (match-string 2))))
- (delete-region (match-beginning 0)
- (match-end 0))
- (svn-insert-file filename status))
- t)
- ((looking-at
- "\n\\|Performing status on external item at .*\n")
- (delete-region (match-beginning 0)
- (match-end 0))
- t))))))
+ (while
+ (cond
+ ((looking-at
+ "\\([ ACDGIMRX?!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? \\([^ ].*\\)\n")
+ (let ((status (match-string 1))
+ (filename (svn-normalise-path (match-string 2))))
+ (delete-region (match-beginning 0) (match-end 0))
+ (svn-insert-file filename status))
+ t)
+ ((looking-at "\n\\|Performing status on external item at .*\n")
+ (delete-region (match-beginning 0) (match-end 0))
+ t)
+ ((looking-at " > +\\([^ ].*\\)\n")
+ (let ((tree-conflict (match-string 1)))
+ (delete-region (match-beginning 0) (match-end 0))
+ (svn-update-status-msg svn-last-inserted-marker "TConflict")
+ (svn-update-conflict-msg svn-last-inserted-marker tree-conflict))
+ t))))))
(defun svn-status-sentinel (proc reason)
(with-current-buffer (process-buffer proc)
@@ -1091,15 +1115,23 @@ outside."
(goto-char (point-max))
(insert str)
(goto-char svn-output-marker)
- (while (looking-at
- "\\([ ACDGIMRX?!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? \\([* ]\\) \\(........\\) \\(........\\) \\(............\\) \\([^ ].*\\)\n")
- (let ((status (match-string 1))
- (filename (svn-normalise-path (match-string 6))))
- (delete-region (match-beginning 0)
- (match-end 0))
- (when (or (not svn-file-filter)
- (member filename svn-file-filter))
- (svn-insert-file filename status)))))))
+ (while
+ (cond
+ ((looking-at
+ "\\(?:\\(\\?.....\\)\\|\\([ ACDGIMRX!~][ CM][ L][ +][ S][ KOTB]\\)[ C]? [* ] +[^ ]+ +[^ ]+ +[^ ]+\\) +\\([^ ].*\\)\n")
+ (let ((status (or (match-string 1) (match-string 2)))
+ (filename (svn-normalise-path (match-string 3))))
+ (delete-region (match-beginning 0) (match-end 0))
+ (when (or (not svn-file-filter)
+ (member filename svn-file-filter))
+ (svn-insert-file filename status)))
+ t)
+ ((looking-at " > +\\([^ ].*\\)\n")
+ (let ((tree-conflict (match-string 1)))
+ (delete-region (match-beginning 0) (match-end 0))
+ (svn-update-status-msg svn-last-inserted-marker "TConflict")
+ (svn-update-conflict-msg svn-last-inserted-marker tree-conflict))
+ t))))))
(defun svn-status-v-sentinel (proc reason)
(with-current-buffer (process-buffer proc)
@@ -1190,11 +1222,12 @@ With prefix arg, prompt for REVISION."
(goto-char svn-output-marker)
(while (not nomore)
(cond ((looking-at
- "\\([ ADUCGE][ ADUCGE][ B]\\) \\(.*\\)\n")
+ "\\([ ADUCGE][ ADUCGE][ B]\\)\\([ C]?\\) \\([^ ].*\\)\n")
(let* ((status (match-string 1))
(file-status (elt status 0))
(prop-status (elt status 1))
- (filename (svn-normalise-path (match-string 2))))
+ (tree-status (match-string 2))
+ (filename (svn-normalise-path (match-string 3))))
(delete-region (match-beginning 0)
(match-end 0))
(svn-insert-file
@@ -1204,7 +1237,9 @@ With prefix arg, prompt for REVISION."
(svn-remap-update-to-status file-status)
(svn-remap-update-to-status prop-status))
;; Optimize for some common cases
- (cond ((= prop-status ?\ )
+ (cond ((string= tree-status "C")
+ "TConflict")
+ ((= prop-status ?\ )
(cdr (assq file-status svn-update-flag-name)))
((= file-status ?\ )
(let ((s (format "P %s"
@@ -1219,6 +1254,8 @@ With prefix arg, prompt for REVISION."
((looking-at "At revision \\([0-9]+\\)\\.\n")
(svn-update-label svn-revision-label (match-string 1))
(forward-line 1))
+ ((looking-at "Updating '.*':\n")
+ (delete-region (match-beginning 0) (match-end 0)))
((and (not svn-merging)
(looking-at "Updated to revision \\([0-9]+\\)\\.\n"))
(svn-update-label svn-revision-label (match-string 1))
@@ -2083,7 +2120,14 @@ Argument MSG is the character to use."
(save-excursion
(goto-char (+ pos svn-status-msg-col))
(delete-char 9)
- (insert-and-inherit (format "%9s" msg))))
+ (insert-and-inherit (format "%-9s" msg))))
+
+(defun svn-update-conflict-msg (pos msg)
+ (save-excursion
+ (let ((filename (svn-getprop pos 'file)))
+ (goto-char (+ pos svn-status-file-col (length filename)))
+ (delete-char (- (line-end-position) (point)))
+ (insert-and-inherit (concat " -- " msg)))))
(defun svn-foreach-svn-buffer (file-name function)
"Call FUNCTION for each svn status buffer that contains FILE-NAME.
Modified: subversion/branches/fix-rdump-editor/contrib/client-side/emacs/vc-svn.el
URL: http://svn.apache.org/viewvc/subversion/branches/fix-rdump-editor/contrib/client-side/emacs/vc-svn.el?rev=1339349&r1=1339348&r2=1339349&view=diff
==============================================================================
--- subversion/branches/fix-rdump-editor/contrib/client-side/emacs/vc-svn.el (original)
+++ subversion/branches/fix-rdump-editor/contrib/client-side/emacs/vc-svn.el Wed May 16 20:32:43 2012
@@ -200,9 +200,9 @@ If the file is newly added, LOCAL is \"0
(cond
((not state) nil)
;; A newly added file has no revision.
- ((looking-at "....\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\(\\?\\|[0-9]+\\)")
+ ((looking-at ".......\\s-+\\(\\*\\s-+\\)?[-0]\\s-+\\(\\?\\|[0-9]+\\)")
(list state "0" nil))
- ((looking-at "....\\s-+\\(\\*\\s-+\\)?\\([0-9]+\\)\\s-+\\([0-9]+\\)")
+ ((looking-at ".......\\s-+\\(\\*\\s-+\\)?\\([0-9]+\\)\\s-+\\([0-9]+\\)")
(list state
(match-string 2)
(match-string 3)))