You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2012/06/26 21:28:22 UTC
svn commit: r1354186 [1/33] - in /subversion/branches/inheritable-props: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/emacs/ contrib/server-side/ notes/
notes/api-errata/1.8/ notes/directory-in...
Author: pburba
Date: Tue Jun 26 19:26:49 2012
New Revision: 1354186
URL: http://svn.apache.org/viewvc?rev=1354186&view=rev
Log:
On the inheritable-props branch: Sync with ^/subversion/trunk through
r1354004.
Added:
subversion/branches/inheritable-props/notes/api-errata/1.8/
- copied from r1354004, subversion/trunk/notes/api-errata/1.8/
subversion/branches/inheritable-props/notes/wc-ng/conflict-storage-2.0
- copied unchanged from r1354004, subversion/trunk/notes/wc-ng/conflict-storage-2.0
subversion/branches/inheritable-props/subversion/libsvn_delta/deprecated.c
- copied unchanged from r1354004, subversion/trunk/subversion/libsvn_delta/deprecated.c
subversion/branches/inheritable-props/subversion/svnmucc/ (props changed)
- copied from r1354004, subversion/trunk/subversion/svnmucc/
subversion/branches/inheritable-props/subversion/tests/cmdline/merge_symmetric_tests.py
- copied unchanged from r1354004, subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svndumpfilter_tests_data/simple_v3.dump
- copied unchanged from r1354004, subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests_data/simple_v3.dump
subversion/branches/inheritable-props/subversion/tests/cmdline/svnsync_authz_tests.py
- copied unchanged from r1354004, subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py
subversion/branches/inheritable-props/subversion/tests/libsvn_wc/wc-queries-test.c
- copied unchanged from r1354004, subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/branches/inheritable-props/tools/dev/mergegraph/save_as_sh.py
- copied unchanged from r1354004, subversion/trunk/tools/dev/mergegraph/save_as_sh.py
Removed:
subversion/branches/inheritable-props/build/ac-macros/neon.m4
subversion/branches/inheritable-props/build/generator/templates/neon.dsp.ezt
subversion/branches/inheritable-props/build/generator/templates/neon.vcproj.ezt
subversion/branches/inheritable-props/build/generator/templates/neon.vcxproj.ezt
subversion/branches/inheritable-props/contrib/server-side/svn-fast-backup
subversion/branches/inheritable-props/subversion/libsvn_ra_neon/
subversion/branches/inheritable-props/tools/client-side/svnmucc/
Modified:
subversion/branches/inheritable-props/ (props changed)
subversion/branches/inheritable-props/CHANGES
subversion/branches/inheritable-props/COMMITTERS
subversion/branches/inheritable-props/Makefile.in
subversion/branches/inheritable-props/build.conf
subversion/branches/inheritable-props/build/ac-macros/swig.m4
subversion/branches/inheritable-props/build/generator/gen_make.py
subversion/branches/inheritable-props/build/generator/gen_msvc_dsp.py
subversion/branches/inheritable-props/build/generator/gen_vcnet_vcproj.py
subversion/branches/inheritable-props/build/generator/gen_win.py
subversion/branches/inheritable-props/build/generator/templates/vcnet_vcxproj.ezt
subversion/branches/inheritable-props/build/run_tests.py
subversion/branches/inheritable-props/build/transform_sql.py
subversion/branches/inheritable-props/build/win32/make_dist.py
subversion/branches/inheritable-props/build/win32/vc6-build.bat.in
subversion/branches/inheritable-props/configure.ac
subversion/branches/inheritable-props/contrib/client-side/emacs/dsvn.el
subversion/branches/inheritable-props/contrib/client-side/emacs/vc-svn.el
subversion/branches/inheritable-props/contrib/server-side/fsfsverify.py
subversion/branches/inheritable-props/gen-make.py
subversion/branches/inheritable-props/get-deps.sh
subversion/branches/inheritable-props/notes/directory-index/dirindex.py (props changed)
subversion/branches/inheritable-props/notes/directory-index/logimport.py (props changed)
subversion/branches/inheritable-props/notes/ev2-callbacks-template.c (contents, props changed)
subversion/branches/inheritable-props/notes/knobs
subversion/branches/inheritable-props/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/inheritable-props/subversion/bindings/javahl/native/JNIStackElement.cpp
subversion/branches/inheritable-props/subversion/bindings/javahl/native/JNIUtil.h
subversion/branches/inheritable-props/subversion/bindings/javahl/native/SVNBase.cpp
subversion/branches/inheritable-props/subversion/bindings/javahl/native/SVNBase.h
subversion/branches/inheritable-props/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/inheritable-props/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/inheritable-props/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/inheritable-props/subversion/bindings/javahl/native/SVNRepos.h
subversion/branches/inheritable-props/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/inheritable-props/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
subversion/branches/inheritable-props/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/inheritable-props/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/inheritable-props/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/inheritable-props/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/inheritable-props/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
subversion/branches/inheritable-props/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/inheritable-props/subversion/bindings/swig/core.i
subversion/branches/inheritable-props/subversion/include/private/svn_client_private.h
subversion/branches/inheritable-props/subversion/include/private/svn_dav_protocol.h
subversion/branches/inheritable-props/subversion/include/private/svn_delta_private.h (props changed)
subversion/branches/inheritable-props/subversion/include/private/svn_fs_util.h
subversion/branches/inheritable-props/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/inheritable-props/subversion/include/private/svn_named_atomic.h
subversion/branches/inheritable-props/subversion/include/private/svn_ra_private.h
subversion/branches/inheritable-props/subversion/include/private/svn_repos_private.h
subversion/branches/inheritable-props/subversion/include/private/svn_sqlite.h
subversion/branches/inheritable-props/subversion/include/private/svn_subr_private.h
subversion/branches/inheritable-props/subversion/include/private/svn_wc_private.h
subversion/branches/inheritable-props/subversion/include/svn_auth.h
subversion/branches/inheritable-props/subversion/include/svn_client.h
subversion/branches/inheritable-props/subversion/include/svn_delta.h
subversion/branches/inheritable-props/subversion/include/svn_editor.h
subversion/branches/inheritable-props/subversion/include/svn_error.h
subversion/branches/inheritable-props/subversion/include/svn_error_codes.h
subversion/branches/inheritable-props/subversion/include/svn_fs.h
subversion/branches/inheritable-props/subversion/include/svn_hash.h
subversion/branches/inheritable-props/subversion/include/svn_io.h
subversion/branches/inheritable-props/subversion/include/svn_path.h
subversion/branches/inheritable-props/subversion/include/svn_props.h
subversion/branches/inheritable-props/subversion/include/svn_ra.h
subversion/branches/inheritable-props/subversion/include/svn_repos.h
subversion/branches/inheritable-props/subversion/include/svn_sorts.h
subversion/branches/inheritable-props/subversion/include/svn_types.h
subversion/branches/inheritable-props/subversion/include/svn_wc.h
subversion/branches/inheritable-props/subversion/include/svn_xml.h
subversion/branches/inheritable-props/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/inheritable-props/subversion/libsvn_client/blame.c
subversion/branches/inheritable-props/subversion/libsvn_client/cat.c
subversion/branches/inheritable-props/subversion/libsvn_client/checkout.c
subversion/branches/inheritable-props/subversion/libsvn_client/client.h
subversion/branches/inheritable-props/subversion/libsvn_client/commit.c
subversion/branches/inheritable-props/subversion/libsvn_client/commit_util.c
subversion/branches/inheritable-props/subversion/libsvn_client/copy.c
subversion/branches/inheritable-props/subversion/libsvn_client/delete.c
subversion/branches/inheritable-props/subversion/libsvn_client/deprecated.c
subversion/branches/inheritable-props/subversion/libsvn_client/diff.c
subversion/branches/inheritable-props/subversion/libsvn_client/export.c
subversion/branches/inheritable-props/subversion/libsvn_client/externals.c
subversion/branches/inheritable-props/subversion/libsvn_client/info.c
subversion/branches/inheritable-props/subversion/libsvn_client/list.c
subversion/branches/inheritable-props/subversion/libsvn_client/locking_commands.c
subversion/branches/inheritable-props/subversion/libsvn_client/log.c
subversion/branches/inheritable-props/subversion/libsvn_client/merge.c
subversion/branches/inheritable-props/subversion/libsvn_client/mergeinfo.c
subversion/branches/inheritable-props/subversion/libsvn_client/patch.c
subversion/branches/inheritable-props/subversion/libsvn_client/prop_commands.c
subversion/branches/inheritable-props/subversion/libsvn_client/ra.c
subversion/branches/inheritable-props/subversion/libsvn_client/repos_diff.c
subversion/branches/inheritable-props/subversion/libsvn_client/resolved.c
subversion/branches/inheritable-props/subversion/libsvn_client/revisions.c
subversion/branches/inheritable-props/subversion/libsvn_client/status.c
subversion/branches/inheritable-props/subversion/libsvn_client/switch.c
subversion/branches/inheritable-props/subversion/libsvn_client/update.c
subversion/branches/inheritable-props/subversion/libsvn_client/util.c
subversion/branches/inheritable-props/subversion/libsvn_delta/compat.c
subversion/branches/inheritable-props/subversion/libsvn_delta/debug_editor.c
subversion/branches/inheritable-props/subversion/libsvn_delta/editor.c
subversion/branches/inheritable-props/subversion/libsvn_delta/path_driver.c
subversion/branches/inheritable-props/subversion/libsvn_delta/svndiff.c
subversion/branches/inheritable-props/subversion/libsvn_delta/text_delta.c
subversion/branches/inheritable-props/subversion/libsvn_delta/xdelta.c
subversion/branches/inheritable-props/subversion/libsvn_diff/diff_file.c
subversion/branches/inheritable-props/subversion/libsvn_diff/diff_memory.c
subversion/branches/inheritable-props/subversion/libsvn_fs/editor.c (contents, props changed)
subversion/branches/inheritable-props/subversion/libsvn_fs/fs-loader.c
subversion/branches/inheritable-props/subversion/libsvn_fs/fs-loader.h
subversion/branches/inheritable-props/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
subversion/branches/inheritable-props/subversion/libsvn_fs_base/bdb/locks-table.c
subversion/branches/inheritable-props/subversion/libsvn_fs_base/err.c
subversion/branches/inheritable-props/subversion/libsvn_fs_base/fs.c
subversion/branches/inheritable-props/subversion/libsvn_fs_base/fs.h
subversion/branches/inheritable-props/subversion/libsvn_fs_base/lock.c
subversion/branches/inheritable-props/subversion/libsvn_fs_base/tree.c
subversion/branches/inheritable-props/subversion/libsvn_fs_base/uuid.c
subversion/branches/inheritable-props/subversion/libsvn_fs_base/uuid.h
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/caching.c
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/dag.c
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/fs.c
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/fs.h
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/key-gen.c
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/lock.c
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/rep-cache-db.sql
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/inheritable-props/subversion/libsvn_fs_fs/tree.c
subversion/branches/inheritable-props/subversion/libsvn_ra/compat.c
subversion/branches/inheritable-props/subversion/libsvn_ra/debug_reporter.c
subversion/branches/inheritable-props/subversion/libsvn_ra/editor.c (props changed)
subversion/branches/inheritable-props/subversion/libsvn_ra/ra_loader.c
subversion/branches/inheritable-props/subversion/libsvn_ra/ra_loader.h
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/blame.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/commit.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/getdate.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/getlocks.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/inherited_props.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/locks.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/log.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/merge.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/options.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/property.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/replay.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/serf.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/update.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/util.c
subversion/branches/inheritable-props/subversion/libsvn_ra_serf/xml.c
subversion/branches/inheritable-props/subversion/libsvn_ra_svn/client.c
subversion/branches/inheritable-props/subversion/libsvn_ra_svn/editorp.c
subversion/branches/inheritable-props/subversion/libsvn_ra_svn/marshal.c
subversion/branches/inheritable-props/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/inheritable-props/subversion/libsvn_repos/commit.c
subversion/branches/inheritable-props/subversion/libsvn_repos/deprecated.c
subversion/branches/inheritable-props/subversion/libsvn_repos/dump.c
subversion/branches/inheritable-props/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/inheritable-props/subversion/libsvn_repos/load.c
subversion/branches/inheritable-props/subversion/libsvn_repos/replay.c
subversion/branches/inheritable-props/subversion/libsvn_repos/repos.c
subversion/branches/inheritable-props/subversion/libsvn_subr/adler32.c
subversion/branches/inheritable-props/subversion/libsvn_subr/auth.c
subversion/branches/inheritable-props/subversion/libsvn_subr/base64.c
subversion/branches/inheritable-props/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/inheritable-props/subversion/libsvn_subr/cache-memcache.c
subversion/branches/inheritable-props/subversion/libsvn_subr/cache.c
subversion/branches/inheritable-props/subversion/libsvn_subr/checksum.c
subversion/branches/inheritable-props/subversion/libsvn_subr/config_file.c
subversion/branches/inheritable-props/subversion/libsvn_subr/dirent_uri.c
subversion/branches/inheritable-props/subversion/libsvn_subr/error.c
subversion/branches/inheritable-props/subversion/libsvn_subr/hash.c
subversion/branches/inheritable-props/subversion/libsvn_subr/internal_statements.sql
subversion/branches/inheritable-props/subversion/libsvn_subr/io.c
subversion/branches/inheritable-props/subversion/libsvn_subr/lock.c
subversion/branches/inheritable-props/subversion/libsvn_subr/named_atomic.c
subversion/branches/inheritable-props/subversion/libsvn_subr/opt.c
subversion/branches/inheritable-props/subversion/libsvn_subr/path.c
subversion/branches/inheritable-props/subversion/libsvn_subr/pool.c
subversion/branches/inheritable-props/subversion/libsvn_subr/properties.c
subversion/branches/inheritable-props/subversion/libsvn_subr/quoprint.c
subversion/branches/inheritable-props/subversion/libsvn_subr/skel.c
subversion/branches/inheritable-props/subversion/libsvn_subr/spillbuf.c
subversion/branches/inheritable-props/subversion/libsvn_subr/sqlite.c
subversion/branches/inheritable-props/subversion/libsvn_subr/stream.c
subversion/branches/inheritable-props/subversion/libsvn_subr/string.c
subversion/branches/inheritable-props/subversion/libsvn_subr/temp_serializer.c
subversion/branches/inheritable-props/subversion/libsvn_subr/win32_crashrpt.c
subversion/branches/inheritable-props/subversion/libsvn_subr/win32_crypto.c
subversion/branches/inheritable-props/subversion/libsvn_subr/xml.c
subversion/branches/inheritable-props/subversion/libsvn_wc/adm_crawler.c
subversion/branches/inheritable-props/subversion/libsvn_wc/adm_files.c
subversion/branches/inheritable-props/subversion/libsvn_wc/adm_ops.c
subversion/branches/inheritable-props/subversion/libsvn_wc/conflicts.c
subversion/branches/inheritable-props/subversion/libsvn_wc/copy.c
subversion/branches/inheritable-props/subversion/libsvn_wc/deprecated.c
subversion/branches/inheritable-props/subversion/libsvn_wc/diff_local.c
subversion/branches/inheritable-props/subversion/libsvn_wc/entries.c
subversion/branches/inheritable-props/subversion/libsvn_wc/externals.c
subversion/branches/inheritable-props/subversion/libsvn_wc/lock.c
subversion/branches/inheritable-props/subversion/libsvn_wc/merge.c
subversion/branches/inheritable-props/subversion/libsvn_wc/node.c
subversion/branches/inheritable-props/subversion/libsvn_wc/old-and-busted.c
subversion/branches/inheritable-props/subversion/libsvn_wc/props.c
subversion/branches/inheritable-props/subversion/libsvn_wc/questions.c
subversion/branches/inheritable-props/subversion/libsvn_wc/status.c
subversion/branches/inheritable-props/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/inheritable-props/subversion/libsvn_wc/update_editor.c
subversion/branches/inheritable-props/subversion/libsvn_wc/upgrade.c
subversion/branches/inheritable-props/subversion/libsvn_wc/util.c
subversion/branches/inheritable-props/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/inheritable-props/subversion/libsvn_wc/wc-queries.sql
subversion/branches/inheritable-props/subversion/libsvn_wc/wc.h
subversion/branches/inheritable-props/subversion/libsvn_wc/wc_db.c
subversion/branches/inheritable-props/subversion/libsvn_wc/wc_db.h
subversion/branches/inheritable-props/subversion/libsvn_wc/wc_db_pristine.c
subversion/branches/inheritable-props/subversion/libsvn_wc/wc_db_util.c
subversion/branches/inheritable-props/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/inheritable-props/subversion/libsvn_wc/workqueue.c
subversion/branches/inheritable-props/subversion/libsvn_wc/workqueue.h
subversion/branches/inheritable-props/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/inheritable-props/subversion/mod_dav_svn/liveprops.c
subversion/branches/inheritable-props/subversion/mod_dav_svn/lock.c
subversion/branches/inheritable-props/subversion/mod_dav_svn/mirror.c
subversion/branches/inheritable-props/subversion/mod_dav_svn/reports/update.c
subversion/branches/inheritable-props/subversion/mod_dav_svn/repos.c
subversion/branches/inheritable-props/subversion/po/de.po
subversion/branches/inheritable-props/subversion/po/fr.po
subversion/branches/inheritable-props/subversion/svn/blame-cmd.c
subversion/branches/inheritable-props/subversion/svn/cl.h
subversion/branches/inheritable-props/subversion/svn/conflict-callbacks.c
subversion/branches/inheritable-props/subversion/svn/diff-cmd.c
subversion/branches/inheritable-props/subversion/svn/import-cmd.c
subversion/branches/inheritable-props/subversion/svn/log-cmd.c
subversion/branches/inheritable-props/subversion/svn/main.c
subversion/branches/inheritable-props/subversion/svn/merge-cmd.c
subversion/branches/inheritable-props/subversion/svn/mergeinfo-cmd.c
subversion/branches/inheritable-props/subversion/svn/notify.c
subversion/branches/inheritable-props/subversion/svn/propget-cmd.c
subversion/branches/inheritable-props/subversion/svn/props.c
subversion/branches/inheritable-props/subversion/svn/resolve-cmd.c
subversion/branches/inheritable-props/subversion/svn/status-cmd.c
subversion/branches/inheritable-props/subversion/svnadmin/main.c
subversion/branches/inheritable-props/subversion/svndumpfilter/main.c
subversion/branches/inheritable-props/subversion/svnlook/main.c
subversion/branches/inheritable-props/subversion/svnrdump/dump_editor.c
subversion/branches/inheritable-props/subversion/svnrdump/load_editor.c
subversion/branches/inheritable-props/subversion/svnrdump/svnrdump.c
subversion/branches/inheritable-props/subversion/svnserve/cyrus_auth.c
subversion/branches/inheritable-props/subversion/svnserve/main.c
subversion/branches/inheritable-props/subversion/svnserve/serve.c
subversion/branches/inheritable-props/subversion/svnsync/sync.c
subversion/branches/inheritable-props/subversion/svnversion/main.c
subversion/branches/inheritable-props/subversion/tests/cmdline/atomic-ra-revprop-change.c
subversion/branches/inheritable-props/subversion/tests/cmdline/authz_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/autoprop_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/basic_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/blame_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/changelist_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/commit_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/copy_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/davautocheck.sh
subversion/branches/inheritable-props/subversion/tests/cmdline/depth_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/diff_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/entries-dump.c
subversion/branches/inheritable-props/subversion/tests/cmdline/entries_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/export_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/externals_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/getopt_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/inheritable-props/subversion/tests/cmdline/import_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/lock_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/log_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/merge_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/patch_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/prop_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/revert_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/schedule_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/special_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/stat_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/inheritable-props/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump
subversion/branches/inheritable-props/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
subversion/branches/inheritable-props/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump
subversion/branches/inheritable-props/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
subversion/branches/inheritable-props/subversion/tests/cmdline/svntest/actions.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svntest/err.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svntest/main.py
subversion/branches/inheritable-props/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/inheritable-props/subversion/tests/cmdline/switch_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/inheritable-props/subversion/tests/cmdline/update_tests.py
subversion/branches/inheritable-props/subversion/tests/libsvn_client/client-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_delta/random-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_delta/svndiff-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_delta/vdelta-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_delta/window-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_subr/skel-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_subr/string-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_subr/utf-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_wc/ (props changed)
subversion/branches/inheritable-props/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/inheritable-props/subversion/tests/libsvn_wc/utils.c
subversion/branches/inheritable-props/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
subversion/branches/inheritable-props/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
subversion/branches/inheritable-props/tools/buildbot/slaves/bb-openbsd/svncheck.sh
subversion/branches/inheritable-props/tools/buildbot/slaves/bb-openbsd/svnclean.sh
subversion/branches/inheritable-props/tools/buildbot/slaves/centos/svnbuild.sh
subversion/branches/inheritable-props/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
subversion/branches/inheritable-props/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/inheritable-props/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
subversion/branches/inheritable-props/tools/client-side/bash_completion
subversion/branches/inheritable-props/tools/client-side/mergeinfo-sanitizer.py (props changed)
subversion/branches/inheritable-props/tools/dev/benchmarks/large_dirs/create_bigdir.sh
subversion/branches/inheritable-props/tools/dev/gdb-py/svndbg/__init__.py (props changed)
subversion/branches/inheritable-props/tools/dev/gdb-py/svndbg/printers.py (contents, props changed)
subversion/branches/inheritable-props/tools/dev/gen-py-errors.py
subversion/branches/inheritable-props/tools/dev/histogram.py (props changed)
subversion/branches/inheritable-props/tools/dev/mergegraph/mergegraph.py
subversion/branches/inheritable-props/tools/dev/sbox-ospath.py (props changed)
subversion/branches/inheritable-props/tools/dev/svnraisetreeconflict/main.c
subversion/branches/inheritable-props/tools/dev/unix-build/Makefile.svn
subversion/branches/inheritable-props/tools/dev/unix-build/README
subversion/branches/inheritable-props/tools/dev/windows-build/Makefile
subversion/branches/inheritable-props/tools/dist/nightly.sh
subversion/branches/inheritable-props/tools/dist/release.py
subversion/branches/inheritable-props/tools/server-side/svnauthz-validate.c
subversion/branches/inheritable-props/tools/server-side/svnpredumpfilter.py (props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/commit-hook.py (props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/daemonize.py (props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/example.conf
subversion/branches/inheritable-props/tools/server-side/svnpubsub/svnpubsub/__init__.py (props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/svnpubsub/client.py (props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/svnpubsub/server.py (props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/svntweet.py (contents, props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/svnwcsub.py (contents, props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/testserver.py (props changed)
subversion/branches/inheritable-props/tools/server-side/svnpubsub/watcher.py (props changed)
subversion/branches/inheritable-props/win-tests.py
Propchange: subversion/branches/inheritable-props/
------------------------------------------------------------------------------
Merged /subversion/branches/javahl-ra:r1342682,1344977
Merged /subversion/trunk:r1330575-1354004
Merged /subversion/branches/ev2-export:r1332738
Modified: subversion/branches/inheritable-props/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/CHANGES?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/CHANGES (original)
+++ subversion/branches/inheritable-props/CHANGES Tue Jun 26 19:26:49 2012
@@ -19,9 +19,12 @@ http://svn.apache.org/repos/asf/subversi
* new SVNUseUTF8 configuration option for mod_dav_svn (issue #2487)
* new SVNHooksEnv configuration option for mod_dav_svn (r1239966)
* new --ignore-properties option for 'svn diff' (r1239553. -617)
+ * new --properties-only option for 'svn diff' (r1336110)
* new --patch-compatible option for 'svn diff' (r1239561)
* new SvnPubSub distributed commit hooks (tools/server-side/svnpubsub)
* 'svn diff' can compare arbitrary files and directories (r1310291, et al)
+ * ra_serf avoids re-downloading content present in pristine store (r1333936)
+ * 'svn mergeinfo' now honors the --revision (-r) option (issue #4199)
- Client-side bugfixes:
*
@@ -30,7 +33,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:
@@ -44,7 +47,7 @@ http://svn.apache.org/repos/asf/subversi
Version 1.7.5
-(26 Apr 2012, from /branches/1.7.x)
+(17 May 2012, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.5
User-visible changes:
@@ -66,6 +69,13 @@ http://svn.apache.org/repos/asf/subversi
* 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)
@@ -79,10 +89,12 @@ http://svn.apache.org/repos/asf/subversi
Developer-visible changes:
- General:
* windows example distribution scripts: include svnrdump (r1295007)
+ * fix running the test suite with jsvn (r1335555)
- Bindings:
* swig-py tests: avoid FAILs on APR hash order (r1296137, r1292248)
* swig-rb tests: avoid FAILs on APR hash order (r1310535, r1310594)
+ * swig-pl: Improved perl detection in gen-make.py (r1291797, r1291810)
Version 1.7.4
Modified: subversion/branches/inheritable-props/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/COMMITTERS?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/COMMITTERS [UTF-8] (original)
+++ subversion/branches/inheritable-props/COMMITTERS [UTF-8] Tue Jun 26 19:26:49 2012
@@ -13,7 +13,7 @@ Blanket commit access:
sussman Ben Collins-Sussman <su...@red-bean.com>
kfogel Karl Fogel <kf...@red-bean.com>
gstein Greg Stein <gs...@gmail.com>
- brane Branko Čibej <br...@xbc.nu>
+ brane Branko Čibej <br...@apache.org>
jorton Joe Orton <jo...@manyfish.co.uk>
ghudson Greg Hudson <gh...@mit.edu>
fitz Brian W. Fitzpatrick <fi...@red-bean.com>
@@ -93,8 +93,9 @@ Commit access for specific areas:
clkao Chia-liang Kao <cl...@clkao.org> (Swig-Perl b.)
joeswatosh Joe Swatosh <jo...@gmail.com> (Swig-Ruby b.)
jrvernooij Jelmer Vernooij <je...@samba.org> (Python bindings)
- sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python bindings)
- rdonch Роман Донченко <DX...@yandex.ru> (Swig-Python b.)
+ sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python b.)
+ rdonch Роман Донченко <dp...@corrigendum.ru> (Swig-Python b.)
+ vmpn Vladimir Berezniker <vm...@hitechman.com> (JavaHL bindings)
Packages:
@@ -201,6 +202,7 @@ giorgio_valoti Giorgio Valoti <giorgio
br.)
holden Holden Karau <ho...@pigscanfly.ca> (scheme-bindings br.)
moklo Morten Kloster <mo...@gmail.com> (diff-improvements br.)
+ vmpn Vladimir Berezniker <vm...@hitechman.com> (javahl-ra br.)
Subprojects that are complete, abandoned or have moved elsewhere:
Modified: subversion/branches/inheritable-props/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/Makefile.in?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/Makefile.in (original)
+++ subversion/branches/inheritable-props/Makefile.in Tue Jun 26 19:26:49 2012
@@ -42,7 +42,6 @@ SVN_EXTERNAL_PROJECT_SUBDIRS = @SVN_EXTE
SCHEMA_DIR = subversion/svn/schema
-NEON_LIBS = @NEON_LIBS@
SVN_APR_LIBS = @SVN_APR_LIBS@
SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
SVN_APR_MEMCACHE_LIBS = @SVN_APR_MEMCACHE_LIBS@
@@ -70,7 +69,6 @@ gnome_keyring_libdir = @libdir@
gpg_agent_libdir = @libdir@
gssapi_libdir = @libdir@
kwallet_libdir = @libdir@
-neon_libdir = @libdir@
serf_libdir = @libdir@
bindir = @bindir@
includedir = @includedir@
@@ -129,7 +127,7 @@ LT_CXX_LIBADD = @LT_CXX_LIBADD@
INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \
@SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_APR_MEMCACHE_INCLUDES@ \
@SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ @SVN_GSSAPI_INCLUDES@ \
- @SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ @SVN_NEON_INCLUDES@ \
+ @SVN_KWALLET_INCLUDES@ @SVN_MAGIC_INCLUDES@ \
@SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ @SVN_SQLITE_INCLUDES@ \
@SVN_XML_INCLUDES@ @SVN_ZLIB_INCLUDES@
@@ -218,7 +216,6 @@ libsvn_fs_fs_LDFLAGS = @libsvn_fs_fs_LDF
libsvn_fs_util_LDFLAGS = @libsvn_fs_util_LDFLAGS@
libsvn_ra_LDFLAGS = @libsvn_ra_LDFLAGS@
libsvn_ra_local_LDFLAGS = @libsvn_ra_local_LDFLAGS@
-libsvn_ra_neon_LDFLAGS = @libsvn_ra_neon_LDFLAGS@
libsvn_ra_serf_LDFLAGS = @libsvn_ra_serf_LDFLAGS@
libsvn_ra_svn_LDFLAGS = @libsvn_ra_svn_LDFLAGS@
libsvn_repos_LDFLAGS = @libsvn_repos_LDFLAGS@
@@ -245,7 +242,6 @@ INSTALL_GPG_AGENT_LIB = $(INSTALL_LIB)
INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
INSTALL_GSSAPI_LIB = $(INSTALL_LIB)
INSTALL_KWALLET_LIB = $(INSTALL_LIB)
-INSTALL_NEON_LIB = $(INSTALL_LIB)
INSTALL_SERF_LIB = $(INSTALL_LIB)
INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
@@ -451,7 +447,7 @@ check-all-javahl: check-apache-javahl ch
# "make check CLEANUP=true" will clean up directories for successful tests.
# "make check TESTS=subversion/tests/cmdline/basic_tests.py"
# will perform only basic tests (likewise for other tests).
-check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc
+check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@
@if test "$(PYTHON)" != "none"; then \
flags="--verbose"; \
if test "$(CLEANUP)" != ""; then \
@@ -491,6 +487,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
if test "$(SET_LOG_LEVEL)" != ""; then \
flags="--set-log-level $(SET_LOG_LEVEL) $$flags"; \
fi; \
+ if test "$(SSL_CERT)" != ""; then \
+ flags="--ssl-cert $(SSL_CERT) $$flags"; \
+ fi; \
LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)' \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
@@ -504,38 +503,38 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
# First, set up Apache as documented in
# subversion/tests/cmdline/README.
-davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
+davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
@$(MAKE) check BASE_URL=http://localhost
# Automatically configure and run Apache httpd on a random port, and then
# run make check.
-davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc
+davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
@APXS=$(APXS) $(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:
@@ -584,15 +583,9 @@ external-clean external-distclean extern
revlist="$$i $$revlist"; \
done; \
for i in $$revlist; do \
- if test "$$i" = "neon" -a "$$target" = "extraclean"; then \
- echo "------ making distclean (no extraclean) in $$i"; \
- (cd $$i && $(MAKE) distclean) || exit 1; \
- echo "------ completed distclean (no extraclean) in $$i"; \
- else \
- echo "------ making $$target in $$i"; \
- (cd $$i && $(MAKE) $$target) || exit 1; \
- echo "------ completed $$target in $$i"; \
- fi; \
+ echo "------ making $$target in $$i"; \
+ (cd $$i && $(MAKE) $$target) || exit 1; \
+ echo "------ completed $$target in $$i"; \
done;
@@ -863,3 +856,11 @@ clean-ctypes-python:
# manually describe a dependency, which we won't otherwise detect
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-checks.sql
+
+# Compatibility symlink.
+# This runs after the target of the same name in build-outputs.mk.
+INSTALL_EXTRA_TOOLS=\
+ $(MKDIR) $(DESTDIR)$(bindir); \
+ test -n "$$SVN_SVNMUCC_IS_SVNSYITF" && \
+ ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
+ ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
Modified: subversion/branches/inheritable-props/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build.conf?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build.conf (original)
+++ subversion/branches/inheritable-props/build.conf Tue Jun 26 19:26:49 2012
@@ -84,32 +84,13 @@ swig-checkout-files = common.swg swigrun
# BUILD TARGETS
#
-# Explanation for the seemingly-spurious mention of 'neon' in the libs lines
-# for svn, svnsync, ra-local-test, client-test, svn-push and svnmucc:
-# This is a workaround for a libtool bug, which manifests on Linux and similar
-# ELF platforms, when linking to an installed Neon, and there are old
-# Subversion libraries in the same directory as the installed Neon. In such
-# cases, the run-before-installing version of the executables (.libs/lt-foo),
-# gets given an ELF RPATH which includes the install directory *before* all the
-# uninstalled libsvn_foo/.libs directories have been mentioned. This occurs
-# because when libtool is at the point of handling Neon, it adds an RPATH entry
-# pointing to its directory, but fails to correctly consider that it should
-# prioritize all the RPATH entries for *un*installed libraries before all those
-# for installed libraries, to avoid this bug. As a kludgy workaround, we add
-# a mention of 'neon' to the end of the libs lines for executables which
-# indirectly link to libsvn_ra_neon, which has the effect of 'pulling' the
-# harmful RPATH entry toward the end of RPATH, enabling the executables to run
-# correctly before installation, even when old versions of the Subversion
-# libraries are present.
-# This bug was last confirmed to be present in libtool 1.5.22.
-
# The subversion command-line client
[svn]
description = Subversion Client
type = exe
path = subversion/svn
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr
- apriconv apr neon
+ apriconv apr
manpages = subversion/svn/svn.1
install = bin
@@ -154,7 +135,7 @@ msvc-libs = advapi32.lib ws2_32.lib
description = Subversion repository replicator
type = exe
path = subversion/svnsync
-libs = libsvn_ra libsvn_delta libsvn_subr apr neon
+libs = libsvn_ra libsvn_delta libsvn_subr apr
install = bin
manpages = subversion/svnsync/svnsync.1
@@ -174,6 +155,14 @@ libs = libsvn_client libsvn_ra libsvn_re
install = bin
manpages = subversion/svnrdump/svnrdump.1
+[svnmucc]
+description = Subversion Multiple URL Command Client
+type = exe
+path = subversion/svnmucc
+libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
+install = bin
+manpages = subversion/svnmucc/svnmucc.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -266,14 +255,6 @@ add-install-deps = $(SVN_RA_LIB_INSTALL_
install = lib
msvc-export = svn_ra.h private\svn_ra_private.h
-# Accessing repositories via DAV through neon
-[libsvn_ra_neon]
-type = ra-module
-path = subversion/libsvn_ra_neon
-install = neon-lib
-libs = libsvn_delta libsvn_subr aprutil apriconv apr neon
-msvc-static = yes
-
# Accessing repositories via DAV through serf
[libsvn_ra_serf]
type = ra-module
@@ -607,7 +588,7 @@ description = Subversion Java HighLevel
type = lib
path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
- libsvn_subr libsvn_fs aprutil apriconv apr neon
+ libsvn_subr libsvn_fs aprutil apriconv apr
sources = *.cpp *.c
add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS)
install = javahl-lib
@@ -924,7 +905,7 @@ type = exe
path = subversion/tests/libsvn_client
sources = client-test.c
install = test
-libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr neon
+libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
@@ -955,7 +936,7 @@ path = subversion/tests/libsvn_ra_local
sources = ra-local-test.c
install = test
libs = libsvn_test libsvn_ra_local libsvn_ra libsvn_fs libsvn_delta libsvn_subr
- apriconv apr neon
+ apriconv apr
# ----------------------------------------------------------------------------
# Tests for libsvn_wc
@@ -1000,6 +981,14 @@ sources = op-depth-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
+[wc-queries-test]
+description = Test Sqlite query evaluation
+type = exe
+path = subversion/tests/libsvn_wc
+sources = wc-queries-test.c
+install = test
+libs = libsvn_test libsvn_subr apriconv apr sqlite
+
# ----------------------------------------------------------------------------
# These are not unit tests at all, they are small programs that exercise
# parts of the libsvn_delta API from the command line. They are stuck here
@@ -1104,14 +1093,6 @@ external-lib = $(SVN_ZLIB_LIBS)
external-project = zlib
msvc-static = yes
-[neon]
-type = lib
-external-lib = $(NEON_LIBS)
-external-project = neon/neon
-libs = xml
-msvc-libs = ws2_32.lib
-msvc-static = yes
-
[apr_memcache]
type = lib
external-lib = $(SVN_APR_MEMCACHE_LIBS)
@@ -1134,7 +1115,7 @@ external-lib = $(SVN_XML_LIBS)
[ra-libs]
type = lib
external-lib = $(SVN_RA_LIB_LINK)
-libs = libsvn_ra_neon libsvn_ra_serf libsvn_ra_local libsvn_ra_svn
+libs = libsvn_ra_serf libsvn_ra_local libsvn_ra_svn
[fs-libs]
type = lib
@@ -1169,7 +1150,7 @@ libs = __ALL__
diff diff3 diff4
client-test
tree-conflict-data-test db-test pristine-store-test entries-compat-test
- op-depth-test dirent_uri-test
+ op-depth-test dirent_uri-test wc-queries-test
auth-test
parse-diff-test
svn-rep-sharing-stats svn-populate-node-origins-index
@@ -1178,7 +1159,7 @@ libs = __ALL__
type = project
path = build/win32
libs = fs-libs ra-libs libsvn_client libsvn_subr libsvn_wc
- aprutil apriconv apr neon
+ aprutil apriconv apr
[__CONFIG__]
type = lib
@@ -1215,13 +1196,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/inheritable-props/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/ac-macros/swig.m4?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/ac-macros/swig.m4 (original)
+++ subversion/branches/inheritable-props/build/ac-macros/swig.m4 Tue Jun 26 19:26:49 2012
@@ -120,6 +120,10 @@ AC_DEFUN(SVN_FIND_SWIG,
])
SWIG_PY_COMPILE="$ac_cv_python_compile $CFLAGS"
+ dnl Swig-generated code results in a number of shadowed variables, so
+ dnl ignore those warnings when compiling swig-py
+ SWIG_PY_COMPILE=`echo "$SWIG_PY_COMPILE" | $SED -e 's/-Wshadow //'`
+
AC_CACHE_CHECK([for linking Python extensions], [ac_cv_python_link],[
ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
])
@@ -187,7 +191,7 @@ AC_DEFUN(SVN_FIND_SWIG,
for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
rubyhdrdir sitedir sitelibdir sitearchdir libdir
do
- rbconfig_tmp=`$rbconfig "print Config::CONFIG@<:@'$var_name'@:>@"`
+ rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG@<:@'$var_name'@:>@"`
eval "rbconfig_$var_name=\"$rbconfig_tmp\""
done
Modified: subversion/branches/inheritable-props/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/generator/gen_make.py?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/generator/gen_make.py (original)
+++ subversion/branches/inheritable-props/build/generator/gen_make.py Tue Jun 26 19:26:49 2012
@@ -422,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/inheritable-props/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/generator/gen_msvc_dsp.py?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/generator/gen_msvc_dsp.py (original)
+++ subversion/branches/inheritable-props/build/generator/gen_msvc_dsp.py Tue Jun 26 19:26:49 2012
@@ -129,7 +129,6 @@ class Generator(gen_win.WinGeneratorBase
('project_guid', self.makeguid('svn_locale')),
))
self.write_zlib_project_file('zlib.dsp')
- self.write_neon_project_file('neon.dsp')
self.write_serf_project_file('serf.dsp')
install_targets = self.get_install_targets()
Modified: subversion/branches/inheritable-props/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/generator/gen_vcnet_vcproj.py?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/inheritable-props/build/generator/gen_vcnet_vcproj.py Tue Jun 26 19:26:49 2012
@@ -124,10 +124,6 @@ class Generator(gen_win.WinGeneratorBase
self.write_with_template(fname, 'templates/vcnet_vcxproj.ezt', data)
self.write_with_template(fname + '.filters', 'templates/vcnet_vcxproj_filters.ezt', data)
- def find_rootpath(self):
- "Gets the root path as understand by the project system"
- return "$(SolutionDir)"
-
def write(self):
"Write a Solution (.sln)"
@@ -160,7 +156,6 @@ class Generator(gen_win.WinGeneratorBase
('project_guid', self.makeguid('svn_locale')),
))
self.write_zlib_project_file('zlib' + self.vcproj_extension)
- self.write_neon_project_file('neon' + self.vcproj_extension)
self.write_serf_project_file('serf' + self.vcproj_extension)
install_targets = self.get_install_targets()
@@ -203,7 +198,8 @@ class Generator(gen_win.WinGeneratorBase
if depends[i].fname.startswith(self.projfilesdir):
path = depends[i].fname[len(self.projfilesdir) + 1:]
else:
- path = '$(SolutionDir)' + depends[i].fname
+ path = os.path.join(os.path.relpath('.', self.projfilesdir),
+ depends[i].fname)
deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],
index=i,
path=path,
Modified: subversion/branches/inheritable-props/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/generator/gen_win.py?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/generator/gen_win.py (original)
+++ subversion/branches/inheritable-props/build/generator/gen_win.py Tue Jun 26 19:26:49 2012
@@ -73,9 +73,6 @@ class GeneratorBase(gen_base.GeneratorBa
self.serf_path = None
self.serf_lib = None
self.bdb_path = 'db4-win32'
- self.without_neon = False
- self.neon_path = 'neon'
- self.neon_ver = 25005
self.httpd_path = None
self.libintl_path = None
self.zlib_path = 'zlib'
@@ -119,10 +116,6 @@ class GeneratorBase(gen_base.GeneratorBa
self.apr_iconv_path = val
elif opt == '--with-serf':
self.serf_path = val
- elif opt == '--with-neon':
- self.neon_path = val
- elif opt == '--without-neon':
- self.without_neon = True
elif opt == '--with-httpd':
self.httpd_path = val
del self.skip_sections['mod_dav_svn']
@@ -188,8 +181,8 @@ class GeneratorBase(gen_base.GeneratorBa
self.sln_version = '11.00'
self.vcproj_version = '10.0'
self.vcproj_extension = '.vcxproj'
- elif val == '11':
- self.vs_version = '11'
+ elif val == '2012' or val == '11':
+ self.vs_version = '2012'
self.sln_version = '12.00'
self.vcproj_version = '11.0'
self.vcproj_extension = '.vcxproj'
@@ -270,10 +263,6 @@ class WinGeneratorBase(GeneratorBase):
self._find_zlib()
self._find_ml()
- # Find neon version
- if self.neon_path:
- self._find_neon()
-
# Find serf and its dependencies
if self.serf_path:
self._find_serf()
@@ -391,9 +380,6 @@ class WinGeneratorBase(GeneratorBase):
if not self.serf_lib:
install_targets = [x for x in install_targets if x.name != 'serf']
install_targets = [x for x in install_targets if x.name != 'libsvn_ra_serf']
- if self.without_neon:
- install_targets = [x for x in install_targets if x.name != 'neon']
- install_targets = [x for x in install_targets if x.name != 'libsvn_ra_neon']
# Drop the swig targets if we don't have swig
if not self.swig_path and not self.swig_libdir:
@@ -690,9 +676,7 @@ class WinGeneratorBase(GeneratorBase):
and target.external_project):
return None
- if target.external_project[:5] == 'neon/':
- path = self.neon_path + target.external_project[4:]
- elif target.external_project[:5] == 'serf/' and self.serf_lib:
+ if target.external_project[:5] == 'serf/' and self.serf_lib:
path = self.serf_path + target.external_project[4:]
elif target.external_project.find('/') != -1:
path = target.external_project
@@ -715,8 +699,8 @@ class WinGeneratorBase(GeneratorBase):
if self.enable_nls and name == '__ALL__':
depends.extend(self.sections['locale'].get_targets())
- # Build ZLib as a dependency of Neon or Serf if we have it
- if self.zlib_path and (name == 'neon' or name == 'serf'):
+ # Build ZLib as a dependency of Serf if we have it
+ if self.zlib_path and name == 'serf':
depends.extend(self.sections['zlib'].get_targets())
# To set the correct build order of the JavaHL targets, the javahl-javah
@@ -881,26 +865,10 @@ class WinGeneratorBase(GeneratorBase):
if self.enable_nls:
fakedefines.append("ENABLE_NLS")
- # check for neon 0.26.x or newer
- if self.neon_ver >= 26000:
- fakedefines.append("SVN_NEON_0_26=1")
-
- # check for neon 0.27.x or newer
- if self.neon_ver >= 27000:
- fakedefines.append("SVN_NEON_0_27=1")
-
- # check for neon 0.28.x or newer
- if self.neon_ver >= 28000:
- fakedefines.append("SVN_NEON_0_28=1")
-
if self.serf_lib:
fakedefines.append("SVN_HAVE_SERF")
fakedefines.append("SVN_LIBSVN_CLIENT_LINKS_RA_SERF")
- if self.neon_lib:
- fakedefines.append("SVN_HAVE_NEON")
- fakedefines.append("SVN_LIBSVN_CLIENT_LINKS_RA_NEON")
-
# check we have sasl
if self.sasl_path:
fakedefines.append("SVN_HAVE_SASL")
@@ -938,7 +906,6 @@ class WinGeneratorBase(GeneratorBase):
self.path(util_includes) ])
else:
fakeincludes.extend([ self.apath(self.apr_util_path, "xml/expat/lib"),
- self.apath(self.neon_path, "src"),
self.path("subversion/bindings/swig/proxy"),
self.apath(self.bdb_path, "include") ])
@@ -988,7 +955,6 @@ class WinGeneratorBase(GeneratorBase):
libcfg = cfg.replace("Debug", "LibD").replace("Release", "LibR")
fakelibdirs = [ self.apath(self.bdb_path, "lib"),
- self.apath(self.neon_path),
self.apath(self.zlib_path),
]
@@ -1029,9 +995,6 @@ class WinGeneratorBase(GeneratorBase):
if self.bdb_lib:
dblib = self.bdb_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
- if self.neon_lib:
- neonlib = self.neon_lib+(cfg == 'Debug' and 'd.lib' or '.lib')
-
if self.serf_lib:
if self.serf_ver_maj != 0:
serflib = 'serf-%d.lib' % self.serf_ver_maj
@@ -1080,9 +1043,6 @@ class WinGeneratorBase(GeneratorBase):
if dep.external_lib == '$(SVN_SQLITE_LIBS)' and not self.sqlite_inline:
nondeplibs.append('sqlite3.lib')
- if self.neon_lib and dep.external_lib == '$(NEON_LIBS)':
- nondeplibs.append(neonlib)
-
if self.serf_lib and dep.external_lib == '$(SVN_SERF_LIBS)':
nondeplibs.append(serflib)
@@ -1171,30 +1131,6 @@ class WinGeneratorBase(GeneratorBase):
('use_ml', self.have_ml and 1 or None),
))
- def write_neon_project_file(self, name):
- if self.without_neon:
- return
-
- neon_path = os.path.abspath(self.neon_path)
- neon_sources = map(lambda x : os.path.relpath(x, self.neon_path),
- glob.glob(os.path.join(neon_path, 'src', '*.c')))
- neon_headers = map(lambda x : os.path.relpath(x, self.neon_path),
- glob.glob(os.path.join(neon_path, 'src', '*.h')))
-
- self.move_proj_file(self.neon_path, name,
- (('neon_sources', neon_sources),
- ('neon_headers', neon_headers),
- ('expat_path',
- os.path.relpath(os.path.join(self.apr_util_path,
- 'xml', 'expat', 'lib'),
- self.neon_path)),
- ('zlib_path', os.path.relpath(self.zlib_path,
- self.neon_path)),
- ('openssl_path', os.path.relpath(self.openssl_path,
- self.neon_path)),
- ('project_guid', self.makeguid('neon')),
- ))
-
def write_serf_project_file(self, name):
if not self.serf_lib:
return
@@ -1232,7 +1168,7 @@ class WinGeneratorBase(GeneratorBase):
def move_proj_file(self, path, name, params=()):
### Move our slightly templatized pre-built project files into place --
- ### these projects include zlib, neon, serf, locale, config, etc.
+ ### these projects include zlib, serf, locale, config, etc.
dest_file = os.path.join(path, name)
source_template = os.path.join('templates', name + '.ezt')
@@ -1443,33 +1379,6 @@ class WinGeneratorBase(GeneratorBase):
finally:
fp.close()
- def _find_neon(self):
- "Find the neon version"
- msg = 'WARNING: Unable to determine neon version\n'
- if self.without_neon:
- self.neon_lib = None
- msg = 'Not attempting to find neon\n'
- else:
- try:
- self.neon_lib = "libneon"
- fp = open(os.path.join(self.neon_path, '.version'))
- txt = fp.read()
- vermatch = re.compile(r'(\d+)\.(\d+)\.(\d+)$', re.M) \
- .search(txt)
-
- if vermatch:
- version = tuple(map(int, vermatch.groups()))
- # build/ac-macros/swig.m4 explains the next incantation
- self.neon_ver = int('%d%02d%03d' % version)
- msg = 'Found neon version %d.%d.%d\n' % version
- if self.neon_ver < 25005:
- msg = 'WARNING: Neon version 0.25.5 or higher is required'
- except:
- msg = 'WARNING: Error while determining neon version\n'
- self.neon_lib = None
-
- print(msg)
-
def _get_serf_version(self):
"Retrieves the serf version from serf.h"
Modified: subversion/branches/inheritable-props/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/generator/templates/vcnet_vcxproj.ezt?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/inheritable-props/build/generator/templates/vcnet_vcxproj.ezt Tue Jun 26 19:26:49 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/inheritable-props/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/run_tests.py?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/run_tests.py (original)
+++ subversion/branches/inheritable-props/build/run_tests.py Tue Jun 26 19:26:49 2012
@@ -29,7 +29,7 @@
[--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
[--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
[--server-minor-version=<version>]
- [--config-file=<file>]
+ [--config-file=<file>] [--ssl-cert=<file>]
<abs_srcdir> <abs_builddir>
<prog ...>
@@ -124,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, set_log_level=None):
+ milestone_filter=None, set_log_level=None, ssl_cert=None):
'''Construct a TestHarness instance.
ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -175,6 +175,7 @@ class TestHarness:
self.svn_bin = svn_bin
self.mode_filter = mode_filter
self.log = None
+ self.ssl_cert = ssl_cert
if not sys.stdout.isatty() or sys.platform == 'win32':
TextColors.disable()
@@ -453,6 +454,11 @@ class TestHarness:
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
@@ -462,6 +468,8 @@ class TestHarness:
svntest.main.options.fsfs_packing = self.fsfs_packing
if self.mode_filter is not None:
svntest.main.options.mode_filter = self.mode_filter
+ if self.ssl_cert is not None:
+ svntest.main.options.ssl_cert = self.ssl_cert
svntest.main.options.srcdir = self.srcdir
@@ -618,7 +626,7 @@ def main():
'fsfs-packing', 'fsfs-sharding=',
'enable-sasl', 'parallel', 'config-file=',
'log-to-stdout', 'list', 'milestone-filter=',
- 'mode-filter=', 'set-log-level='])
+ 'mode-filter=', 'set-log-level=', 'ssl-cert='])
except getopt.GetoptError:
args = []
@@ -629,9 +637,9 @@ 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, \
- set_log_level = \
+ set_log_level, ssl_cert = \
None, None, 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
@@ -665,6 +673,8 @@ def main():
mode_filter = val
elif opt in ['--set-log-level']:
set_log_level = val
+ elif opt in ['--ssl-cert']:
+ ssl_cert = val
else:
raise getopt.GetoptError
@@ -680,7 +690,7 @@ def main():
verbose, cleanup, enable_sasl, parallel, config_file,
fsfs_sharding, fsfs_packing, list_tests,
mode_filter=mode_filter, milestone_filter=milestone_filter,
- set_log_level=set_log_level)
+ set_log_level=set_log_level, ssl_cert=ssl_cert)
failed = th.run(args[2:])
if failed:
Modified: subversion/branches/inheritable-props/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/transform_sql.py?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/transform_sql.py (original)
+++ subversion/branches/inheritable-props/build/transform_sql.py Tue Jun 26 19:26:49 2012
@@ -49,7 +49,7 @@ class Processor(object):
# a few SQL comments that act as directives for this transform system
re_format = re.compile('-- *format: *([0-9]+)')
- re_statement = re.compile('-- *STMT_([A-Z_0-9]+)')
+ re_statement = re.compile('-- *STMT_([A-Z_0-9]+)( +\(([^\)]*)\))?')
re_include = re.compile('-- *include: *([-a-z]+)')
re_define = re.compile('-- *define: *([A-Z_0-9]+)')
@@ -66,6 +66,13 @@ class Processor(object):
self.close_define()
self.output.write('#define STMT_%s %d\n' % (match.group(1),
self.stmt_count))
+
+ if match.group(3) == None:
+ info = 'NULL'
+ else:
+ info = '"' + match.group(3) + '"'
+ self.output.write('#define STMT_%d_INFO {"STMT_%s", %s}\n' %
+ (self.stmt_count, match.group(1), info))
self.output.write('#define STMT_%d \\\n' % (self.stmt_count,))
self.var_printed = True
@@ -103,10 +110,35 @@ class Processor(object):
for line in input.split('\n'):
line = line.replace('"', '\\"')
+ # IS_STRICT_DESCENDANT_OF()
+
+ # A common operation in the working copy is determining descendants of
+ # a node. To allow Sqlite to use its indexes to provide the answer we
+ # must provide simple less than and greater than operations.
+ #
+ # For relative paths that consist of one or more components like 'subdir'
+ # we can accomplish this by comparing local_relpath with 'subdir/' and
+ # 'subdir0' ('/'+1 = '0')
+ #
+ # For the working copy root this case is less simple and not strictly
+ # valid utf-8/16 (but luckily Sqlite doesn't validate utf-8 nor utf-16).
+ # The binary blob x'FFFF' is higher than any valid utf-8 and utf-16
+ # sequence.
+ #
+ # So for the root we can compare with > '' and < x'FFFF'. (This skips the
+ # root itself and selects all descendants)
+ #
+ ### RH: I implemented this first with a user defined Sqlite function. But
+ ### when I wrote the documentation for it, I found out I could just
+ ### define it this way, without losing the option of just dropping the
+ ### query in a plain sqlite3.
+
# '/'+1 == '0'
- line = re.sub(r'IS_STRICT_DESCENDANT_OF[(]([A-Za-z_.]+), ([?][0-9]+)[)]',
- r"((\1) > (\2) || '/' AND (\1) < (\2) || '0') ",
- line)
+ line = re.sub(
+ r'IS_STRICT_DESCENDANT_OF[(]([A-Za-z_.]+), ([?][0-9]+)[)]',
+ r"(((\1) > (CASE (\2) WHEN '' THEN '' ELSE (\2) || '/' END))" +
+ r" AND ((\1) < CASE (\2) WHEN '' THEN X'FFFF' ELSE (\2) || '0' END))",
+ line)
if line.strip():
handled = False
@@ -167,6 +199,13 @@ def main(input_filepath, output):
+ ', \\\n'.join(' STMT_%d' % (i,) for i in range(proc.stmt_count))
+ ', \\\n NULL \\\n }\n')
+ output.write('\n')
+
+ output.write(
+ '#define %s_DECLARE_STATEMENT_INFO(varname) \\\n' % (var_name,)
+ + ' static const char * const varname[][2] = { \\\n'
+ + ', \\\n'.join(' STMT_%d_INFO' % (i) for i in range(proc.stmt_count))
+ + ', \\\n {NULL, NULL} \\\n }\n')
if __name__ == '__main__':
if len(sys.argv) < 2 or len(sys.argv) > 3:
Modified: subversion/branches/inheritable-props/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/win32/make_dist.py?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/win32/make_dist.py (original)
+++ subversion/branches/inheritable-props/build/win32/make_dist.py Tue Jun 26 19:26:49 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'),
@@ -273,9 +273,6 @@ _disttree = {'': OptFile('%(readme)s', '
File('%(@apr-util)s/%(aprxml)s/xml.lib'),
File('%(@apr-util)s/%(aprxml)s/xml.pdb'),
),
- 'lib/neon': (File('%(@neon)s/libneon.lib'),
- OptFile('%(@zlib)s/zlibstat.lib'),
- ),
'lib/serf': (File('%(@serf)s/Release/serf.lib'),
),
@@ -286,7 +283,6 @@ _disttree = {'': OptFile('%(readme)s', '
'licenses': None,
'licenses/bdb': File('%(@berkeley-db)s/LICENSE'),
- 'licenses/neon': File('%(@neon)s/src/COPYING.LIB'),
'licenses/serf': File('%(@serf)s/LICENSE'),
'licenses/zlib': File('%(@zlib)s/README'),
'licenses/apr-util': (File('%(@apr-util)s/LICENSE'),
@@ -381,8 +377,6 @@ def _read_config():
os.path.abspath(os.path.join(_srcdir, 'apr-iconv')),
'@apr-util':
os.path.abspath(os.path.join(_srcdir, 'apr-util')),
- '@neon':
- os.path.abspath(os.path.join(_srcdir, 'neon')),
}
cfg = configparser.ConfigParser(path_defaults)
Modified: subversion/branches/inheritable-props/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/build/win32/vc6-build.bat.in?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/build/win32/vc6-build.bat.in (original)
+++ subversion/branches/inheritable-props/build/win32/vc6-build.bat.in Tue Jun 26 19:26:49 2012
@@ -56,7 +56,6 @@ if not exist src-%DIR% goto svnerr
if not exist zlib goto zliberr
if not exist zlib\zlibstat.lib goto zlibstaterr
if not exist src-%DIR%\db4-win32 goto bdberr
-if not exist src-%DIR%\neon goto neonerr
if not exist gettext goto gettexterr
goto allok
@@ -84,9 +83,6 @@ goto end
:bdberr
echo Unable to find Berekely DB
goto end
-:neonerr
-echo Unable to find neon
-goto end
:gettexterr
echo Unable to find gettext
goto end
@@ -137,6 +133,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/inheritable-props/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/configure.ac?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/configure.ac (original)
+++ subversion/branches/inheritable-props/configure.ac Tue Jun 26 19:26:49 2012
@@ -115,29 +115,7 @@ AC_SUBST(SVN_LT_SOVERSION)
dnl Search for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config)
-# Either a space-separated list of allowable Neon versions, or "any" to
-# mean allow anything.
-NEON_ALLOWED_LIST="0\.25 0\.26 0\.27\.2 0\.28 0\.29"
-NEON_RECOMMENDED_VER="0.29.6"
-NEON_URL="http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz"
-dnl You can skip the neon version check only if you know what you are doing
-AC_ARG_ENABLE(neon-version-check,
- AS_HELP_STRING([--disable-neon-version-check],
- [do not check the Neon version]),
- [
- if test "$enableval" = "no" ; then
- NEON_ALLOWED_LIST="any"
- fi
- ],
- [])
-SVN_LIB_NEON($NEON_ALLOWED_LIST, $NEON_RECOMMENDED_VER, $NEON_URL)
-
-if test "$svn_lib_neon" = "yes"; then
- AC_DEFINE([SVN_HAVE_NEON], 1,
- [Defined if support for Neon is enabled])
-fi
-
-dnl Search for serf as an alternative to neon
+dnl Search for serf
SVN_LIB_SERF(1,0,0)
if test "$svn_lib_serf" = "yes"; then
@@ -166,8 +144,8 @@ dnl Find Apache with a recent-enough mag
SVN_FIND_APACHE(20020903)
dnl Search for SQLite
-SQLITE_MINIMUM_VER="3.6.18"
-SQLITE_RECOMMENDED_VER="3.7.6.3"
+SQLITE_MINIMUM_VER="3.7.12"
+SQLITE_RECOMMENDED_VER="3.7.12"
SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER}.tar.gz"
SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
${SQLITE_URL})
@@ -395,6 +373,11 @@ AC_ARG_WITH(expat,
[svn_lib_expat="$withval"],
[svn_lib_expat="::expat"])
+# APR-util accepts "builtin" as an argument to this option so if the user
+# passed "builtin" pretend the user didn't specify the --with-expat option
+# at all. Expat will (hopefully) be found in apr-util.
+test "_$svn_lib_expat" = "_builtin" && svn_lib_expat="::expat"
+
AC_MSG_CHECKING([for Expat])
if test -n "`echo "$svn_lib_expat" | $EGREP ":.*:"`"; then
SVN_XML_INCLUDES=""
@@ -840,12 +823,6 @@ if test "$svn_lib_berkeley_db" = "yes";
BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
fi
-
-if test "$svn_lib_neon" = "yes"; then
- BUILD_RULES="$BUILD_RULES neon-lib"
- INSTALL_RULES="`echo $INSTALL_RULES | $SED 's/install-ramod-lib/install-ramod-lib install-neon-lib/'`"
- INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-neon-lib"
-fi
if test "$svn_lib_serf" = "yes"; then
BUILD_RULES="$BUILD_RULES serf-lib"
@@ -924,10 +901,7 @@ AS_HELP_STRING([--with-openssl],
process where to locate the OpenSSL library when (and only when)
building Serf as an integrated part of the Subversion build
process. When linking to a previously installed version of Serf
- instead, you do not need to use this option. (Note that
- Subversion may also or alternatively be configured to use the
- Neon library for http:// and https:// access; see the
- --with-neon and --with-ssl options.)]),
+ instead, you do not need to use this option.]),
[])
AC_ARG_ENABLE(debug,
@@ -996,7 +970,6 @@ AC_SUBST([libsvn_fs_fs_LDFLAGS])
AC_SUBST([libsvn_fs_util_LDFLAGS])
AC_SUBST([libsvn_ra_LDFLAGS])
AC_SUBST([libsvn_ra_local_LDFLAGS])
-AC_SUBST([libsvn_ra_neon_LDFLAGS])
AC_SUBST([libsvn_ra_serf_LDFLAGS])
AC_SUBST([libsvn_ra_svn_LDFLAGS])
AC_SUBST([libsvn_repos_LDFLAGS])
@@ -1184,12 +1157,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"
@@ -1232,11 +1205,6 @@ AS_HELP_STRING([--enable-runtime-module-
])
if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
- ### We want ra_local first to handle the following scenario:
- ### user has neon and db3 in /usr/local, and db4 in
- ### /usr/local/BerkeleyDB.4.0. If libsvn_ra_neon.la comes before
- ### libsvn_fs.la then libtool ends up linking libsvn_fs to the db3
- ### in /usr/local/lib
AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL, 1,
[Defined if libsvn_client should link against libsvn_ra_local])
svn_ra_lib_deps="\$(RA_LOCAL_DEPS)"
@@ -1248,14 +1216,6 @@ if test "$svn_enable_shared" = "no" || t
svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SVN_DEPS)"
svn_ra_lib_link="$svn_ra_lib_link \$(RA_SVN_LINK)"
- if test "$svn_lib_neon" = "yes"; then
- AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_NEON, 1,
- [Defined if libsvn_client should link against libsvn_ra_neon])
- svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_NEON_DEPS)"
- svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-neon-lib"
- svn_ra_lib_link="$svn_ra_lib_link \$(RA_NEON_LINK)"
- fi
-
if test "$svn_lib_serf" = "yes"; then
AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SERF, 1,
[Defined if libsvn_client should link against libsvn_ra_serf])
@@ -1366,6 +1326,17 @@ AC_SUBST(JAVAHL_COMPAT_TESTS_TARGET)
# ==== Miscellaneous bits ====================================================
+# Strip '-no-cpp-precomp' from CPPFLAGS for the clang compiler
+### I think we get this flag from APR, so the fix probably belongs there
+if test "$CC" = "clang"; then
+ CPPFLAGS=`echo "$CPPFLAGS" | $SED -e 's/-no-cpp-precomp //'`
+fi
+
+# Clang also doesn't (yet) support the '-ansi' flag
+if test "$CC" = "clang"; then
+ CFLAGS=`echo "$CFLAGS" | $SED -e 's/-ansi //'`
+fi
+
dnl Since this is used only on Unix-y systems, define the path separator as '/'
AC_DEFINE_UNQUOTED(SVN_PATH_LOCAL_SEPARATOR, '/',
[Defined to be the path separator used on your local filesystem])
@@ -1431,9 +1402,12 @@ if test "$svn_lib_berkeley_db" = "no" &&
You don't seem to have Berkeley DB version $db_version or newer
-installed and linked to APR-UTIL. We have created Makefile which will build
+installed and linked to APR-UTIL. We have created a Makefile which will build
Subversion without support for the Berkeley DB back-end. You can find the
latest version of Berkeley DB here:
- http://www.oracle.com/technology/software/products/berkeley-db/index.html
+
+ http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html
+
+or explicitly specify --without-berkeley-db to silence this warning.
])
fi
Modified: subversion/branches/inheritable-props/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/inheritable-props/contrib/client-side/emacs/dsvn.el?rev=1354186&r1=1354185&r2=1354186&view=diff
==============================================================================
--- subversion/branches/inheritable-props/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/inheritable-props/contrib/client-side/emacs/dsvn.el Tue Jun 26 19:26:49 2012
@@ -1083,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)
@@ -1110,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 (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)))))))
+ (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)
@@ -1209,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
@@ -1223,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"
@@ -2104,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.