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 2010/12/30 22:27:54 UTC
svn commit: r1054005 [1/11] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
contrib/client-side/svn_load_dirs/ contrib/server-side/
contrib/server-side/mod_dontdothat/ contrib/server-side/sv...
Author: hwright
Date: Thu Dec 30 21:27:46 2010
New Revision: 1054005
URL: http://svn.apache.org/viewvc?rev=1054005&view=rev
Log:
On the ignore-mergeinfo branch:
Bring up-to-date with trunk.
Added:
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_error_private.h
- copied unchanged from r1053999, subversion/trunk/subversion/include/private/svn_error_private.h
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/upgrade_tests_data/replaced-files.tar.bz2
- copied unchanged from r1053999, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/replaced-files.tar.bz2
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/subst_translate-test.c
- copied unchanged from r1053999, subversion/trunk/subversion/tests/libsvn_subr/subst_translate-test.c
Removed:
subversion/branches/ignore-mergeinfo/build/transform_libtool_scripts.sh
Modified:
subversion/branches/ignore-mergeinfo/ (props changed)
subversion/branches/ignore-mergeinfo/Makefile.in
subversion/branches/ignore-mergeinfo/build/ (props changed)
subversion/branches/ignore-mergeinfo/build.conf
subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4
subversion/branches/ignore-mergeinfo/build/generator/gen_make.py
subversion/branches/ignore-mergeinfo/build/generator/gen_win.py
subversion/branches/ignore-mergeinfo/build/generator/swig/__init__.py
subversion/branches/ignore-mergeinfo/build/generator/swig/checkout_swig_header.py
subversion/branches/ignore-mergeinfo/build/generator/swig/external_runtime.py
subversion/branches/ignore-mergeinfo/configure.ac
subversion/branches/ignore-mergeinfo/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py
subversion/branches/ignore-mergeinfo/contrib/server-side/mod_dontdothat/mod_dontdothat.c
subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/fso_is_changeable.c
subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/main.c
subversion/branches/ignore-mergeinfo/notes/fsfs-improvements.txt
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Array.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/INSTALL
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/svn/core.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/core.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/delta.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/ra.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/repository.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/python/tests/utils.py
subversion/branches/ignore-mergeinfo/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_ra_private.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_repos_private.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_token.h
subversion/branches/ignore-mergeinfo/subversion/include/private/svn_wc_private.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_checksum.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_client.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_diff.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_editor.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_error.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_fs.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_io.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_mergeinfo.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_ra.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_repos.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_string.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_subst.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_types.h
subversion/branches/ignore-mergeinfo/subversion/include/svn_wc.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/add.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/changelist.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/checkout.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/cleanup.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/client.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/commit_util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/copy.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/export.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/externals.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/info.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/log.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/merge.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/patch.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/prop_commands.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/ra.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/relocate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/repos_diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/repos_diff_summarize.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/revert.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/status.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_client/update.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_delta/compose_delta.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_file.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/diff_memory.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_diff/parse-diff.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs/fs-loader.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/bdb/env.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/fs.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/id.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_base/tree.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/id.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_fs_fs/tree.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra/ra_loader.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/commit.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/fetch.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/get_dated_rev.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/get_deleted_rev.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/get_location_segments.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/get_locations.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/get_locks.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/merge.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/options.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/props.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/replay.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_neon/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/auth.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/auth_digest.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/auth_kerb.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/blame.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/commit.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/fake_sspi.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getdate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocations.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/getlocks.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/locks.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/log.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/merge.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/options.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/property.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/replay.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/update.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/win32_auth_sspi.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_serf/xml.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/client.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/editorp.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/marshal.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_ra_svn/streams.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/commit.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/dump.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/fs-wrap.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/hooks.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_repos/reporter.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/auth.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache-memcache.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/cache.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/date.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/dirent_uri.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/error.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/hash.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/io.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/iter.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/mergeinfo.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/prompt.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/simple_providers.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/ssl_client_cert_providers.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/ssl_server_trust_providers.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/stream.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/subst.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/svn_string.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/username_providers.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_subr/win32_crashrpt.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_crawler.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/adm_ops.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/conflicts.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/copy.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/deprecated.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/entries.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/entries.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/lock.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/lock.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/node.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/props.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/relocate.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/revision_status.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/status.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/update_editor.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/upgrade.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/util.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc-queries.sql
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db.c
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/wc_db.h
subversion/branches/ignore-mergeinfo/subversion/libsvn_wc/workqueue.c
subversion/branches/ignore-mergeinfo/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/dav_svn.h
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/deadprops.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/lock.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/merge.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/mod_dav_svn.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/replay.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/reports/update.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/repos.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/util.c
subversion/branches/ignore-mergeinfo/subversion/mod_dav_svn/version.c
subversion/branches/ignore-mergeinfo/subversion/po/zh_CN.po
subversion/branches/ignore-mergeinfo/subversion/svn/blame-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/cl.h
subversion/branches/ignore-mergeinfo/subversion/svn/commit-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/log-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/main.c
subversion/branches/ignore-mergeinfo/subversion/svn/notify.c
subversion/branches/ignore-mergeinfo/subversion/svn/proplist-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/props.c
subversion/branches/ignore-mergeinfo/subversion/svn/resolve-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/resolved-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/update-cmd.c
subversion/branches/ignore-mergeinfo/subversion/svn/util.c
subversion/branches/ignore-mergeinfo/subversion/svnadmin/main.c
subversion/branches/ignore-mergeinfo/subversion/svnrdump/load_editor.c
subversion/branches/ignore-mergeinfo/subversion/svnrdump/svnrdump.c
subversion/branches/ignore-mergeinfo/subversion/svnserve/serve.c
subversion/branches/ignore-mergeinfo/subversion/svnsync/main.c
subversion/branches/ignore-mergeinfo/subversion/svnsync/sync.c
subversion/branches/ignore-mergeinfo/subversion/svnversion/main.c
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/atomic-ra-revprop-change.c
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/authz_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/basic_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/commit_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/copy_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/depth_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/diff_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/entries-dump.c
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/export_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/externals_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/info_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/input_validation_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/merge_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/obliterate_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/patch_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/prop_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/redirect_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/resolve_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/revert_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/special_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/stat_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnlook_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/actions.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/main.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svntest/sandbox.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/svnversion_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/switch_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/update_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_client/client-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs/locks-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs_base/changes-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs_base/fs-base-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/ (props changed)
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/eol-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/error-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/db-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/libsvn_wc/pristine-store-test.c
subversion/branches/ignore-mergeinfo/subversion/tests/manual/tree-conflicts-add-vs-add.py
subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_fs.c
subversion/branches/ignore-mergeinfo/subversion/tests/svn_test_main.c
subversion/branches/ignore-mergeinfo/tools/client-side/svn-viewspec.py
subversion/branches/ignore-mergeinfo/tools/client-side/svnmucc/svnmucc.c
subversion/branches/ignore-mergeinfo/tools/dev/svn-dev.el
subversion/branches/ignore-mergeinfo/tools/dev/unix-build/Makefile.svn
subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/bump-to-19.py
subversion/branches/ignore-mergeinfo/tools/dev/wc-ng/populate-pristine.py
subversion/branches/ignore-mergeinfo/tools/diff/diff.c
subversion/branches/ignore-mergeinfo/tools/dist/collect_sigs.py
subversion/branches/ignore-mergeinfo/tools/hook-scripts/mailer/mailer.py
subversion/branches/ignore-mergeinfo/tools/po/l10n-report.py
subversion/branches/ignore-mergeinfo/tools/server-side/svn-populate-node-origins-index.c
subversion/branches/ignore-mergeinfo/win-tests.py
Propchange: subversion/branches/ignore-mergeinfo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 30 21:27:46 2010
@@ -40,4 +40,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:873097-1045303
+/subversion/trunk:873097-1054002
Modified: subversion/branches/ignore-mergeinfo/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/Makefile.in?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/Makefile.in (original)
+++ subversion/branches/ignore-mergeinfo/Makefile.in Thu Dec 30 21:27:46 2010
@@ -351,17 +351,17 @@ install: external-install local-install
local-all: @BUILD_RULES@ @TRANSFORM_LIBTOOL_SCRIPTS@
transform-libtool-scripts: @BUILD_RULES@
- @$(top_srcdir)/build/transform_libtool_scripts.sh
+ @$(SHELL) $(top_srcdir)/build/transform_libtool_scripts.sh
locale-gnu-pot:
cd $(abs_srcdir) && XGETTEXT="$(XGETTEXT)" MSGMERGE="$(MSGMERGE)" \
- tools/po/po-update.sh pot
+ $(SHELL) tools/po/po-update.sh pot
# "make locale-gnu-po-update" updates all translations.
# "make locale-gnu-po-update PO=ll" updates only the ll.po file.
locale-gnu-po-update:
cd $(abs_srcdir) && XGETTEXT="$(XGETTEXT)" MSGMERGE="$(MSGMERGE)" \
- tools/po/po-update.sh $(PO)
+ $(SHELL) tools/po/po-update.sh $(PO)
# clean everything but the bulky test output, returning the system back
# to before 'make' was run.
@@ -824,7 +824,7 @@ install-swig-rb-doc:
# ctypes-python make targets
ctypes-python: local-all
- $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)"
+ $(SHELL) $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)"
install-ctypes-python: ctypes-python
cd $(CTYPES_PYTHON_SRC_DIR); \
Propchange: subversion/branches/ignore-mergeinfo/build/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 30 21:27:46 2010
@@ -6,3 +6,4 @@ ltversion.m4
lt~obsolete.m4
ltmain.sh
pkg.m4
+transform_libtool_scripts.sh
Modified: subversion/branches/ignore-mergeinfo/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build.conf?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build.conf (original)
+++ subversion/branches/ignore-mergeinfo/build.conf Thu Dec 30 21:27:46 2010
@@ -865,6 +865,14 @@ sources = target-test.c
install = test
libs = libsvn_test libsvn_subr apriconv apr
+[subst_translate-test]
+description = Test the svn_subst_translate* functions
+type = exe
+path = subversion/tests/libsvn_subr
+sources = subst_translate-test.c
+install = test
+libs = libsvn_test libsvn_subr apriconv apr
+
[translate-test]
description = Test eol conversion and keyword substitution routines
type = exe
@@ -1114,6 +1122,7 @@ libs = __ALL__
checksum-test compat-test config-test hashdump-test mergeinfo-test opt-test path-test stream-test
string-test eol-test time-test utf-test target-test error-test cache-test
revision-test
+ subst_translate-test
translate-test
random-test window-test
diff-diff3-test
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4 Thu Dec 30 21:27:46 2010
@@ -94,13 +94,13 @@ AC_DEFUN(SVN_FIND_SWIG,
# packages/rpm/rhel-4/subversion.spec
if test -n "$SWIG_VERSION" &&
test "$SWIG_VERSION" -ge "103024" &&
- test "$SWIG_VERSION" -le "103039"; then
+ test "$SWIG_VERSION" -le "200001"; then
SWIG_SUITABLE=yes
else
SWIG_SUITABLE=no
AC_MSG_WARN([Detected SWIG version $SWIG_VERSION_RAW])
AC_MSG_WARN([Subversion requires 1.3.24 or later, and is known to work])
- AC_MSG_WARN([with versions up to 1.3.39])
+ AC_MSG_WARN([with versions up to 2.0.1])
fi
fi
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_make.py?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_make.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_make.py Thu Dec 30 21:27:46 2010
@@ -23,6 +23,7 @@
#
import os
+import stat
import sys
try:
# Python >=3.0
@@ -453,6 +454,8 @@ class Generator(gen_base.GeneratorBase):
self.write_standalone()
+ self.write_transform_libtool_scripts(install_sources)
+
def write_standalone(self):
"""Write autogen-standalone.mk"""
@@ -468,6 +471,91 @@ class Generator(gen_base.GeneratorBase):
standalone.write(open("build-outputs.mk","r").read())
standalone.close()
+ def write_transform_libtool_scripts(self, install_sources):
+ """Write build/transform_libtool_scripts.sh"""
+ script = 'build/transform_libtool_scripts.sh'
+ fd = open(script, 'w')
+ fd.write('''#!/bin/sh
+# DO NOT EDIT -- AUTOMATICALLY GENERATED
+
+transform()
+{
+ SCRIPT="$1"
+ LIBS="$2"
+ if [ -f $SCRIPT ]; then
+ if grep LD_PRELOAD "$SCRIPT" > /dev/null; then
+ :
+ elif grep LD_LIBRARY_PATH "$SCRIPT" > /dev/null; then
+ echo "Transforming $SCRIPT"
+ EXISTINGLIBS=""
+ for LIB in $LIBS; do
+ # exclude libsvn_test since the undefined test_funcs breaks libtool
+ case $LIB in
+ *libsvn_test-*) continue ;;
+ esac
+ if [ ! -f $LIB ]; then
+ continue
+ fi
+ if [ -z "$EXISTINGLIBS" ]; then
+ EXISTINGLIBS="$LIB"
+ else
+ EXISTINGLIBS="$EXISTINGLIBS $LIB"
+ fi
+ done
+ if [ ! -z "$EXISTINGLIBS" ]; then
+ cat "$SCRIPT" |
+ (
+ read LINE
+ echo "$LINE"
+ echo "LD_PRELOAD=\\"$EXISTINGLIBS\\""
+ echo "export LD_PRELOAD"
+ cat
+ ) < "$SCRIPT" > "$SCRIPT.new"
+ mv -f "$SCRIPT.new" "$SCRIPT"
+ chmod +x "$SCRIPT"
+ fi
+ fi
+ fi
+}
+
+DIR=`pwd`
+
+''')
+ libdep_cache = {}
+ paths = {}
+ for target_ob in install_sources:
+ if not isinstance(target_ob, gen_base.TargetExe):
+ continue
+ name = target_ob.name
+ libs = self._get_all_lib_deps(target_ob.name, libdep_cache, paths)
+ path = paths[name]
+ for i in range(0, len(libs)):
+ lib = libs[i]
+ libpath = paths[libs[i]]
+ libs[i] = '$DIR/%s/.libs/%s-%s.so' % (libpath, lib, self.version)
+ fd.write('transform %s/%s "%s"\n' % (path, name, " ".join(libs)))
+ fd.close()
+ mode = stat.S_IRWXU|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH
+ os.chmod(script, mode)
+
+ def _get_all_lib_deps(self, target_name, libdep_cache, paths):
+ if not target_name in libdep_cache:
+ libs = {}
+ path = None
+ if target_name in self.sections:
+ section = self.sections[target_name]
+ opt_libs = self.sections[target_name].options.get('libs')
+ paths[target_name] = section.options.get('path')
+ if opt_libs:
+ for lib_name in opt_libs.split():
+ if lib_name.startswith('libsvn_'):
+ libs[lib_name] = True
+ for lib in self._get_all_lib_deps(lib_name, libdep_cache, paths):
+ libs[lib] = True
+ libdep_cache[target_name] = libs.keys()[:]
+ libdep_cache[target_name].sort()
+ return libdep_cache[target_name]
+
class UnknownDependency(Exception):
"We don't know how to deal with the dependent to link it in."
pass
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_win.py?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_win.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_win.py Thu Dec 30 21:27:46 2010
@@ -589,11 +589,11 @@ class WinGeneratorBase(GeneratorBase):
cdesc = 'Generating %s ' % def_file
- sources.append(ProjectItem(path=gsrc, reldir=None,
+ sources.append(ProjectItem(path=gsrc, reldir=None,
custom_build=cbuild,
custom_target=def_file,
custom_desc=cdesc,
- user_deps=deps,
+ user_deps=deps,
extension=''))
sources.append(ProjectItem(path=def_file, reldir=None,
@@ -1553,24 +1553,24 @@ class WinGeneratorBase(GeneratorBase):
def _find_zlib(self):
"Find the ZLib library and version"
-
+
if not self.zlib_path:
self.zlib_version = '1'
return
-
+
header_file = os.path.join(self.zlib_path, 'zlib.h')
-
+
if not os.path.exists(header_file):
self.zlib_version = '1'
return
-
+
fp = open(header_file)
txt = fp.read()
fp.close()
vermatch = re.search(r'^\s*#define\s+ZLIB_VERSION\s+"(\d+)\.(\d+)\.(\d+)(?:\.\d)?"', txt, re.M)
version = tuple(map(int, vermatch.groups()))
-
+
self.zlib_version = '%d.%d.%d' % version
msg = 'Found ZLib version %s\n'
Modified: subversion/branches/ignore-mergeinfo/build/generator/swig/__init__.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/swig/__init__.py?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/swig/__init__.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/swig/__init__.py Thu Dec 30 21:27:46 2010
@@ -70,9 +70,8 @@ class Generator:
swig_version = _exec.output([self.swig_path, "-version"])
m = re.search("Version (\d+).(\d+).(\d+)", swig_version)
if m:
- return int(
- "%s0%s0%s" % (m.group(1), m.group(2), m.group(3)))
+ return (m.group(1), m.group(2), m.group(3))
except AssertionError:
pass
- return 0
+ return (0, 0, 0)
Modified: subversion/branches/ignore-mergeinfo/build/generator/swig/checkout_swig_header.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/swig/checkout_swig_header.py?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/swig/checkout_swig_header.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/swig/checkout_swig_header.py Thu Dec 30 21:27:46 2010
@@ -60,15 +60,15 @@ class Generator(generator.swig.Generator
os.remove(out)
if self._skip_checkout(path):
open(out, "w")
- elif self.version() == 103024:
+ elif self.version() == (1, 3, 24):
shutil.copy(build_path_join(self.swig_libdir, path), out)
else:
run("%s -o %s -co %s" % (self.swig_path, out, path))
def _skip_checkout(self, path):
"""Should we skip this checkout?"""
- return (path == "ruby/rubytracking.swg" and self.version() < 103026 or
- path == "common.swg" and self.version() > 103024)
+ return (path == "ruby/rubytracking.swg" and self.version() < (1, 3, 26) or
+ path == "common.swg" and self.version() > (1, 3, 24))
def _output_file(self, path):
"""Get output filename"""
Modified: subversion/branches/ignore-mergeinfo/build/generator/swig/external_runtime.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/swig/external_runtime.py?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/swig/external_runtime.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/swig/external_runtime.py Thu Dec 30 21:27:46 2010
@@ -65,7 +65,7 @@ class Generator(generator.swig.Generator
# Build runtime files
out = self._output_file(lang)
- if self.version() == 103024:
+ if self.version() == (1, 3, 24):
out_file = open(out, "w")
out_file.write(open("%s/swigrun.swg" % self.proxy_dir).read())
out_file.write(open("%s/common.swg" % self.proxy_dir).read())
@@ -79,12 +79,12 @@ class Generator(generator.swig.Generator
# SWIG 1.3.24-27 should include rubyhead.swg in their
# external runtime, but they don't.
- if lang == "ruby" and self.version() < 103028:
+ if lang == "ruby" and self.version() < (1, 3, 28):
runtime = open(out).read()
out_file = open(out, "w")
head = open("%s/rubyhead.swg" % self.proxy_dir).read();
out_file.write(head)
- if self.version() >= 103026:
+ if self.version() >= (1, 3, 26):
# SWIG 1.3.26-27 should include rubytracking.swg in their
# external runtime, but they don't.
tracking = open("%s/rubytracking.swg" % self.proxy_dir).read();
@@ -94,7 +94,7 @@ class Generator(generator.swig.Generator
# SWIG 1.3.25 and earlier use the wrong number of arguments in calls to
# SWIG_GetModule. We fix this below.
- if self.version() <= 103025:
+ if self.version() <= (1, 3, 25):
for line in fileinput.input(out, inplace=1):
sys.stdout.write(
re.sub(r"SWIG_GetModule\(\)", "SWIG_GetModule(NULL)", line)
Modified: subversion/branches/ignore-mergeinfo/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/configure.ac?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/configure.ac (original)
+++ subversion/branches/ignore-mergeinfo/configure.ac Thu Dec 30 21:27:46 2010
@@ -268,8 +268,13 @@ AC_SUBST(LT_CFLAGS)
AC_SUBST(LT_LDFLAGS)
AC_ARG_ENABLE(local-library-preloading,
- AS_HELP_STRING([--disable-local-library-preloading],
- [Disable preloading of locally built libraries in locally built executables]),
+ AS_HELP_STRING([--enable-local-library-preloading],
+ [Enable preloading of locally built libraries in locally
+ built executables. This may be necessary for testing
+ prior to installation on some platforms. It doesn't work
+ on some platforms (Darwin, OpenBSD, ...) and on platforms
+ where it does work (Linux, ...) it may interfere with the
+ installation process.]),
[
if test "$enableval" != "no"; then
if test "$svn_enable_shared" = "yes"; then
@@ -281,11 +286,7 @@ AC_ARG_ENABLE(local-library-preloading,
TRANSFORM_LIBTOOL_SCRIPTS=""
fi
], [
- if test "`uname`" != "Darwin" && test "$svn_enable_shared" = "yes"; then
- TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts"
- else
- TRANSFORM_LIBTOOL_SCRIPTS=""
- fi
+ TRANSFORM_LIBTOOL_SCRIPTS=""
])
AC_SUBST(TRANSFORM_LIBTOOL_SCRIPTS)
Modified: subversion/branches/ignore-mergeinfo/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in (original)
+++ subversion/branches/ignore-mergeinfo/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in Thu Dec 30 21:27:46 2010
@@ -1416,7 +1416,7 @@ sub make_targets_file
foreach my $file (@_)
{
- print TARGETS "$file\n";
+ print TARGETS "$file\@\n";
}
close(TARGETS)
Modified: subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py (original)
+++ subversion/branches/ignore-mergeinfo/contrib/server-side/fsfsverify.py Thu Dec 30 21:27:46 2010
@@ -574,7 +574,7 @@ class Rep(object):
if header == 'DELTA':
line = f.readline()
digest = None
-
+
# This should be the start of the svndiff stream
actual_start = f.tell()
try:
@@ -698,12 +698,12 @@ class NodeRev(object):
length = int(values[2])
size = int(values[3])
digest = values[4]
-
+
if len(values) > 5:
sha1 = values[5]
else:
sha1 = None
-
+
if len(values) > 6:
uniquifier = values[6]
else:
@@ -749,10 +749,10 @@ class NodeRev(object):
offset = f.tell()
f.seek(self.text.offset)
self.dir = getDirHash(f)
-
+
for k,v in self.dir.items():
nodeType, nodeId = v
-
+
if nodeId.rev != self.id.rev:
if not os.path.exists(str(nodeId.rev)):
print "Can't check %s" % repr(nodeId)
@@ -763,7 +763,7 @@ class NodeRev(object):
else:
f.seek(nodeId.offset)
idLine = f.readline()
-
+
if idLine != ("id: %s\n" % nodeId):
raise DataCorrupt(
("Entry for '%s' at " % k ) +
Modified: subversion/branches/ignore-mergeinfo/contrib/server-side/mod_dontdothat/mod_dontdothat.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/contrib/server-side/mod_dontdothat/mod_dontdothat.c?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/contrib/server-side/mod_dontdothat/mod_dontdothat.c (original)
+++ subversion/branches/ignore-mergeinfo/contrib/server-side/mod_dontdothat/mod_dontdothat.c Thu Dec 30 21:27:46 2010
@@ -34,7 +34,7 @@
module AP_MODULE_DECLARE_DATA dontdothat_module;
-typedef struct {
+typedef struct dontdothat_config_rec {
const char *config_file;
const char *base_path;
int no_replay;
@@ -62,7 +62,7 @@ static const command_rec dontdothat_cmds
{ NULL }
};
-typedef enum {
+typedef enum parse_state_t {
STATE_BEGINNING,
STATE_IN_UPDATE,
STATE_IN_SRC_PATH,
@@ -70,7 +70,7 @@ typedef enum {
STATE_IN_RECURSIVE
} parse_state_t;
-typedef struct {
+typedef struct dontdothat_filter_ctx {
/* Set to TRUE when we determine that the request is safe and should be
* allowed to continue. */
svn_boolean_t let_it_go;
Modified: subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/fso_is_changeable.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/fso_is_changeable.c?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/fso_is_changeable.c (original)
+++ subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/fso_is_changeable.c Thu Dec 30 21:27:46 2010
@@ -40,7 +40,7 @@
#include <svnstsw/fso_is_changeable.h>
-typedef struct {
+typedef struct search_replace_t {
const char* search;
_Bool match_end;
_Bool match_previous_slash;
Modified: subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/main.c?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/main.c (original)
+++ subversion/branches/ignore-mergeinfo/contrib/server-side/svnstsw/src/main.c Thu Dec 30 21:27:46 2010
@@ -115,7 +115,7 @@ static const mode_t Svnstsw_umask = SVNS
* @brief Structure holding the values passed in via the command-line
* arguments.
*/
-typedef struct {
+typedef struct svnstsw_args_t {
/**
* @brief whether @p svnserve should be passed the @p --read-only
* command-line argument
Modified: subversion/branches/ignore-mergeinfo/notes/fsfs-improvements.txt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/notes/fsfs-improvements.txt?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/notes/fsfs-improvements.txt (original)
+++ subversion/branches/ignore-mergeinfo/notes/fsfs-improvements.txt Thu Dec 30 21:27:46 2010
@@ -54,7 +54,7 @@ reading forward through a file.
Don't Interleave Revision and Content Data
------------------------------------------
-Format "5" keeps the each revision as a single block. When
+Format "5" keeps each revision as a single block. When
re-constructing a node content from the diffs, we jump
through a number of distant revision blocks. For each node.
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Array.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Array.cpp?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Array.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Array.cpp Thu Dec 30 21:27:46 2010
@@ -40,7 +40,7 @@ Array::~Array()
{
JNIUtil::getEnv()->DeleteLocalRef(*it);
}
-
+
JNIUtil::getEnv()->DeleteLocalRef(m_objectArray);
}
}
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ClientContext.cpp?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/ClientContext.cpp Thu Dec 30 21:27:46 2010
@@ -341,7 +341,7 @@ ClientContext::progress(apr_off_t progre
POP_AND_RETURN_NOTHING();
env->CallVoidMethod(jctx, mid, jevent);
-
+
POP_AND_RETURN_NOTHING();
}
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/Prompter.cpp Thu Dec 30 21:27:46 2010
@@ -225,7 +225,7 @@ const char *Prompter::askQuestion(const
// Create a local frame for our references
env->PushLocalFrame(LOCAL_FRAME_SIZE);
if (JNIUtil::isJavaExceptionThrown())
- return false;
+ return NULL;
static jmethodID mid = 0;
static jmethodID mid2 = 0;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.cpp Thu Dec 30 21:27:46 2010
@@ -322,7 +322,7 @@ void SVNClient::add(const char *path,
jlongArray SVNClient::update(Targets &targets, Revision &revision,
svn_depth_t depth, bool depthIsSticky,
- bool ignoreExternals,
+ bool makeParents, bool ignoreExternals,
bool allowUnverObstructions)
{
SVN::Pool requestPool;
@@ -334,12 +334,13 @@ jlongArray SVNClient::update(Targets &ta
const apr_array_header_t *array = targets.array(requestPool);
SVN_JNI_ERR(targets.error_occured(), NULL);
- SVN_JNI_ERR(svn_client_update3(&revs, array,
+ SVN_JNI_ERR(svn_client_update4(&revs, array,
revision.revision(),
depth,
depthIsSticky,
ignoreExternals,
allowUnverObstructions,
+ makeParents,
ctx, requestPool.pool()),
NULL);
@@ -566,7 +567,7 @@ void SVNClient::doImport(const char *pat
SVN_JNI_ERR(svn_client_import4(intPath.c_str(), intUrl.c_str(), depth,
noIgnore, ignoreUnknownNodeTypes,
revprops.hash(requestPool),
- CommitCallback::callback, callback,
+ CommitCallback::callback, callback,
ctx, requestPool.pool()), );
}
@@ -870,7 +871,7 @@ void SVNClient::properties(const char *p
}
void SVNClient::propertySet(const char *path, const char *name,
- const char *value, svn_depth_t depth,
+ JNIByteArray &value, svn_depth_t depth,
StringArray &changelists, bool force,
RevpropTable &revprops, CommitCallback *callback)
{
@@ -879,10 +880,11 @@ void SVNClient::propertySet(const char *
SVN_JNI_NULL_PTR_EX(name, "name", );
svn_string_t *val;
- if (value == NULL)
+ if (value.isNull())
val = NULL;
else
- val = svn_string_create(value, requestPool.pool());
+ val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(),
+ requestPool.pool());
Path intPath(path);
SVN_JNI_ERR(intPath.error_occured(), );
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNClient.h Thu Dec 30 21:27:46 2010
@@ -78,7 +78,7 @@ class SVNClient :public SVNBase
bool ignoreExternals);
void streamFileContent(const char *path, Revision &revision,
Revision &pegRevision, OutputStream &outputStream);
- void propertySet(const char *path, const char *name, const char *value,
+ void propertySet(const char *path, const char *name, JNIByteArray &value,
svn_depth_t depth, StringArray &changelists, bool force,
RevpropTable &revprops, CommitCallback *callback);
void properties(const char *path, Revision &revision,
@@ -129,7 +129,7 @@ class SVNClient :public SVNBase
StringArray &changelists, RevpropTable &revprops,
CommitCallback *callback);
jlongArray update(Targets &targets, Revision &revision, svn_depth_t depth,
- bool depthIsSticky, bool ignoreExternals,
+ bool depthIsSticky, bool makeParents, bool ignoreExternals,
bool allowUnverObstructions);
void add(const char *path, svn_depth_t depth, bool force, bool no_ignore,
bool add_parents);
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/SVNRepos.cpp Thu Dec 30 21:27:46 2010
@@ -322,6 +322,7 @@ void SVNRepos::load(File &path,
SVN_JNI_ERR(svn_repos_load_fs3(repos, dataIn.getStream(requestPool),
uuid_action, relativePath,
usePreCommitHook, usePostCommitHook,
+ FALSE,
notifyCallback != NULL
? ReposNotifyCallback::notify
: NULL,
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/StringArray.cpp Thu Dec 30 21:27:46 2010
@@ -61,7 +61,7 @@ void
StringArray::init(void)
{
const std::vector<jobject> &jobjects = Array::vector();
-
+
for (std::vector<jobject>::const_iterator it = jobjects.begin();
it < jobjects.end(); ++it)
{
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Thu Dec 30 21:27:46 2010
@@ -420,8 +420,8 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT jlongArray JNICALL
Java_org_apache_subversion_javahl_SVNClient_update
(JNIEnv *env, jobject jthis, jobject jtargets, jobject jrevision,
- jobject jdepth, jboolean jdepthIsSticky, jboolean jignoreExternals,
- jboolean jallowUnverObstructions)
+ jobject jdepth, jboolean jdepthIsSticky, jboolean jmakeParents,
+ jboolean jignoreExternals, jboolean jallowUnverObstructions)
{
JNIEntry(SVNClient, update);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -441,6 +441,7 @@ Java_org_apache_subversion_javahl_SVNCli
return cl->update(targets, revision, EnumMapper::toDepth(jdepth),
jdepthIsSticky ? true : false,
+ jmakeParents ? true : false,
jignoreExternals ? true : false,
jallowUnverObstructions ? true : false);
}
@@ -914,7 +915,7 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_propertySet
-(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jstring jvalue,
+(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jbyteArray jvalue,
jobject jdepth, jobject jchangelists, jboolean jforce, jobject jrevpropTable,
jobject jcallback)
{
@@ -933,7 +934,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- JNIStringHolder value(jvalue);
+ JNIByteArray value(jvalue);
if (JNIUtil::isExceptionThrown())
return;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Thu Dec 30 21:27:46 2010
@@ -115,7 +115,7 @@ public class ClientNotifyInformation ext
long oldRevision;
long hunkOriginalStart;
-
+
long hunkOriginalLength;
long hunkModifiedStart;
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Thu Dec 30 21:27:46 2010
@@ -257,8 +257,9 @@ public interface ISVNClient
* @since 1.5
*/
long[] update(Set<String> path, Revision revision, Depth depth,
- boolean depthIsSticky, boolean ignoreExternals,
- boolean allowUnverObstructions) throws ClientException;
+ boolean depthIsSticky, boolean makeParents,
+ boolean ignoreExternals, boolean allowUnverObstructions)
+ throws ClientException;
/**
* Commits changes to the repository.
@@ -674,42 +675,12 @@ public interface ISVNClient
* @throws ClientException
* @since 1.5
*/
- void propertySet(String path, String name, String value, Depth depth,
+ void propertySet(String path, String name, byte[] value, Depth depth,
Collection<String> changelists, boolean force,
Map<String, String> revpropTable, CommitCallback callback)
throws ClientException;
/**
- * Remove one property of an item.
- * @param path path of the item
- * @param name name of the property
- * @param depth the depth to recurse into subdirectories
- * @param changelists changelists to filter by
- * @throws ClientException
- * @since 1.5
- */
- void propertyRemove(String path, String name, Depth depth,
- Collection<String> changelists, CommitCallback callback)
- throws ClientException;
-
- /**
- * Create and sets one property of an item with a byte array value
- *
- * @param path path of the item
- * @param name name of the property
- * @param value new value of the property
- * @param depth depth to set property on the subdirectories
- * @param changelists changelists to filter by
- * @param force do not check if the value is valid
- * @throws ClientException
- * @since 1.5
- */
- void propertyCreate(String path, String name, String value, Depth depth,
- Collection<String> changelists, boolean force,
- CommitCallback callback)
- throws ClientException;
-
- /**
* Retrieve one revsision property of one item
* @param path path of the item
* @param name name of the property
@@ -942,7 +913,7 @@ public interface ISVNClient
*/
void upgrade(String path)
throws ClientException;
-
+
/**
* Apply a unidiff patch.
* @param patchPath the path of the patch
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java Thu Dec 30 21:27:46 2010
@@ -57,15 +57,15 @@ public class ReposNotifyInformation exte
* The warning text.
*/
private String warning;
-
+
private long shard;
-
+
private long newRevision;
-
+
private long oldRevision;
-
+
private NodeAction nodeAction;
-
+
private String path;
/**
@@ -113,17 +113,17 @@ public class ReposNotifyInformation exte
{
return warning;
}
-
+
public long getShard()
{
return shard;
}
-
+
public long getNewRevision()
{
return newRevision;
}
-
+
public long getOldRevision()
{
return oldRevision;
@@ -133,12 +133,12 @@ public class ReposNotifyInformation exte
{
return nodeAction;
}
-
+
public String getPath()
{
return path;
}
-
+
/**
* The type of action triggering the notification
*/
@@ -192,7 +192,7 @@ public class ReposNotifyInformation exte
/** Upgrade has started. */
upgrade_start;
}
-
+
public enum NodeAction
{
change,
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Thu Dec 30 21:27:46 2010
@@ -225,6 +225,7 @@ public class SVNClient implements ISVNCl
*/
public native long[] update(Set<String> paths, Revision revision,
Depth depth, boolean depthIsSticky,
+ boolean makeParents,
boolean ignoreExternals,
boolean allowUnverObstructions)
throws ClientException;
@@ -414,7 +415,7 @@ public class SVNClient implements ISVNCl
/**
* @since 1.5
*/
- public native void propertySet(String path, String name, String value,
+ public native void propertySet(String path, String name, byte[] value,
Depth depth, Collection<String> changelists,
boolean force,
Map<String, String> revpropTable,
@@ -422,30 +423,6 @@ public class SVNClient implements ISVNCl
throws ClientException;
/**
- * @since 1.5
- */
- public void propertyRemove(String path, String name, Depth depth,
- Collection<String> changelists,
- CommitCallback callback)
- throws ClientException
- {
- propertySet(path, name, null, depth, changelists, false, null,
- callback);
- }
-
- /**
- * @since 1.5
- */
- public void propertyCreate(String path, String name, String value,
- Depth depth, Collection<String> changelists,
- boolean force, CommitCallback callback)
- throws ClientException
- {
- propertySet(path, name, value, depth, changelists, force, null,
- callback);
- }
-
- /**
* @since 1.0
*/
public native byte[] revProperty(String path, String name, Revision rev)
@@ -638,7 +615,7 @@ public class SVNClient implements ISVNCl
Collection<String> changelists,
InfoCallback callback)
throws ClientException;
-
+
/**
* @since 1.7
*/
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java Thu Dec 30 21:27:46 2010
@@ -121,7 +121,7 @@ public final class Depth
{
return (recurse ? unknown : immediates);
}
-
+
public static org.apache.subversion.javahl.types.Depth toADepth(int depth)
{
switch(depth)
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java Thu Dec 30 21:27:46 2010
@@ -157,13 +157,13 @@ public class Info implements java.io.Ser
checkAbsent(aInfo.getPath()), checkIncomplete(aInfo.getPath()),
aInfo.getCopyFromRev(), aInfo.getCopyFromUrl());
}
-
+
private static boolean checkAbsent(String path)
{
File f = new File(path);
return !f.exists();
}
-
+
/** See if the path is incomplete. We currently have no way of getting
* this information from the existing info struct, so just return false.
*/
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java Thu Dec 30 21:27:46 2010
@@ -391,7 +391,7 @@ public class Revision implements java.io
return RevisionKind.working;
}
}
-
+
public static org.apache.subversion.javahl.Revision.Kind toAKind(int kind)
{
switch (kind)
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java Thu Dec 30 21:27:46 2010
@@ -645,7 +645,7 @@ public class SVNAdmin
}
if (val != null)
- try
+ try
{
outputer.write(val.getBytes());
}
Modified: subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1054005&r1=1054004&r2=1054005&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/ignore-mergeinfo/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Thu Dec 30 21:27:46 2010
@@ -903,7 +903,7 @@ public class SVNClient implements SVNCli
{
return aSVNClient.update(new HashSet<String>(Arrays.asList(paths)),
revision == null ? null : revision.toApache(),
- Depth.toADepth(depth), depthIsSticky,
+ Depth.toADepth(depth), depthIsSticky, false,
ignoreExternals, allowUnverObstructions);
}
catch (org.apache.subversion.javahl.ClientException ex)
@@ -1853,7 +1853,9 @@ public class SVNClient implements SVNCli
{
try
{
- aSVNClient.propertySet(path, name, value, Depth.toADepth(depth),
+ aSVNClient.propertySet(path, name,
+ value == null ? null : value.getBytes(),
+ Depth.toADepth(depth),
changelists == null ? null
: Arrays.asList(changelists),
force, revpropTable, null);