[Midnightbsd-cvs] src [9266] U trunk/contrib/subversion/tools/server-side: upgrade svn 1.8.10
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Feb 19 21:39:09 EST 2017
Revision: 9266
http://svnweb.midnightbsd.org/src/?rev=9266
Author: laffer1
Date: 2017-02-19 21:39:09 -0500 (Sun, 19 Feb 2017)
Log Message:
-----------
upgrade svn 1.8.10
Modified Paths:
--------------
trunk/contrib/subversion/CHANGES
trunk/contrib/subversion/INSTALL
trunk/contrib/subversion/Makefile.in
trunk/contrib/subversion/NOTICE
trunk/contrib/subversion/build/ac-macros/apache.m4
trunk/contrib/subversion/build/ac-macros/berkeley-db.m4
trunk/contrib/subversion/build/ac-macros/compiler.m4
trunk/contrib/subversion/build/ac-macros/serf.m4
trunk/contrib/subversion/build/generator/gen_base.py
trunk/contrib/subversion/build/generator/gen_win.py
trunk/contrib/subversion/build/generator/templates/vcnet_sln.ezt
trunk/contrib/subversion/build/generator/templates/vcnet_vcproj.ezt
trunk/contrib/subversion/build/run_ctypesgen.sh
trunk/contrib/subversion/build-outputs.mk
trunk/contrib/subversion/build.conf
trunk/contrib/subversion/configure
trunk/contrib/subversion/configure.ac
trunk/contrib/subversion/get-deps.sh
trunk/contrib/subversion/subversion/bindings/ctypes-python/csvn/txn.py
trunk/contrib/subversion/subversion/bindings/javahl/native/JNIUtil.cpp
trunk/contrib/subversion/subversion/bindings/javahl/native/JNIUtil.h
trunk/contrib/subversion/subversion/bindings/javahl/native/SVNClient.cpp
trunk/contrib/subversion/subversion/bindings/swig/core.i
trunk/contrib/subversion/subversion/bindings/swig/include/svn_types.swg
trunk/contrib/subversion/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
trunk/contrib/subversion/subversion/bindings/swig/perl/native/Makefile.PL.in
trunk/contrib/subversion/subversion/bindings/swig/perl/native/core.c
trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_client.c
trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_delta.c
trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_fs.c
trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_ra.c
trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_repos.c
trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_wc.c
trunk/contrib/subversion/subversion/bindings/swig/python/client.py
trunk/contrib/subversion/subversion/bindings/swig/python/core.c
trunk/contrib/subversion/subversion/bindings/swig/python/fs.py
trunk/contrib/subversion/subversion/bindings/swig/python/svn_client.c
trunk/contrib/subversion/subversion/bindings/swig/python/svn_fs.c
trunk/contrib/subversion/subversion/bindings/swig/python/tests/client.py
trunk/contrib/subversion/subversion/bindings/swig/ruby/core.c
trunk/contrib/subversion/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_client.c
trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_delta.c
trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_fs.c
trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_ra.c
trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_repos.c
trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_wc.c
trunk/contrib/subversion/subversion/bindings/swig/ruby/test/test_client.rb
trunk/contrib/subversion/subversion/bindings/swig/ruby/test/test_wc.rb
trunk/contrib/subversion/subversion/bindings/swig/svn_client.i
trunk/contrib/subversion/subversion/include/private/svn_auth_private.h
trunk/contrib/subversion/subversion/include/private/svn_cache.h
trunk/contrib/subversion/subversion/include/private/svn_client_private.h
trunk/contrib/subversion/subversion/include/private/svn_dep_compat.h
trunk/contrib/subversion/subversion/include/private/svn_diff_tree.h
trunk/contrib/subversion/subversion/include/private/svn_mutex.h
trunk/contrib/subversion/subversion/include/private/svn_subr_private.h
trunk/contrib/subversion/subversion/include/svn_auth.h
trunk/contrib/subversion/subversion/include/svn_client.h
trunk/contrib/subversion/subversion/include/svn_config.h
trunk/contrib/subversion/subversion/include/svn_diff.h
trunk/contrib/subversion/subversion/include/svn_dirent_uri.h
trunk/contrib/subversion/subversion/include/svn_io.h
trunk/contrib/subversion/subversion/include/svn_repos.h
trunk/contrib/subversion/subversion/include/svn_types.h
trunk/contrib/subversion/subversion/include/svn_version.h
trunk/contrib/subversion/subversion/include/svn_wc.h
trunk/contrib/subversion/subversion/libsvn_client/commit.c
trunk/contrib/subversion/subversion/libsvn_client/commit_util.c
trunk/contrib/subversion/subversion/libsvn_client/copy.c
trunk/contrib/subversion/subversion/libsvn_client/delete.c
trunk/contrib/subversion/subversion/libsvn_client/export.c
trunk/contrib/subversion/subversion/libsvn_client/externals.c
trunk/contrib/subversion/subversion/libsvn_client/log.c
trunk/contrib/subversion/subversion/libsvn_client/merge.c
trunk/contrib/subversion/subversion/libsvn_client/mergeinfo.c
trunk/contrib/subversion/subversion/libsvn_client/prop_commands.c
trunk/contrib/subversion/subversion/libsvn_client/update.c
trunk/contrib/subversion/subversion/libsvn_client/util.c
trunk/contrib/subversion/subversion/libsvn_delta/svndiff.c
trunk/contrib/subversion/subversion/libsvn_diff/diff_file.c
trunk/contrib/subversion/subversion/libsvn_fs/fs-loader.c
trunk/contrib/subversion/subversion/libsvn_fs_base/fs.c
trunk/contrib/subversion/subversion/libsvn_fs_fs/fs.c
trunk/contrib/subversion/subversion/libsvn_fs_fs/fs.h
trunk/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
trunk/contrib/subversion/subversion/libsvn_ra/ra_loader.c
trunk/contrib/subversion/subversion/libsvn_ra/ra_loader.h
trunk/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
trunk/contrib/subversion/subversion/libsvn_ra_local/split_url.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/commit.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/locks.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/log.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/options.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
trunk/contrib/subversion/subversion/libsvn_ra_serf/replay.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/serf.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/update.c
trunk/contrib/subversion/subversion/libsvn_ra_serf/util.c
trunk/contrib/subversion/subversion/libsvn_ra_svn/client.c
trunk/contrib/subversion/subversion/libsvn_ra_svn/protocol
trunk/contrib/subversion/subversion/libsvn_repos/commit.c
trunk/contrib/subversion/subversion/libsvn_repos/dump.c
trunk/contrib/subversion/subversion/libsvn_repos/fs-wrap.c
trunk/contrib/subversion/subversion/libsvn_repos/reporter.c
trunk/contrib/subversion/subversion/libsvn_subr/auth.c
trunk/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
trunk/contrib/subversion/subversion/libsvn_subr/cache-memcache.c
trunk/contrib/subversion/subversion/libsvn_subr/cache_config.c
trunk/contrib/subversion/subversion/libsvn_subr/cmdline.c
trunk/contrib/subversion/subversion/libsvn_subr/config_auth.c
trunk/contrib/subversion/subversion/libsvn_subr/config_file.c
trunk/contrib/subversion/subversion/libsvn_subr/deprecated.c
trunk/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
trunk/contrib/subversion/subversion/libsvn_subr/internal_statements.h
trunk/contrib/subversion/subversion/libsvn_subr/io.c
trunk/contrib/subversion/subversion/libsvn_subr/opt.c
trunk/contrib/subversion/subversion/libsvn_subr/prompt.c
trunk/contrib/subversion/subversion/libsvn_subr/sqlite.c
trunk/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
trunk/contrib/subversion/subversion/libsvn_subr/subst.c
trunk/contrib/subversion/subversion/libsvn_subr/sysinfo.c
trunk/contrib/subversion/subversion/libsvn_subr/utf.c
trunk/contrib/subversion/subversion/libsvn_subr/version.c
trunk/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
trunk/contrib/subversion/subversion/libsvn_subr/win32_crypto.c
trunk/contrib/subversion/subversion/libsvn_wc/conflicts.h
trunk/contrib/subversion/subversion/libsvn_wc/diff.h
trunk/contrib/subversion/subversion/libsvn_wc/diff_editor.c
trunk/contrib/subversion/subversion/libsvn_wc/diff_local.c
trunk/contrib/subversion/subversion/libsvn_wc/info.c
trunk/contrib/subversion/subversion/libsvn_wc/old-and-busted.c
trunk/contrib/subversion/subversion/libsvn_wc/status.c
trunk/contrib/subversion/subversion/libsvn_wc/update_editor.c
trunk/contrib/subversion/subversion/libsvn_wc/upgrade.c
trunk/contrib/subversion/subversion/libsvn_wc/wc-checks.h
trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.h
trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
trunk/contrib/subversion/subversion/libsvn_wc/wc.h
trunk/contrib/subversion/subversion/libsvn_wc/wc_db.c
trunk/contrib/subversion/subversion/libsvn_wc/wc_db.h
trunk/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
trunk/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
trunk/contrib/subversion/subversion/libsvn_wc/wc_db_util.c
trunk/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
trunk/contrib/subversion/subversion/mod_authz_svn/mod_authz_svn.c
trunk/contrib/subversion/subversion/mod_dav_svn/dav_svn.h
trunk/contrib/subversion/subversion/mod_dav_svn/lock.c
trunk/contrib/subversion/subversion/mod_dav_svn/mod_dav_svn.c
trunk/contrib/subversion/subversion/mod_dav_svn/reports/update.c
trunk/contrib/subversion/subversion/mod_dav_svn/repos.c
trunk/contrib/subversion/subversion/mod_dav_svn/util.c
trunk/contrib/subversion/subversion/po/sv.po
trunk/contrib/subversion/subversion/svn/cl.h
trunk/contrib/subversion/subversion/svn/conflict-callbacks.c
trunk/contrib/subversion/subversion/svn/status-cmd.c
trunk/contrib/subversion/subversion/svn/status.c
trunk/contrib/subversion/subversion/svn/svn.c
trunk/contrib/subversion/subversion/svnadmin/svnadmin.c
trunk/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
trunk/contrib/subversion/subversion/svnlook/svnlook.c
trunk/contrib/subversion/subversion/svnmucc/svnmucc.c
trunk/contrib/subversion/subversion/svnrdump/util.c
trunk/contrib/subversion/subversion/svnserve/serve.c
trunk/contrib/subversion/subversion/svnserve/svnserve.c
trunk/contrib/subversion/subversion/svnsync/svnsync.c
trunk/contrib/subversion/subversion/svnversion/svnversion.c
trunk/contrib/subversion/subversion/tests/cmdline/authz_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/autoprop_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/cat_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/checkout_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/commit_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/copy_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/davautocheck.sh
trunk/contrib/subversion/subversion/tests/cmdline/diff_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/export_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/externals_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/getopt_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/info_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/lock_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/merge_automatic_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/merge_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/move_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/prop_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/redirect_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/revert_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/stat_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svnadmin_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svndumpfilter_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svntest/main.py
trunk/contrib/subversion/subversion/tests/cmdline/svntest/objects.py
trunk/contrib/subversion/subversion/tests/cmdline/trans_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/update_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/upgrade_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/wc_tests.py
trunk/contrib/subversion/subversion/tests/libsvn_fs_fs/fs-pack-test.c
trunk/contrib/subversion/subversion/tests/libsvn_repos/repos-test.c
trunk/contrib/subversion/subversion/tests/libsvn_subr/checksum-test.c
trunk/contrib/subversion/subversion/tests/libsvn_subr/dirent_uri-test.c
trunk/contrib/subversion/subversion/tests/libsvn_subr/translate-test.c
trunk/contrib/subversion/subversion/tests/libsvn_wc/conflict-data-test.c
trunk/contrib/subversion/subversion/tests/libsvn_wc/op-depth-test.c
trunk/contrib/subversion/subversion/tests/libsvn_wc/utils.c
trunk/contrib/subversion/subversion/tests/libsvn_wc/utils.h
trunk/contrib/subversion/subversion/tests/libsvn_wc/wc-queries-test.c
trunk/contrib/subversion/subversion/tests/svn_test.h
trunk/contrib/subversion/subversion/tests/svn_test_main.c
trunk/contrib/subversion/tools/dev/gen_junit_report.py
trunk/contrib/subversion/tools/examples/blame.py
trunk/contrib/subversion/tools/hook-scripts/commit-access-control.cfg.example
trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.conf.example
trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer.conf
trunk/contrib/subversion/tools/hook-scripts/svnperms.conf.example
trunk/contrib/subversion/tools/po/l10n-report.py
trunk/contrib/subversion/tools/server-side/fsfs-stats.c
trunk/contrib/subversion/tools/server-side/mod_dontdothat/mod_dontdothat.c
trunk/contrib/subversion/tools/server-side/svnauthz.c
trunk/contrib/subversion/tools/server-side/svnpubsub/daemonize.py
trunk/contrib/subversion/tools/server-side/svnpubsub/svnwcsub.py
Added Paths:
-----------
trunk/contrib/subversion/subversion/bindings/ctypes-python/csvn/core/
trunk/contrib/subversion/subversion/include/private/svn_cert.h
trunk/contrib/subversion/subversion/po/subversion.pot
trunk/contrib/subversion/subversion/tests/cmdline/import_tests_data/import_tree/DIR1.noo/
trunk/contrib/subversion/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/DIR7/DIR8.noo/
trunk/contrib/subversion/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_7_dir_external.tar.bz2
trunk/contrib/subversion/subversion/tests/libsvn_subr/zlib.deflated
trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub
trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub
Property Changed:
----------------
trunk/contrib/subversion/
trunk/contrib/subversion/autogen.sh
trunk/contrib/subversion/build/PrintPath
trunk/contrib/subversion/build/buildcheck.sh
trunk/contrib/subversion/build/config.guess
trunk/contrib/subversion/build/config.sub
trunk/contrib/subversion/build/find_python.sh
trunk/contrib/subversion/build/generator/extractor.py
trunk/contrib/subversion/build/generator/ezt.py
trunk/contrib/subversion/build/generator/swig/checkout_swig_header.py
trunk/contrib/subversion/build/generator/swig/external_runtime.py
trunk/contrib/subversion/build/generator/swig/header_wrappers.py
trunk/contrib/subversion/build/getversion.py
trunk/contrib/subversion/build/install-sh
trunk/contrib/subversion/build/run_ctypesgen.sh
trunk/contrib/subversion/build/run_tests.py
trunk/contrib/subversion/build/transform_libtool_scripts.sh
trunk/contrib/subversion/build/transform_sql.py
trunk/contrib/subversion/configure
trunk/contrib/subversion/gen-make.py
trunk/contrib/subversion/get-deps.sh
trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/example.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/log.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/mucc.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/trunkify.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/setup.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/test/localrepos.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/test/remoterepos.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/test/run_all.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/test/setup_path.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/test/svntypes.py
trunk/contrib/subversion/subversion/bindings/ctypes-python/test/wc.py
trunk/contrib/subversion/subversion/bindings/swig/python/tests/trac/test.py
trunk/contrib/subversion/subversion/bindings/swig/ruby/test/run-test.rb
trunk/contrib/subversion/subversion/libsvn_subr/genctype.py
trunk/contrib/subversion/subversion/tests/cmdline/authz_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/autoprop_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/basic_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/blame_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/cat_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/changelist_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/checkout_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/commit_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/copy_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/dav-mirror-autocheck.sh
trunk/contrib/subversion/subversion/tests/cmdline/davautocheck.sh
trunk/contrib/subversion/subversion/tests/cmdline/depth_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/diff_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/entries_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/export_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/externals_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/getopt_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/history_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/import_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/info_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/input_validation_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/iprop_authz_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/iprop_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/legacy/utf8_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/lock_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/log_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/merge_authz_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/merge_automatic_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/merge_reintegrate_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/merge_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/merge_tree_conflict_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/mergeinfo_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/move_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/patch_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/prop_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/redirect_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/relocate_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/resolve_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/revert_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/schedule_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/special_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/stat_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svnadmin_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svnauthz_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svndumpfilter_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svneditor.py
trunk/contrib/subversion/subversion/tests/cmdline/svnlook_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svnmucc_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svnrdump_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svnserveautocheck.sh
trunk/contrib/subversion/subversion/tests/cmdline/svnsync_authz_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svnsync_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/svnversion_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/switch_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/trans_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/tree_conflict_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/update_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/upgrade_tests.py
trunk/contrib/subversion/subversion/tests/cmdline/wc_tests.py
trunk/contrib/subversion/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
trunk/contrib/subversion/subversion/tests/manual/tree-conflicts-add-vs-add.py
trunk/contrib/subversion/tools/backup/hot-backup.py.in
trunk/contrib/subversion/tools/bdb/erase-all-text-data.py
trunk/contrib/subversion/tools/bdb/svn-bdb-view.py
trunk/contrib/subversion/tools/bdb/whatis-rep.py
trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck.sh
trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnclean.sh
trunk/contrib/subversion/tools/buildbot/slaves/centos/svnbuild.sh
trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck-bindings.sh
trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck.sh
trunk/contrib/subversion/tools/buildbot/slaves/centos/svnclean.sh
trunk/contrib/subversion/tools/buildbot/slaves/centos/svnlog.sh
trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh
trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh
trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh
trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh
trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh
trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh
trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh
trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh
trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh
trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnclean.sh
trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnlog.sh
trunk/contrib/subversion/tools/client-side/bash_completion_test
trunk/contrib/subversion/tools/client-side/change-svn-wc-format.py
trunk/contrib/subversion/tools/client-side/detach.py
trunk/contrib/subversion/tools/client-side/mergeinfo-sanitizer.py
trunk/contrib/subversion/tools/client-side/server-version.py
trunk/contrib/subversion/tools/client-side/showchange.pl
trunk/contrib/subversion/tools/client-side/svn-graph.pl
trunk/contrib/subversion/tools/client-side/svn-ssl-fingerprints.sh
trunk/contrib/subversion/tools/client-side/svn-viewspec.py
trunk/contrib/subversion/tools/client-side/wcfind
trunk/contrib/subversion/tools/dev/analyze-svnlogs.py
trunk/contrib/subversion/tools/dev/benchmarks/large_dirs/create_bigdir.sh
trunk/contrib/subversion/tools/dev/benchmarks/suite1/benchmark.py
trunk/contrib/subversion/tools/dev/benchmarks/suite1/cronjob
trunk/contrib/subversion/tools/dev/benchmarks/suite1/generate_charts
trunk/contrib/subversion/tools/dev/benchmarks/suite1/run
trunk/contrib/subversion/tools/dev/check-license.py
trunk/contrib/subversion/tools/dev/contribulyze.py
trunk/contrib/subversion/tools/dev/datecheck.py
trunk/contrib/subversion/tools/dev/find-bad-style.py
trunk/contrib/subversion/tools/dev/find-unmoved-deprecated.sh
trunk/contrib/subversion/tools/dev/gen-javahl-errors.py
trunk/contrib/subversion/tools/dev/gen-py-errors.py
trunk/contrib/subversion/tools/dev/gen_junit_report.py
trunk/contrib/subversion/tools/dev/gnuify-changelog.pl
trunk/contrib/subversion/tools/dev/graph-dav-servers.py
trunk/contrib/subversion/tools/dev/histogram.py
trunk/contrib/subversion/tools/dev/iz/ff2csv.command
trunk/contrib/subversion/tools/dev/iz/ff2csv.py
trunk/contrib/subversion/tools/dev/iz/find-fix.py
trunk/contrib/subversion/tools/dev/iz/run-queries.sh
trunk/contrib/subversion/tools/dev/lock-check.py
trunk/contrib/subversion/tools/dev/log_revnum_change_asf.py
trunk/contrib/subversion/tools/dev/merge-graph.py
trunk/contrib/subversion/tools/dev/min-includes.sh
trunk/contrib/subversion/tools/dev/mklog.py
trunk/contrib/subversion/tools/dev/mlpatch.py
trunk/contrib/subversion/tools/dev/normalize-dump.py
trunk/contrib/subversion/tools/dev/po-merge.py
trunk/contrib/subversion/tools/dev/prebuild-cleanup.sh
trunk/contrib/subversion/tools/dev/random-commits.py
trunk/contrib/subversion/tools/dev/remove-trailing-whitespace.sh
trunk/contrib/subversion/tools/dev/sbox-ospath.py
trunk/contrib/subversion/tools/dev/scramble-tree.py
trunk/contrib/subversion/tools/dev/stress.pl
trunk/contrib/subversion/tools/dev/svn-merge-revs.py
trunk/contrib/subversion/tools/dev/svnqlite3-dump
trunk/contrib/subversion/tools/dev/trails.py
trunk/contrib/subversion/tools/dev/verify-history.py
trunk/contrib/subversion/tools/dev/warn-ignored-err.sh
trunk/contrib/subversion/tools/dev/wc-format.py
trunk/contrib/subversion/tools/dev/wc-ng/bump-to-19.py
trunk/contrib/subversion/tools/dev/wc-ng/count-progress.py
trunk/contrib/subversion/tools/dev/wc-ng/gather-data.sh
trunk/contrib/subversion/tools/dev/wc-ng/graph-data.py
trunk/contrib/subversion/tools/dev/wc-ng/populate-pristine.py
trunk/contrib/subversion/tools/dev/which-error.py
trunk/contrib/subversion/tools/dist/backport.pl
trunk/contrib/subversion/tools/dist/checksums.py
trunk/contrib/subversion/tools/dist/collect_sigs.py
trunk/contrib/subversion/tools/dist/dist.sh
trunk/contrib/subversion/tools/dist/download-release.sh
trunk/contrib/subversion/tools/dist/extract-for-examination.sh
trunk/contrib/subversion/tools/dist/make-deps-tarball.sh
trunk/contrib/subversion/tools/dist/nightly.sh
trunk/contrib/subversion/tools/dist/release.py
trunk/contrib/subversion/tools/dist/test.sh
trunk/contrib/subversion/tools/examples/SvnCLBrowse
trunk/contrib/subversion/tools/examples/blame.py
trunk/contrib/subversion/tools/examples/check-modified.py
trunk/contrib/subversion/tools/examples/dumpprops.py
trunk/contrib/subversion/tools/examples/get-location-segments.py
trunk/contrib/subversion/tools/examples/getfile.py
trunk/contrib/subversion/tools/examples/geturl.py
trunk/contrib/subversion/tools/examples/putfile.py
trunk/contrib/subversion/tools/examples/revplist.py
trunk/contrib/subversion/tools/examples/svnlog2html.rb
trunk/contrib/subversion/tools/examples/svnlook.py
trunk/contrib/subversion/tools/examples/svnlook.rb
trunk/contrib/subversion/tools/examples/svnshell.py
trunk/contrib/subversion/tools/examples/svnshell.rb
trunk/contrib/subversion/tools/examples/walk-config-auth.py
trunk/contrib/subversion/tools/hook-scripts/commit-access-control.pl.in
trunk/contrib/subversion/tools/hook-scripts/commit-email.rb
trunk/contrib/subversion/tools/hook-scripts/control-chars.py
trunk/contrib/subversion/tools/hook-scripts/log-police.py
trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.py
trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-init.sh
trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-t1.sh
trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-tweak.py
trunk/contrib/subversion/tools/hook-scripts/persist-ephemeral-txnprops.py
trunk/contrib/subversion/tools/hook-scripts/svn2feed.py
trunk/contrib/subversion/tools/hook-scripts/svnperms.py
trunk/contrib/subversion/tools/hook-scripts/validate-extensions.py
trunk/contrib/subversion/tools/hook-scripts/validate-files.py
trunk/contrib/subversion/tools/hook-scripts/verify-po.py
trunk/contrib/subversion/tools/po/l10n-report.py
trunk/contrib/subversion/tools/po/po-update.sh
trunk/contrib/subversion/tools/server-side/fsfs-reshard.py
trunk/contrib/subversion/tools/server-side/svn-backup-dumps.py
trunk/contrib/subversion/tools/server-side/svn_server_log_parse.py
trunk/contrib/subversion/tools/server-side/svnpredumpfilter.py
trunk/contrib/subversion/tools/server-side/svnpubsub/commit-hook.py
trunk/contrib/subversion/tools/server-side/svnpubsub/irkerbridge.py
trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.debian
trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd
trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.solaris
trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd
trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
trunk/contrib/subversion/tools/server-side/svnpubsub/svntweet.py
trunk/contrib/subversion/tools/server-side/svnpubsub/svnwcsub.py
trunk/contrib/subversion/tools/server-side/svnpubsub/testserver.py
trunk/contrib/subversion/tools/server-side/svnpubsub/watcher.py
trunk/contrib/subversion/tools/server-side/test_svn_server_log_parse.py
Index: trunk/contrib/subversion
===================================================================
--- trunk/contrib/subversion 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/vendor/apache/subversion/dist:9263-9265
\ No newline at end of property
Modified: trunk/contrib/subversion/CHANGES
===================================================================
--- trunk/contrib/subversion/CHANGES 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/CHANGES 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,3 +1,304 @@
+Version 1.8.10
+(11 Aug 2014, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.10
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * guard against md5 hash collisions when finding cached credentials
+ (r1550691, r1550772, r1600909)
+ * ra_serf: properly match wildcards in SSL certs. (r1615211, 1615219)
+ * ra_serf: ignore the CommonName in SSL certs where there are Subject Alt
+ Names (r1565531, r1566503, r1568349, r1568361)
+ * ra_serf: fix a URI escaping bug that prevented deleting locked paths
+ (r1594223, r1553501, r1553556, r1559197, issue #3674)
+ * rm: Display the proper URL when deleting a URL in the commit log editor
+ (r1591123)
+ * log: Fix another instance of broken pipe error (r1596866, issue #3014)
+ * copy: Properly handle props not present or excluded on cross wc copy
+ (r1589184, r1589188)
+ * copy: Fix copying parents of locally deleted nodes between wcs
+ (r1589460, r1589486)
+ * externals: Properly delete ancestor directories of externals when
+ removing the external by changing svn:externals. (r1600311, 1600315,
+ r1600323, r1600393)
+ * ra_serf: fix memory lifetime of some hash values (r1606009)
+
+ - Server-side bugfixes:
+ * fsfs: omit config file when creating pre-1.5 format repos (r1547454,
+ r1561703)
+
+ Developer-visible changes:
+ - General:
+ * fix improper linking when serf is in the same prefix as existing svn
+ libraries. (r1609004)
+ * use proper intermediate directory when building with VS 2003-2008
+ (r1595431)
+ * support generating VS 2013 and later project files.
+
+ - Bindings:
+ * ruby: removing warning about Ruby 1.9 support being new. (r1593992)
+ * python: fix notify_func callbacks (r1594794, r1594814, r1594834, r1595061)
+
+
+Version 1.8.9
+(07 May 2014, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.9
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * log: use proper peg revision over DAV (r1568872)
+ * upgrade: allow upgrading from 1.7 with exclusive locks (r1572102 et al)
+ * proplist: resolve inconsitent inherited property results (r1575270 et al)
+ * increase minimal timestamp sleep from 1ms to 10ms (r1581305 et al)
+ * merge: automatic merge confused by subtree merge (issue #4481)
+ * propget: report proper error on invalid revision for url (r1586255)
+ * commit: fix an assertion when committing a deleted descendant
+ (r1571747, r1571787, r1571795)
+ * merge: resolve segfault when '--force' merges a directory delete
+ (r1577812, r1577813, r1579429)
+ * resolve: prevent interactive conflict resolution when nothing has been
+ done to resolve the conflict (r1577294)
+ * update: fix locks lost from wc with pre-1.6.17 servers (issue #4412)
+ * merge: honor the 'preserved-conflict-file-exts' setting (r1577151)
+ * list: fix '--verbose' against older servers (r1591111)
+ * unlock: fix ability to remove locks with timeouts (r1579588)
+ * copy: fix 'svn copy URL WC' on relocated working copies
+ (r1580626, r1580650)
+ * export: allow file externals to be exported (issue #4427)
+ * move: fix working copy db inconsistency in cert scenarios (issue #4437)
+ * commit: fix an issue where mixed revision copy with non copy descendants
+ that shadow a not present node couldn't be committed (r1518942 et al)
+ * delete: properly remove move_to info when the node in its original
+ location is removed (r1538812 et al)
+ * status; fix an issue where output would vary based on if the target
+ was the node itself or its parent (r1544597 et al)
+
+ - Server-side bugfixes:
+ * ensure proper access synchronization in fsfs on Windows (r1568953 et al)
+ * svnadmin dump: don't let invalid mergeinfo stop dump (r1574868 et al)
+ * svnserve: resolve performance regression caused by iprops (r1578853 et al)
+ * reduce size of memory buffer when reading config files (r1581296)
+ * remove dead transaction if commit was blocked by hook (r1583977)
+ * svnrdump load: fix crash when svn:* normalization (issue #4490)
+ * fix memcached support (issue #4470)
+ * svndumpfilter: fix order of node record headers (r1578670 et al)
+ * mod_dav_svn: blacklist building with broken versions of httpd; 2.2.25,
+ 2.4.5 and 2.4.6 (r1545835)
+ * mod_dav_svn: allow generic DAV clients to refresh locks (issue #3515)
+ * mod_dav_svn: detect out of dateness correctly during commit (issue #4480)
+
+ Developer-visible changes:
+ - General:
+ * improve consistency checks of DAV inherited property requests (r1498000)
+ * fix ocassional failure in autoprop_tests.py (r1567752)
+ * avoid duplicate sqlite analyze information rows (r1571214)
+ * add Mavericks to our sysinfo output (r1573088)
+ * bump copyright years to 2014 (r1555403)
+ * unbreak test suite when running as root (r1583580)
+ * resolve buffer overflow in testcode (r1481782)
+ * fix libmagic detection with custom LDFLAGS (r1577200)
+ * fix an out of scope variable use in merge (r1587946)
+ * javahl: fix crash from resolve callback throwing an exception (r1586439)
+ * ruby: fix two memory lifetime bugs (r1586052, r1586467)
+ * fix a missing null byte when handling old pre-1.4 deltas (r1587968)
+ * fix building with APR 0.9.x (r1585499)
+ * make svn_ra_get_locks() and svn_ra_get_lock() report not locked nodes
+ with a NULL svn_lock_t *, as documented (r1578273, r1578311, r1578326)
+ * fix tests for compiler flags (r1573106)
+
+
+Version 1.8.8
+(19 Feb 2014, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.8
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * use CryptoAPI to validate intermediary certificates on Windows (r1564623)
+ * fix automatic relocate for wcs not at repository root (r1541638 et al)
+ * diff: fix when target is a drive root on Windows (r1541635)
+ * wc: improve performance when used with SQLite 3.8 (r1542765)
+ * copy: fix some scenarios that broke the working copy (r1560690)
+ * move: fix errors when moving files between an external and the parent
+ working copy (r1551524, r1551579)
+ * log: resolve performance regression in certain scenarios (r1553101 et al)
+ * merge: decrease work to detect differences between 3 files (r1548486)
+ * checkout: don't require flush support for symlinks on Windows (r1547774)
+ * commit: don't change file permissions inappropriately (issue #4440)
+ * commit: fix assertion due to invalid pool lifetime (r1553376 et al)
+ * version: don't cut off the distribution version on Linux (r1544878 et al)
+ * flush stdout before exiting to avoid information being lost (r1499470)
+ * status: fix missing sentinel value on warning codes (r1543145)
+ * update/switch: improve some WC db queries that may return incorrect
+ results depending on how SQLite is built (r1567109)
+
+ - Server-side bugfixes:
+ * reduce memory usage during checkout and export (r1564215)
+ * fsfs: create rep-cache.db with proper permissions (issue #3437)
+ * mod_dav_svn: prevent crashes with SVNListParentPath on (CVE-2014-0032)
+ * mod_dav_svn: fix SVNAllowBulkUpdates directive merging (r1548105)
+ * mod_dav_svn: include requested property changes in reports (r1557522)
+ * svnserve: correct default cache size in help text (r1563110)
+ * svnadmin dump: reduce size of dump files with '--deltas' (r1554978)
+ * resolve integer underflow that resulted in infinite loops (r1567985)
+
+ Developer-visible changes:
+ - General:
+ * fix ocassional failure of check_tests.py 12 (r1496127 et al)
+ * fix failure with SQLite 3.8.1-3.8.3 when built with
+ SQLITE_ENABLE_STAT3/4 due to bug in SQLite (r1567286, r1567392)
+ * specify SQLite defaults that can be changed when SQLite is built
+ to avoid unexpected behavior with Subversion (r1567064)
+
+ - API changes:
+ * numerous documentation fixes
+ * svn_client_commit_item3_dup() fix pool lifetime issues (r1550803)
+ * ra_serf: properly ask multiple certificate validation providers for
+ acceptance of certificate failures (r1535532)
+ * release internal fs objects when closing commit editor (r1555499)
+ * svn_client_proplist4() don't call the callback multiple times for
+ the same path in order to deliver inherited properties (r1549858 et al)
+
+ - Bindings:
+ * javahl: make test suite run without installing on OS X (r1535115)
+ * swig: fix building out of tarball on OS X (r1555654)
+ * swig-pl: fix with --enable-sqlite-compatibility-version (r1559009)
+ * swig: fix building bindings on OS X when APR has the -no-cpp-precomp
+ flag in the apr-config --cppflags output. (r1535610)
+ * swig: fix building from tarball with an out-of-tree build (r1543187)
+
+
+Version 1.8.7
+(Not released, see changes for 1.8.8.)
+
+Version 1.8.6
+(Not released, see changes for 1.8.8.)
+
+
+Version 1.8.5
+(25 November 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.5
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * fix externals that point at redirected locations (issues #4428, #4429)
+ * diff: fix assertion with move inside a copy (issue #4444)
+
+ - Server-side bugfixes:
+ * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+ * mod_dav_svn: canonicalize paths properly (r1542071)
+ * mod_authz_svn: fix crash of mod_authz_svn with invalid config (r1541432)
+ * hotcopy: fix hotcopy losing revprop files in packed repos (issue #4448)
+
+ - Other tool improvements and bugfixes:
+ * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+ - General:
+ * fix compilation with '--enable-optimize' with clang (r1534860)
+ * fix compilation with debug build of BDB on Windows (r1501656, r1501702)
+ * fix '--with-openssl' option when building on Windows (r1535139)
+ * add test to fail when built against broken ZLib (r1537193 et al)
+
+ - Bindings:
+ * swig-rb: fix tests to run without installing on OS X (r1535161)
+ * ctypes-python: build with compiler selected via configure (r1536537)
+
+
+Version 1.8.4
+(29 October 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.4
+
+ User-visible changes:
+ - Client- and server-side bugfixes:
+ * fix assertion on urls of the form 'file://./' (r1516806)
+ * stop linking against psapi.dll on Windows (r1534102)
+ * translation updates for Swedish
+
+ - Client-side bugfixes:
+ * revert: fix problems reverting moves (issue #4436)
+ * update: fix assertion when file external access is denied (issue #4422)
+ * merge: reduce network connections for automatic merge (r1468980 et al)
+ * merge: fix path corruption during reintegration (r1523666)
+ * mergeinfo: fix crash (r1519955)
+ * ra_serf: verify the result of xml parsing (r1501199 et al)
+ * ra_serf: improve error messages during commit (r1526439)
+ * ra_local: fix error with repository in Windows drive root (r1518184)
+ * fix crash on windows when piped command is interrupted (r1522892)
+ * fix crash in the crash handler on windows (r1532023)
+ * fix assertion when upgrading old working copies (r1520529)
+
+ - Server-side bugfixes:
+ * hotcopy: cleanup unpacked revprops with '--incremental' (r1512300 et al)
+ * fix OOM on concurrent requests at threaded server start (r1527103 et al)
+ * fsfs: improve error message when unsupported fsfs format found (r1534158)
+ * fix memory problem in 3rd party FS module loader (r1519615 et al)
+
+ Developer-visible changes:
+ - General:
+ * allow compiling against serf 1.3 and later on Windows (r1517123)
+
+ - Bindings:
+ * javahl: canonicalize path for streamFileContent method (r1524869)
+
+
+Version 1.8.3
+(29 August 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.3
+
+ User-visible changes:
+ - Client- and server-side bugfixes:
+ * translation updates for Swedish
+ * enforce strict version equality between tools and libraries (r1502267)
+ * consistently output revisions as "r%ld" in error messags (r1499044 et al)
+
+ - Client-side bugfixes:
+ * status: always use absolute paths in XML output (issue #4398)
+ * ra_serf: 'svn log -v' fails with a 1.2.x server (issue #4044)
+ * ra_serf: fix crash when committing cp with deep deletion (issue #4400)
+ * diff: issue an error for files that can't fit in memory (r1513119 et al)
+ * svnmucc: generate proper error for mismatched URLs (r1511353)
+ * update: fix a crash when a temp file doesn't exist (r1513156)
+ * commit & update: improve sleep for timestamps performance (r1508438)
+ * diff: continue on missing or obstructing files (issue #4396)
+ * ra_serf: use runtime serf version for User-Agent (r1514315, r1514628)
+ * ra_serf: ignore case when checking certificate common names (r1514763)
+ * ra_serf: format distinguished names properly (r1514804)
+ * ra_serf: do not retry HTTP requests if we started to parse them (r1503318)
+ * ra_serf: output ssl cert verification failure reason (r1514785 et al)
+ * ra_serf: allow session reuse after SVN_ERR_CEASE_INVOCATION (r1502901)
+ * ra_serf: include library version in '--version' output (r1514295 et al)
+ * info: fix spurious error on wc root with child in conflict (r1515366)
+
+ - Server-side bugfixes:
+ * svnserve: fix creation of pid files (r1516556)
+ * svnadmin: fix output encoding in non-UTF8 environments (r1506966)
+ * svnsync: fix high memory usage when running over ra_serf (r1515249 et al)
+ * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
+ * svnauthz: improve help strings (r1511272)
+ * fsfs: fixed manifest file growth with revprop changes (r1513874)
+ * fsfs: fix packed revprops causing loss of revprops (r1513879 et al)
+
+ - Other tool improvements and bugfixes:
+ * svnwcsub/irkerbridge: fix symlink attack via pid file (r175 from upstream)
+
+ Developer-visible changes:
+ - General:
+ * describe APR unimplemented errors as coming from APR (r1503010 et al)
+ * mod_dav_svn: update INSTALL to reflect configure defaults (r1515141)
+ * davautocheck: use the correct apxs binary by default (r1507889, r1507891)
+
+ - API changes:
+ * svn_config_walk_auth_data() config_dir arg: permit NULL (r1507382 et al)
+
+ - Bindings:
+ * swig-pl: fix SVN::Client not honoring config file settings (r150744)
+ * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
+
+
+Version 1.8.2
+(Not released, see changes for 1.8.3.)
+
+
Version 1.8.1
(23 July 2013, from /branches/1.8.x)
http://svn.apache.org/repos/asf/subversion/tags/1.8.1
@@ -54,6 +355,8 @@
* svnadmin create: deny '--fs-type=fsfs --compatible-version=1.0' (r1494223)
* svnadmin upgrade: fix data loss when cancelling in last stage (r1494298)
* mod_dav_svn: fix incorrect path canonicalization (r1503528)
+ See CVE-2013-4131, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
- Other tool improvements and bugfixes:
* fsfs-stats (tool): resolve segfault when passing invalid path (r1492164)
@@ -178,7 +481,7 @@
* decreased default http timeout for ra_serf (issue #3968)
* prevent ra_serf from corrupting the working copy (issue #3993)
* ra_serf transmits property changes inline to reduce requests (r1378927)
- * allow client to avoid SSL certificate prompts (issue #2410)
+ * by default avoid SSL certificate prompts in client (issue #2410)
* improve interactive resolution of property conflicts (r1387678 et al)
* make ra_serf raise an error upon delta-base mismatch (issue #4235)
* tune ra_svn transmit buffer handling (r1391788)
@@ -361,7 +664,7 @@
* support for Serf 2 (r1147538)
* introduction of editor v2 (via private APIs only) (r1166332 et al)
* improve SQLite setup for compatibility with OS X 10.7. (r1181666)
- * rework switch statement to accomodate OWC compiler limitations (r1204407)
+ * rework switch statement to accommodate OWC compiler limitations (r1204407)
* new --enable-sqlite-compatibility-version configure option (r1201421)
* make test suite LD_LIBRARY_PATH include just-built auth plugins (r1200474)
* packages/ directory removed, contents were outdated and unused (r1442167)
@@ -388,7 +691,7 @@
* configure now script auto-detects GNOME keyring (r1387230)
* allow configure to detect BDB on Debian-based Linux distros (r1390633)
* auto-detect serf via pkg-config (r1391662)
- * improve queries for compatability with SQLite 3.7.16 (r1455239)
+ * improve queries for compatibility with SQLite 3.7.16 (r1455239)
* remove support for in-tree apr, apr-util and apr-memcache (r1456924)
* FSFS caching supports prefixes now (r1462436)
* maintainer mode now prints symbolic error codes (r1465157)
@@ -426,6 +729,134 @@
* fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
+Version 1.7.18
+(11 Aug 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.18
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * guard against md5 hash collisions when finding cached credentials
+ (r1550691, r1550772, r1600909)
+ * ra_serf: properly match wildcards in SSL certs. (r1615211, 1615219)
+ * ra_serf: ignore the CommonName in SSL certs where there are Subject Alt
+ Names (r1565531, r1566503, r1568349)
+
+ Developer-visible changes:
+ - General:
+ * fix ocassional failure in checkout_tests.py test 12. (r1496127)
+ * disable building ZLib's assembly optimizations on Windows.
+
+
+Version 1.7.17
+(07 May 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.17
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * log: use proper peg revision over DAV (r1568872)
+ * move: fix errors when moving files between an external and the parent
+ working copy (r1551579)
+ * copy: fix 'svn copy URL WC' on relocated working copies
+ (r1580626, r1580650)
+
+ - Server-side bugfixes:
+ * mod_dav_svn: blacklist building with broken versions of httpd; 2.2.25,
+ 2.4.5 and 2.4.6 (r1545835)
+ * mod_dav_svn: detect out of dateness correctly during commit (issue #4480)
+
+ Developer-visible changes:
+ - General:
+ * fix libmagic detection with custom LDFLAGS (r1577200)
+ * fix a missing null byte when handling old pre-1.4 deltas (r1587968)
+ * support building with Serf 1.3.x (r1517123, r1535139)
+
+ - Bindings:
+ * javahl: fix crash from resolve callback throwing an exception (r1586439)
+
+
+Version 1.7.16
+(26 Feb 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.16
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * copy: fix some scenarios that broke the working copy (r1560690)
+ * diff: fix regressions due to fixes in 1.7.14 (issue #4460)
+
+ - Server-side bugfixes:
+ * mod_dav_svn: prevent crashes with SVNListParentPath on (CVE-2014-0032)
+ * reduce memory usage during checkout and export (r1564215)
+
+ Developer-visible changes:
+ - General:
+ * fix failure in checkout_tests.py
+ * support compiling against Cyrus sasl 2.1.25 (r1404912, r1413402)
+ * support compiling against neon 0.30.x (r1566320)
+
+
+Version 1.7.15
+(Not released, see changes for 1.7.16.)
+
+
+Version 1.7.14
+(25 Nov 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.14
+
+ User-visible changes:
+ - Client- and server-side bugfixes:
+ * fix assertion on urls of the form 'file://./' (r1516806)
+
+ - Client-side bugfixes:
+ * upgrade: fix an assertion when used with pre-1.3 wcs (r1530849)
+ * ra_local: fix error with repository in Windows drive root (r1518184)
+ * fix crash on windows when piped command is interrupted (r1522892)
+ * fix externals that point at redirected locations (issues #4428, #4429)
+ * diff: fix incorrect calculation of changes in some cases (issue #4283)
+ * diff: fix errors with added/deleted targets (issues #4153, #4421)
+
+ - Server-side bugfixes:
+ * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+ * fix OOM on concurrent requests at threaded server start (r1527103 et al)
+ * fsfs: limit commit time of files with deep change histories (r1536790)
+ * mod_dav_svn: canonicalize paths properly (r1542071)
+
+ - Other tool improvements and bugfixes:
+ * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+ - Bindings:
+ * javahl: canonicalize path for streamFileContent method (r1524869)
+
+
+Version 1.7.13
+(29 Aug 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.13
+
+ User-visible changes:
+ - General
+ * merge: fix bogus mergeinfo with conflicting file merges (issue #4306)
+ * diff: fix duplicated path component in '--summarize' output (issue #4408)
+ * ra_serf: ignore case when checking certificate common names (r1514763)
+
+ - Server-side bugfixes:
+ * svnserve: fix creation of pid files (r1516556)
+ * mod_dav_svn: better status codes for commit failures (r1490684)
+ * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
+
+ Developer-visible changes:
+ - General:
+ * support linking against gssapi on Solaris 10 (r1515068)
+ * don't use uninitialized variable to produce an error code (r1482282)
+
+ - Bindings:
+ * swig-pl: fix SVN::Client not honoring config file settings (r150744)
+ * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
+
+
+Version 1.7.12
+(Not released, see changes for 1.7.13.)
+
+
Version 1.7.11
(23 Jul 2013, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.11
@@ -436,9 +867,13 @@
- Server-side bugfixes:
* mod_dav_svn: fix incorrect path canonicalization (r1503528)
+ See CVE-2013-4131, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
- Other tool improvements and bugfixes:
* fix argument processing in contrib hook scripts (r1485350)
+ See CVE-2013-2088, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-2088-advisory.txt
Developer-visible changes:
- Bindings:
@@ -464,7 +899,11 @@
- Server-side bugfixes:
* fix FSFS repository corruption due to newline in filename (issue #4340)
+ See CVE-2013-1968, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-1968-advisory.txt
* fix svnserve exiting when a client connection is aborted (r1482759)
+ See CVE-2013-2112, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
* fix svnserve memory use after clear (issue #4365)
* fix repository corruption on power/disk failure on Windows (r1483781)
@@ -490,6 +929,9 @@
* fix segfault when using kwallet (r1421103)
- Server-side bugfixes:
+ See CVE-2013-1845, CVE-2013-1846, CVE-2013-1847, CVE-2013-1849,
+ and CVE-2013-1884, and descriptive advisories at
+ http://subversion.apache.org/security/
* svnserve will log the replayed rev not the low-water rev. (r1461278)
* mod_dav_svn will omit some property values for activity urls (r1453780)
* fix an assertion in mod_dav_svn when acting as a proxy on / (issue #4272)
@@ -600,7 +1042,7 @@
* fix ra_serf against Subversion 1.2 servers (r1349367)
* fix 'svn upgrade' on working copies with certain tree conflicts (r1345482)
* avoid workqueue references to system temp dir (r1367854)
- * allow non-existant canonical paths (r1367853)
+ * allow non-existent canonical paths (r1367853)
* fix 'svn revert --depth files' to operate on files (r1365554)
* fix ra_serf XML namespace handling against malicious server (r1337441)
* fix relocate with server-relative externals (issue 4216)
@@ -952,7 +1394,7 @@
* fixed: rm -> ci -> cp = missing directory (issue #2763)
* fixed: 'svn info' returns parent info on missing dirs (issue #3178)
* fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919)
- * fixed: 'svn --version' fails with non-existant $HOME (issue #3947)
+ * fixed: 'svn --version' fails with non-existent $HOME (issue #3947)
* fixed: unforced export silently overwites existing file (issue #3799)
* fixed: reverse merge which adds subtree mergeinfo fails (issue #3978)
* fixed: 'svn up -r{R>HEAD}' hangs client over ra_svn (issue #3963)
@@ -1027,6 +1469,8 @@
- Server-side bugfixes:
* fix FSFS repository corruption due to newline in filename (issue #4340)
* fix svnserve exiting when a client connection is aborted (r1482759)
+ See CVE-2013-2112, and descriptive advisory at
+ http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
- Other tool improvements and bugfixes:
* fix argument processing in contrib hook scripts (r1485350)
@@ -1125,9 +1569,9 @@
* fix crash in mod_dav_svn with GETs of baselined resources (r1104126)
See CVE-2011-1752, and descriptive advisory at
http://subversion.apache.org/security/CVE-2011-1752-advisory.txt
- * fixed: write-through proxy could direcly commit to slave (r917523)
+ * fixed: write-through proxy could directly commit to slave (r917523)
* detect a particular corruption condition in FSFS (r1100213)
- * improve error message when clients refer to unkown revisions (r939000)
+ * improve error message when clients refer to unknown revisions (r939000)
* bugfixes and optimizations to the DAV mirroring code (r878607)
* fixed: locked and deleted file causes tree conflict (issue #3525)
* fixed: update touches locked file with svn:keywords property (issue #3471)
@@ -1497,7 +1941,7 @@
* improve performance of 'svn update' on large files (r36389, et. al.)
* fixed: error leak and potential crash (r36860)
* fixed: parent directory handling on Windows (r36049, -50, -51, -131)
- * fixed: unintialized memory errors (r36252, -3)
+ * fixed: uninitialized memory errors (r36252, -3)
* fixed: potential working copy corruption (r36714)
* fixed: working copy upgrade error (r36302)
* fixed: pointer dereference error (r36783)
@@ -1982,7 +2426,7 @@
* local property mods to replaced-with-history file could be lost (r26364)
* revert of replaced-with-history path left copyfrom info (r23452)
* character encoding translation could hang (r23492)
- * un-substituting keywords was buggy ($Id: CHANGES,v 1.1.1.1 2013-08-24 19:36:54 laffer1 Exp $ vs. $Id: CHANGES,v 1.1.1.1 2013-08-24 19:36:54 laffer1 Exp $) (issue #2640)
+ * un-substituting keywords was buggy ($Id$ vs. $Id:$) (issue #2640)
* ra_neon and ra_serf lost pre-revprop-change hook output (issue #443)
* merge of non-empty subdir could be committed incorrectly (issue #1962)
* many other minor bugfixes, optimizations, plugs of memory leaks, etc
@@ -2983,7 +3427,7 @@
* symlinks can now be placed under version control (unix systems only)
* cmdline client now supports psuedo-IRIs and autoescapes chars (issue #1910)
* 'svnadmin recover' no longer waits forever for a lock (new '--wait' option)
- * new $Revision: 1.1.1.1 $ synonym for $Rev$ and $LastChangedRevision$
+ * new $Revision$ synonym for $Rev$ and $LastChangedRevision$
* new runtime option 'store-passwords = ' gives finer control (r10794)x
* fixed: working copies now shareable by multiple users (issue #1509)
* fixed: diff and other subcommands correctly follow renames (issue #1093)
@@ -4304,7 +4748,7 @@
User-visible changes:
* new ~/.subversion/config file
- * new $Id: CHANGES,v 1.1.1.1 2013-08-24 19:36:54 laffer1 Exp $ keyword
+ * new $Id$ keyword
* new client --no-auth-cache option
* empty values in the Windows Registry are no longer ignored (issue #671)
* report details of repository start-commit or pre-commit hook errors
Modified: trunk/contrib/subversion/INSTALL
===================================================================
--- trunk/contrib/subversion/INSTALL 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/INSTALL 2017-02-20 02:39:09 UTC (rev 9266)
@@ -3,7 +3,7 @@
A Quick Guide
======================================
-$LastChangedDate: 2013-06-05 04:00:25 +0000 (Wed, 05 Jun 2013) $
+$LastChangedDate: 2013-09-27 06:57:44 +0000 (Fri, 27 Sep 2013) $
Contents:
@@ -477,7 +477,7 @@
13. SQLite (REQUIRED)
- Subversion 1.7 requires SQLite version 3.6.18 or above. You can meet
+ Subversion 1.8 requires SQLite version 3.7.12 or above. You can meet
this dependency several ways:
* Use an SQLite amalgamation file.
* Specify an SQLite installation to use.
@@ -1263,7 +1263,8 @@
After the make install, the Subversion shared libraries are in
/usr/local/lib/. mod_dav_svn.so should be installed in
- /usr/local/apache2/modules/.
+ /usr/local/libexec/ (or elsewhere, such as /usr/local/apache2/modules/,
+ if you passed --with-apache-libexecdir to configure).
Section II.E explains how to build the server on Windows.
@@ -1287,8 +1288,9 @@
http://httpd.apache.org/docs-2.0/
First, your httpd.conf needs to load the mod_dav_svn module.
- Subversion's 'make install' target should automatically add this
- line for you. But if apache gives you an error like "Unknown
+ If you pass --enable-mod-activation to Subversion's configure,
+ 'make install' target should automatically add this line for you.
+ In any case, if Apache HTTPD gives you an error like "Unknown
DAV provider: svn", then you may want to verify that this line
exists in your httpd.conf:
Modified: trunk/contrib/subversion/Makefile.in
===================================================================
--- trunk/contrib/subversion/Makefile.in 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/Makefile.in 2017-02-20 02:39:09 UTC (rev 9266)
@@ -108,6 +108,7 @@
CC = @CC@
CXX = @CXX@
+CPP = @CPP@
EXEEXT = @EXEEXT@
SHELL = @SHELL@
@@ -176,6 +177,7 @@
CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS)
+SWIG_CPPFLAGS = @SWIG_CPPFLAGS@ $(EXTRA_CPPFLAGS)
COMPILE = $(CC) $(CMODEFLAGS) $(CPPFLAGS) $(CMAINTAINERFLAGS) $(CFLAGS) $(INCLUDES)
COMPILE_CXX = $(CXX) $(CXXMODEFLAGS) $(CPPFLAGS) $(CXXMAINTAINERFLAGS) $(CXXFLAGS) $(INCLUDES)
@@ -198,6 +200,19 @@
COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
COMPILE_JAVAHL_JAVAH = $(JAVAH)
+# export an env variable so that the tests can run without being installed
+TEST_SHLIB_VAR_JAVAHL=\
+ if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
+ for d in $(abs_builddir)/subversion/libsvn_*; do \
+ if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
+ @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+ else \
+ @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+ fi; \
+ done; \
+ export @SVN_APR_SHLIB_PATH_VAR@; \
+ fi;
+
# special compilation for files destined for cxxhl
COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c
@@ -331,7 +346,7 @@
# export an env variable so that the tests can run without being installed
TEST_SHLIB_VAR_SWIG_RB=\
if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
- for d in $(SWIG_PY_DIR)/libsvn_swig_rb $(SWIG_PY_DIR)/../../../libsvn_*; do \
+ for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \
if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
@SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
else \
@@ -340,9 +355,9 @@
done; \
export @SVN_APR_SHLIB_PATH_VAR@; \
fi;
-
-APXS = @APXS@
+APXS = @APXS@
+
PYTHON = @PYTHON@
PERL = @PERL@
@@ -464,11 +479,13 @@
check-tigris-javahl: javahl-compat
@FIX_JAVAHL_LIB@
- $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
+ $(TEST_SHLIB_VAR_JAVAHL) \
+ $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" "-Djava.library.path=@JAVAHL_OBJDIR@:$(libdir)" -classpath "$(javahl_compat_tests_PATH):$(javahl_tests_CLASSPATH)" "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
check-apache-javahl: javahl
@FIX_JAVAHL_LIB@
- $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
+ $(TEST_SHLIB_VAR_JAVAHL) \
+ $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" "-Djava.library.path=@JAVAHL_OBJDIR@:$(libdir)" -classpath "$(javahl_tests_PATH):$(javahl_tests_CLASSPATH)" "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
check-javahl: check-apache-javahl
@@ -871,7 +888,7 @@
# ctypes-python make targets
ctypes-python: local-all
- $(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)"
+ $(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)" "$(CPP)"
install-ctypes-python: ctypes-python
cd $(CTYPES_PYTHON_SRC_DIR); \
Modified: trunk/contrib/subversion/NOTICE
===================================================================
--- trunk/contrib/subversion/NOTICE 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/NOTICE 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,5 +1,5 @@
-Subversion
-Copyright 2010 The Apache Software Foundation
+Apache Subversion
+Copyright 2014 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Index: trunk/contrib/subversion/autogen.sh
===================================================================
--- trunk/contrib/subversion/autogen.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/autogen.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/autogen.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/PrintPath
===================================================================
--- trunk/contrib/subversion/build/PrintPath 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/PrintPath 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/PrintPath
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/build/ac-macros/apache.m4
===================================================================
--- trunk/contrib/subversion/build/ac-macros/apache.m4 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/ac-macros/apache.m4 2017-02-20 02:39:09 UTC (rev 9266)
@@ -118,6 +118,27 @@
CPPFLAGS="$old_CPPFLAGS"
fi
+# check for some busted versions of mod_dav
+# in particular 2.2.25, 2.4.5, and 2.4.6 had the following bugs which are
+# troublesome for Subversion:
+# PR 55304: https://issues.apache.org/bugzilla/show_bug.cgi?id=55304
+# PR 55306: https://issues.apache.org/bugzilla/show_bug.cgi?id=55306
+# PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
+if test -n "$APXS" && test "$APXS" != "no"; then
+ AC_MSG_CHECKING([mod_dav version])
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+ blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"]
+ AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex],
+ [
+#include "$APXS_INCLUDE/ap_release.h"
+apache_version=AP_SERVER_BASEREVISION],
+ [AC_MSG_RESULT([broken])
+ AC_MSG_ERROR([Apache httpd version includes a broken mod_dav; use a newer version of httpd])],
+ [AC_MSG_RESULT([acceptable])])
+ CPPFLAGS="$old_CPPFLAGS"
+fi
+
AC_ARG_WITH(apache-libexecdir,
[AS_HELP_STRING([[--with-apache-libexecdir[=PATH]]],
[Install Apache modules to Apache's configured
Modified: trunk/contrib/subversion/build/ac-macros/berkeley-db.m4
===================================================================
--- trunk/contrib/subversion/build/ac-macros/berkeley-db.m4 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/ac-macros/berkeley-db.m4 2017-02-20 02:39:09 UTC (rev 9266)
@@ -89,7 +89,7 @@
done
SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
for l in [`echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`]; do
- LDFLAGS="$LDFLAGS -L$l"
+ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$l)`"
done
SVN_DB_LIBS=""
for l in [`echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`]; do
Modified: trunk/contrib/subversion/build/ac-macros/compiler.m4
===================================================================
--- trunk/contrib/subversion/build/ac-macros/compiler.m4 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/ac-macros/compiler.m4 2017-02-20 02:39:09 UTC (rev 9266)
@@ -33,24 +33,27 @@
[
_svn_xxflags__save="[$][$3]"
AC_LANG_PUSH([$1])
- AC_MSG_CHECKING([if [$][$2] accepts $4])
- [$3]="$4 [$][$3]"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])],[
+ AC_MSG_CHECKING([if [$][$2] accepts $5])
+ [$3]="$5 [$][$3]"
+ dnl Compiling is not enough: Solaris cc accepts invalid options at
+ dnl compile-time and just warns, assuming they are for the linker,
+ dnl but they cause errors at link-time.
+ AC_LINK_IFELSE([AC_LANG_SOURCE([$4])],[
AC_MSG_RESULT([yes])
- $5
+ $6
],[
AC_MSG_RESULT([no])
[$3]="$_svn_xxflags__save"
- $6
+ $7
])
AC_LANG_POP([$1])
])
AC_DEFUN([SVN_CFLAGS_ADD_IFELSE],
- [_SVN_XXFLAGS_ADD_IFELSE([C],[CC],[CFLAGS],[$1],[$2],[$3])])
+ [_SVN_XXFLAGS_ADD_IFELSE([C],[CC],[CFLAGS],[[int main(void){return 0;}]],[$1],[$2],[$3])])
AC_DEFUN([SVN_CXXFLAGS_ADD_IFELSE],
- [_SVN_XXFLAGS_ADD_IFELSE([C++],[CXX],[CXXFLAGS],[$1],[$2],[$3])])
+ [_SVN_XXFLAGS_ADD_IFELSE([C++],[CXX],[CXXFLAGS],[[int main(){}]],[$1],[$2],[$3])])
AC_DEFUN([SVN_CC_MODE_SETUP],
Modified: trunk/contrib/subversion/build/ac-macros/serf.m4
===================================================================
--- trunk/contrib/subversion/build/ac-macros/serf.m4 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/ac-macros/serf.m4 2017-02-20 02:39:09 UTC (rev 9266)
@@ -98,7 +98,7 @@
CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES -I$serf_prefix/include/$serf_major"
AC_CHECK_HEADERS(serf.h,[
save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$serf_prefix/lib)`"
AC_CHECK_LIB($serf_major, serf_context_create,[
AC_TRY_COMPILE([
#include <stdlib.h>
@@ -121,7 +121,7 @@
SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
else
SVN_SERF_LIBS="-l$serf_major"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$serf_prefix/lib)`"
fi
fi
])
Index: trunk/contrib/subversion/build/buildcheck.sh
===================================================================
--- trunk/contrib/subversion/build/buildcheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/buildcheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/buildcheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/config.guess
===================================================================
--- trunk/contrib/subversion/build/config.guess 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/config.guess 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/config.guess
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/config.sub
===================================================================
--- trunk/contrib/subversion/build/config.sub 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/config.sub 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/config.sub
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/find_python.sh
===================================================================
--- trunk/contrib/subversion/build/find_python.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/find_python.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/find_python.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/generator/extractor.py
===================================================================
--- trunk/contrib/subversion/build/generator/extractor.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/extractor.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/generator/extractor.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/generator/ezt.py
===================================================================
--- trunk/contrib/subversion/build/generator/ezt.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/ezt.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/generator/ezt.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/build/generator/gen_base.py
===================================================================
--- trunk/contrib/subversion/build/generator/gen_base.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/gen_base.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -314,11 +314,16 @@
self.source_generated = 0
class SWIGObject(ObjectFile):
- def __init__(self, filename, lang):
+ def __init__(self, filename, lang, release_mode):
ObjectFile.__init__(self, filename)
self.lang = lang
self.lang_abbrev = lang_abbrev[lang]
- self.source_generated = 1
+ # in release mode the sources are not generated by the build
+ # but rather by the packager
+ if release_mode:
+ self.source_generated = 0
+ else:
+ self.source_generated = 1
### hmm. this is Makefile-specific
self.compile_cmd = '$(COMPILE_%s_WRAPPER)' % self.lang_abbrev.upper()
@@ -614,8 +619,10 @@
self.filename = build_path_join(self.path, lib_filename)
ifile = SWIGSource(ipath)
- cfile = SWIGObject(build_path_join(self.path, cname), self.lang)
- ofile = SWIGObject(build_path_join(self.path, oname), self.lang)
+ cfile = SWIGObject(build_path_join(self.path, cname), self.lang,
+ self.gen_obj.release_mode)
+ ofile = SWIGObject(build_path_join(self.path, oname), self.lang,
+ self.gen_obj.release_mode)
# the .c file depends upon the .i file
self.gen_obj.graph.add(DT_SWIG_C, cfile, ifile)
Modified: trunk/contrib/subversion/build/generator/gen_win.py
===================================================================
--- trunk/contrib/subversion/build/generator/gen_win.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/gen_win.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -189,8 +189,13 @@
self.sln_version = '12.00'
self.vcproj_version = '11.0'
self.vcproj_extension = '.vcxproj'
+ elif val == '2013' or val == '12':
+ self.vs_version = '2013'
+ self.sln_version = '12.00'
+ self.vcproj_version = '12.0'
+ self.vcproj_extension = '.vcxproj'
elif re.match('^1\d+$', val):
- self.vsversion = val
+ self.vs_version = val
self.sln_version = '12.00'
self.vcproj_version = val + '.0'
self.vcproj_extension = '.vcxproj'
@@ -220,6 +225,9 @@
if os.path.exists(os.path.join(path, lib + ".lib")):
self.bdb_lib = lib
break
+ elif os.path.exists(os.path.join(path, lib + "d.lib")):
+ self.bdb_lib = lib
+ break
else:
self.bdb_lib = None
@@ -238,7 +246,8 @@
GeneratorBase.__init__(self, fname, verfname, options)
if self.bdb_lib is not None:
- print("Found %s.lib in %s\n" % (self.bdb_lib, self.bdb_path))
+ print("Found %s.lib or %sd.lib in %s\n" % (self.bdb_lib, self.bdb_lib,
+ self.bdb_path))
else:
print("BDB not found, BDB fs will not be built\n")
@@ -386,11 +395,18 @@
install_targets = [x for x in install_targets if not (isinstance(x, gen_base.TargetExe)
and x.install == 'bdb-test')]
+ # Don't build serf when we don't have it or for 1.3+
+ if not self.serf_lib or (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ install_targets = [x for x in install_targets if x.name != 'serf']
+
# Drop the serf target if we don't have both serf and openssl
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']
+ # Don't build zlib if we have an already compiled serf
+ if self.serf_lib and (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ install_targets = [x for x in install_targets if x.name != 'zlib']
+
# Drop the swig targets if we don't have swig
if not self.swig_path and not self.swig_libdir:
install_targets = [x for x in install_targets
@@ -936,6 +952,9 @@
if self.serf_lib:
fakeincludes.append(self.apath(self.serf_path))
+
+ if self.openssl_path and self.openssl_inc_dir:
+ fakeincludes.append(self.apath(self.openssl_inc_dir))
if self.swig_libdir \
and (isinstance(target, gen_base.TargetSWIG)
@@ -993,7 +1012,13 @@
if self.sasl_path:
fakelibdirs.append(self.apath(self.sasl_path, "lib"))
if self.serf_lib:
- fakelibdirs.append(self.apath(msvc_path_join(self.serf_path, cfg)))
+ if (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ fakelibdirs.append(self.apath(self.serf_path))
+
+ if self.openssl_path and self.openssl_lib_dir:
+ fakelibdirs.append(self.apath(self.openssl_lib_dir))
+ else:
+ fakelibdirs.append(self.apath(msvc_path_join(self.serf_path, cfg)))
fakelibdirs.append(self.apath(self.apr_path, libcfg))
fakelibdirs.append(self.apath(self.apr_util_path, libcfg))
@@ -1030,7 +1055,14 @@
else:
serflib = 'serf.lib'
- zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
+ if self.serf_lib and (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ # We don't build zlib ourselves, so use the standard name
+ # (zdll.lib would link to zlib.dll)
+ zlib = 'zlib.lib'
+ else:
+ # We compile zlib ourselves to these explicit (non-standard) names
+ zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
+
sasllib = None
if self.sasl_path:
sasllib = 'libsasl.lib'
@@ -1074,6 +1106,9 @@
if self.serf_lib and dep.external_lib == '$(SVN_SERF_LIBS)':
nondeplibs.append(serflib)
+ if (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+ nondeplibs.append('ssleay32.lib')
+ nondeplibs.append('libeay32.lib')
if dep.external_lib == '$(SVN_SASL_LIBS)':
nondeplibs.append(sasllib)
@@ -1445,6 +1480,24 @@
"Check if serf and its dependencies are available"
minimal_serf_version = (1, 2, 1)
+
+ if self.openssl_path and os.path.exists(self.openssl_path):
+ version_path = os.path.join(self.openssl_path, 'inc32/openssl/opensslv.h')
+ if os.path.isfile(version_path):
+ # We have an OpenSSL Source location (legacy handling)
+ self.openssl_inc_dir = os.path.join(self.openssl_path, 'inc32')
+ if self.static_openssl:
+ self.openssl_lib_dir = os.path.join(self.openssl_path, 'out32')
+ else:
+ self.openssl_lib_dir = os.path.join(self.openssl_path, 'out32dll')
+ elif os.path.isfile(os.path.join(self.openssl_path,
+ 'include/openssl/opensslv.h')):
+ self.openssl_inc_dir = os.path.join(self.openssl_path, 'include')
+ self.openssl_lib_dir = os.path.join(self.openssl_path, 'lib')
+ else:
+ print('WARNING: \'opensslv.h\' not found')
+ self.openssl_path = None
+
self.serf_lib = None
if self.serf_path and os.path.exists(self.serf_path):
if self.openssl_path and os.path.exists(self.openssl_path):
Index: trunk/contrib/subversion/build/generator/swig/checkout_swig_header.py
===================================================================
--- trunk/contrib/subversion/build/generator/swig/checkout_swig_header.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/swig/checkout_swig_header.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/generator/swig/checkout_swig_header.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/generator/swig/external_runtime.py
===================================================================
--- trunk/contrib/subversion/build/generator/swig/external_runtime.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/swig/external_runtime.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/generator/swig/external_runtime.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/generator/swig/header_wrappers.py
===================================================================
--- trunk/contrib/subversion/build/generator/swig/header_wrappers.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/swig/header_wrappers.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/generator/swig/header_wrappers.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/build/generator/templates/vcnet_sln.ezt
===================================================================
--- trunk/contrib/subversion/build/generator/templates/vcnet_sln.ezt 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/templates/vcnet_sln.ezt 2017-02-20 02:39:09 UTC (rev 9266)
@@ -21,7 +21,9 @@
#
[end]Microsoft Visual Studio Solution File, Format Version [version]
# Visual Studio [vs_version]
-[for targets]Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "[targets.name]", "[targets.path]", "[targets.guid]"
+[is version "12.00"]VisualStudioVersion = 12.3.4.5
+MinimumVisualStudioVersion = 10.0.40219.1
+[end][for targets]Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "[targets.name]", "[targets.path]", "[targets.guid]"
[is dependency_location "solution"] ProjectSection(ProjectDependencies) = postProject
[for targets.depends] [targets.depends.guid] = [targets.depends.guid]
[end] EndProjectSection
Modified: trunk/contrib/subversion/build/generator/templates/vcnet_vcproj.ezt
===================================================================
--- trunk/contrib/subversion/build/generator/templates/vcnet_vcproj.ezt 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/generator/templates/vcnet_vcproj.ezt 2017-02-20 02:39:09 UTC (rev 9266)
@@ -32,7 +32,7 @@
Name="[configs.name]|[platforms]"
OutputDirectory="..\..\..\[configs.name]\[target.output_dir]"
BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
- IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]"
+ IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]\[target.proj_name]"
ConfigurationType="[target_type]"[is configs.name "Release"]
WholeProgramOptimization="FALSE"[end]>
<Tool
Index: trunk/contrib/subversion/build/getversion.py
===================================================================
--- trunk/contrib/subversion/build/getversion.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/getversion.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/getversion.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/install-sh
===================================================================
--- trunk/contrib/subversion/build/install-sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/install-sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/install-sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/build/run_ctypesgen.sh
===================================================================
--- trunk/contrib/subversion/build/run_ctypesgen.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/run_ctypesgen.sh 2017-02-20 02:39:09 UTC (rev 9266)
@@ -36,6 +36,7 @@
svn_libdir="$8"
apr_config="$9"
apu_config="${10}"
+cpp="${11}"
cp_relpath="subversion/bindings/ctypes-python"
output="$cp_relpath/svn_all.py"
@@ -57,7 +58,6 @@
apu_include_dir="`$apu_config --includedir`"
apu_ldflags="`$apu_config --ldflags --link-ld`"
-cpp="`$apr_config --cpp`"
### end
cppflags="$apr_cppflags $apu_cppflags -I$svn_includes"
Property changes on: trunk/contrib/subversion/build/run_ctypesgen.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/run_tests.py
===================================================================
--- trunk/contrib/subversion/build/run_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/run_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/run_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/transform_libtool_scripts.sh
===================================================================
--- trunk/contrib/subversion/build/transform_libtool_scripts.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/transform_libtool_scripts.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/transform_libtool_scripts.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/build/transform_sql.py
===================================================================
--- trunk/contrib/subversion/build/transform_sql.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build/transform_sql.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/build/transform_sql.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/build-outputs.mk
===================================================================
--- trunk/contrib/subversion/build-outputs.mk 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build-outputs.mk 2017-02-20 02:39:09 UTC (rev 9266)
@@ -115,7 +115,7 @@
checksum_test_DEPS = subversion/tests/libsvn_subr/checksum-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la
checksum_test_OBJECTS = checksum-test.lo
subversion/tests/libsvn_subr/checksum-test$(EXEEXT): $(checksum_test_DEPS)
- cd subversion/tests/libsvn_subr && $(LINK) $(checksum_test_LDFLAGS) -o checksum-test$(EXEEXT) $(checksum_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS)
+ cd subversion/tests/libsvn_subr && $(LINK) $(checksum_test_LDFLAGS) -o checksum-test$(EXEEXT) $(checksum_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(SVN_ZLIB_LIBS) $(LIBS)
client_test_PATH = subversion/tests/libsvn_client
client_test_DEPS = subversion/tests/libsvn_client/client-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
@@ -1870,82 +1870,82 @@
$(COMPILE_SWIG_PL) $(canonicalized_srcdir)subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
subversion/bindings/swig/perl/native/core.lo: subversion/bindings/swig/perl/native/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/core.c
+ $(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/core.c
subversion/bindings/swig/perl/native/svn_client.lo: subversion/bindings/swig/perl/native/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
- $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/svn_client.c
+ $(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_client.c
subversion/bindings/swig/perl/native/svn_delta.lo: subversion/bindings/swig/perl/native/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/svn_delta.c
+ $(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_delta.c
subversion/bindings/swig/perl/native/svn_diff.lo: subversion/bindings/swig/perl/native/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/svn_diff.c
+ $(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_diff.c
subversion/bindings/swig/perl/native/svn_fs.lo: subversion/bindings/swig/perl/native/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/svn_fs.c
+ $(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_fs.c
subversion/bindings/swig/perl/native/svn_ra.lo: subversion/bindings/swig/perl/native/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/svn_ra.c
+ $(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_ra.c
subversion/bindings/swig/perl/native/svn_repos.lo: subversion/bindings/swig/perl/native/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/svn_repos.c
+ $(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_repos.c
subversion/bindings/swig/perl/native/svn_wc.lo: subversion/bindings/swig/perl/native/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
- $(COMPILE_PL_WRAPPER) subversion/bindings/swig/perl/native/svn_wc.c
+ $(COMPILE_PL_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/perl/native/svn_wc.c
subversion/bindings/swig/python/core.lo: subversion/bindings/swig/python/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/core.c
+ $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/core.c
subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.lo: subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c subversion/bindings/swig/proxy/swig_python_external_runtime.swg subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn_private_config.h
$(COMPILE_SWIG_PY) $(canonicalized_srcdir)subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/bindings/swig/python/svn_client.lo: subversion/bindings/swig/python/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_client.c
+ $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_client.c
subversion/bindings/swig/python/svn_delta.lo: subversion/bindings/swig/python/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_delta.c
+ $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_delta.c
subversion/bindings/swig/python/svn_diff.lo: subversion/bindings/swig/python/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_diff.c
+ $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_diff.c
subversion/bindings/swig/python/svn_fs.lo: subversion/bindings/swig/python/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_fs.c
+ $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_fs.c
subversion/bindings/swig/python/svn_ra.lo: subversion/bindings/swig/python/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_ra.c
+ $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_ra.c
subversion/bindings/swig/python/svn_repos.lo: subversion/bindings/swig/python/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_repos.c
+ $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_repos.c
subversion/bindings/swig/python/svn_wc.lo: subversion/bindings/swig/python/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
- $(COMPILE_PY_WRAPPER) subversion/bindings/swig/python/svn_wc.c
+ $(COMPILE_PY_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/python/svn_wc.c
subversion/bindings/swig/ruby/core.lo: subversion/bindings/swig/ruby/core.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/core.c
+ $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/core.c
subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.lo: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_nls.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/svn_private_config.h
$(COMPILE_SWIG_RB) $(canonicalized_srcdir)subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/bindings/swig/ruby/svn_client.lo: subversion/bindings/swig/ruby/svn_client.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_client.c
+ $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_client.c
subversion/bindings/swig/ruby/svn_delta.lo: subversion/bindings/swig/ruby/svn_delta.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_delta.c
+ $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_delta.c
subversion/bindings/swig/ruby/svn_diff.lo: subversion/bindings/swig/ruby/svn_diff.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_delta.h subversion/include/svn_fs.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_diff.c
+ $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_diff.c
subversion/bindings/swig/ruby/svn_fs.lo: subversion/bindings/swig/ruby/svn_fs.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_fs.c
+ $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_fs.c
subversion/bindings/swig/ruby/svn_ra.lo: subversion/bindings/swig/ruby/svn_ra.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_ra.c
+ $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_ra.c
subversion/bindings/swig/ruby/svn_repos.lo: subversion/bindings/swig/ruby/svn_repos.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_ra.h subversion/include/svn_wc.h subversion/svn_private_config.h
- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_repos.c
+ $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_repos.c
subversion/bindings/swig/ruby/svn_wc.lo: subversion/bindings/swig/ruby/svn_wc.c subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h subversion/include/svn_client.h subversion/include/svn_fs.h subversion/include/svn_repos.h subversion/svn_private_config.h
- $(COMPILE_RB_WRAPPER) subversion/bindings/swig/ruby/svn_wc.c
+ $(COMPILE_RB_WRAPPER) $(canonicalized_srcdir)subversion/bindings/swig/ruby/svn_wc.c
subversion/libsvn_auth_gnome_keyring/gnome_keyring.lo: subversion/libsvn_auth_gnome_keyring/gnome_keyring.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
@@ -1977,7 +1977,7 @@
subversion/libsvn_client/copy.lo: subversion/libsvn_client/copy.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
-subversion/libsvn_client/copy_foreign.lo: subversion/libsvn_client/copy_foreign.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/copy_foreign.lo: subversion/libsvn_client/copy_foreign.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
subversion/libsvn_client/ctx.lo: subversion/libsvn_client/ctx.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h
@@ -1985,17 +1985,17 @@
subversion/libsvn_client/deprecated.lo: subversion/libsvn_client/deprecated.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
-subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
subversion/libsvn_client/diff_local.lo: subversion/libsvn_client/diff_local.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
subversion/libsvn_client/diff_summarize.lo: subversion/libsvn_client/diff_summarize.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h
-subversion/libsvn_client/export.lo: subversion/libsvn_client/export.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/export.lo: subversion/libsvn_client/export.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
subversion/libsvn_client/externals.lo: subversion/libsvn_client/externals.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
-subversion/libsvn_client/import.lo: subversion/libsvn_client/import.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/import.lo: subversion/libsvn_client/import.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
subversion/libsvn_client/info.lo: subversion/libsvn_client/info.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
@@ -2007,11 +2007,11 @@
subversion/libsvn_client/log.lo: subversion/libsvn_client/log.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
-subversion/libsvn_client/merge.lo: subversion/libsvn_client/merge.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
+subversion/libsvn_client/merge.lo: subversion/libsvn_client/merge.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
subversion/libsvn_client/mergeinfo.lo: subversion/libsvn_client/mergeinfo.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
-subversion/libsvn_client/patch.lo: subversion/libsvn_client/patch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/patch.lo: subversion/libsvn_client/patch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
subversion/libsvn_client/prop_commands.lo: subversion/libsvn_client/prop_commands.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
@@ -2019,7 +2019,7 @@
subversion/libsvn_client/relocate.lo: subversion/libsvn_client/relocate.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
-subversion/libsvn_client/repos_diff.lo: subversion/libsvn_client/repos_diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/repos_diff.lo: subversion/libsvn_client/repos_diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
subversion/libsvn_client/resolved.lo: subversion/libsvn_client/resolved.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
@@ -2133,13 +2133,13 @@
subversion/libsvn_fs_base/err.lo: subversion/libsvn_fs_base/err.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/id.h subversion/svn_private_config.h
-subversion/libsvn_fs_base/fs.lo: subversion/libsvn_fs_base/fs.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/uuid.h subversion/svn_private_config.h
+subversion/libsvn_fs_base/fs.lo: subversion/libsvn_fs_base/fs.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/uuid.h subversion/svn_private_config.h
subversion/libsvn_fs_base/id.lo: subversion/libsvn_fs_base/id.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/id.h
subversion/libsvn_fs_base/key-gen.lo: subversion/libsvn_fs_base/key-gen.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_base/key-gen.h
-subversion/libsvn_fs_base/lock.lo: subversion/libsvn_fs_base/lock.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h
+subversion/libsvn_fs_base/lock.lo: subversion/libsvn_fs_base/lock.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h
subversion/libsvn_fs_base/node-rev.lo: subversion/libsvn_fs_base/node-rev.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/reps-strings.h subversion/libsvn_fs_base/trail.h subversion/svn_private_config.h
@@ -2151,15 +2151,15 @@
subversion/libsvn_fs_base/tree.lo: subversion/libsvn_fs_base/tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/svn_private_config.h
-subversion/libsvn_fs_base/util/fs_skels.lo: subversion/libsvn_fs_base/util/fs_skels.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h
+subversion/libsvn_fs_base/util/fs_skels.lo: subversion/libsvn_fs_base/util/fs_skels.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h
subversion/libsvn_fs_base/uuid.lo: subversion/libsvn_fs_base/uuid.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/uuid.h subversion/svn_private_config.h
-subversion/libsvn_fs_fs/caching.lo: subversion/libsvn_fs_fs/caching.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
+subversion/libsvn_fs_fs/caching.lo: subversion/libsvn_fs_fs/caching.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
subversion/libsvn_fs_fs/dag.lo: subversion/libsvn_fs_fs/dag.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/key-gen.h subversion/libsvn_fs_fs/temp_serializer.h subversion/svn_private_config.h
-subversion/libsvn_fs_fs/fs.lo: subversion/libsvn_fs_fs/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
+subversion/libsvn_fs_fs/fs.lo: subversion/libsvn_fs_fs/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
subversion/libsvn_fs_fs/fs_fs.lo: subversion/libsvn_fs_fs/fs_fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/key-gen.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
@@ -2171,9 +2171,9 @@
subversion/libsvn_fs_fs/rep-cache.lo: subversion/libsvn_fs_fs/rep-cache.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_fs_fs/rep-cache.h subversion/svn_private_config.h
-subversion/libsvn_fs_fs/temp_serializer.lo: subversion/libsvn_fs_fs/temp_serializer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/temp_serializer.h
+subversion/libsvn_fs_fs/temp_serializer.lo: subversion/libsvn_fs_fs/temp_serializer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/temp_serializer.h
-subversion/libsvn_fs_fs/tree.lo: subversion/libsvn_fs_fs/tree.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/key-gen.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
+subversion/libsvn_fs_fs/tree.lo: subversion/libsvn_fs_fs/tree.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/key-gen.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
subversion/libsvn_fs_util/fs-util.lo: subversion/libsvn_fs_util/fs-util.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/svn_private_config.h
@@ -2189,7 +2189,7 @@
subversion/libsvn_ra/util.lo: subversion/libsvn_ra/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
-subversion/libsvn_ra_local/ra_plugin.lo: subversion/libsvn_ra_local/ra_plugin.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h
+subversion/libsvn_ra_local/ra_plugin.lo: subversion/libsvn_ra_local/ra_plugin.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h
subversion/libsvn_ra_local/split_url.lo: subversion/libsvn_ra_local/split_url.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h
@@ -2231,13 +2231,13 @@
subversion/libsvn_ra_serf/update.lo: subversion/libsvn_ra_serf/update.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h
-subversion/libsvn_ra_serf/util.lo: subversion/libsvn_ra_serf/util.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h
+subversion/libsvn_ra_serf/util.lo: subversion/libsvn_ra_serf/util.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_cert.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h
subversion/libsvn_ra_serf/util_error.lo: subversion/libsvn_ra_serf/util_error.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h
subversion/libsvn_ra_serf/xml.lo: subversion/libsvn_ra_serf/xml.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h
-subversion/libsvn_ra_svn/client.lo: subversion/libsvn_ra_svn/client.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h
+subversion/libsvn_ra_svn/client.lo: subversion/libsvn_ra_svn/client.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h
subversion/libsvn_ra_svn/cram.lo: subversion/libsvn_ra_svn/cram.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h
@@ -2273,7 +2273,7 @@
subversion/libsvn_repos/load.lo: subversion/libsvn_repos/load.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mergeinfo_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
-subversion/libsvn_repos/log.lo: subversion/libsvn_repos/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
+subversion/libsvn_repos/log.lo: subversion/libsvn_repos/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
subversion/libsvn_repos/node_tree.lo: subversion/libsvn_repos/node_tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
@@ -2281,7 +2281,7 @@
subversion/libsvn_repos/replay.lo: subversion/libsvn_repos/replay.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_repos_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
-subversion/libsvn_repos/reporter.lo: subversion/libsvn_repos/reporter.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
+subversion/libsvn_repos/reporter.lo: subversion/libsvn_repos/reporter.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
subversion/libsvn_repos/repos.lo: subversion/libsvn_repos/repos.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
@@ -2291,9 +2291,9 @@
subversion/libsvn_subr/atomic.lo: subversion/libsvn_subr/atomic.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h
-subversion/libsvn_subr/auth.lo: subversion/libsvn_subr/auth.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h
+subversion/libsvn_subr/auth.lo: subversion/libsvn_subr/auth.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h
-subversion/libsvn_subr/base64.lo: subversion/libsvn_subr/base64.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
+subversion/libsvn_subr/base64.lo: subversion/libsvn_subr/base64.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h
subversion/libsvn_subr/cache-inprocess.lo: subversion/libsvn_subr/cache-inprocess.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h subversion/svn_private_config.h
@@ -2303,9 +2303,9 @@
subversion/libsvn_subr/cache.lo: subversion/libsvn_subr/cache.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h
-subversion/libsvn_subr/cache_config.lo: subversion/libsvn_subr/cache_config.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
+subversion/libsvn_subr/cache_config.lo: subversion/libsvn_subr/cache_config.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
-subversion/libsvn_subr/checksum.lo: subversion/libsvn_subr/checksum.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/md5.h subversion/libsvn_subr/sha1.h subversion/svn_private_config.h
+subversion/libsvn_subr/checksum.lo: subversion/libsvn_subr/checksum.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/md5.h subversion/libsvn_subr/sha1.h subversion/svn_private_config.h
subversion/libsvn_subr/cmdline.lo: subversion/libsvn_subr/cmdline.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_nls.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_xml.h subversion/libsvn_subr/win32_crashrpt.h subversion/svn_private_config.h
@@ -2327,9 +2327,9 @@
subversion/libsvn_subr/debug.lo: subversion/libsvn_subr/debug.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h
-subversion/libsvn_subr/deprecated.lo: subversion/libsvn_subr/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h
+subversion/libsvn_subr/deprecated.lo: subversion/libsvn_subr/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h
-subversion/libsvn_subr/dirent_uri.lo: subversion/libsvn_subr/dirent_uri.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h
+subversion/libsvn_subr/dirent_uri.lo: subversion/libsvn_subr/dirent_uri.c subversion/include/private/svn_cert.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h
subversion/libsvn_subr/dso.lo: subversion/libsvn_subr/dso.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
@@ -2339,7 +2339,7 @@
subversion/libsvn_subr/gpg_agent.lo: subversion/libsvn_subr/gpg_agent.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
-subversion/libsvn_subr/hash.lo: subversion/libsvn_subr/hash.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
+subversion/libsvn_subr/hash.lo: subversion/libsvn_subr/hash.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h
subversion/libsvn_subr/io.lo: subversion/libsvn_subr/io.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h
@@ -2355,7 +2355,7 @@
subversion/libsvn_subr/md5.lo: subversion/libsvn_subr/md5.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_md5.h subversion/include/svn_types.h subversion/libsvn_subr/md5.h
-subversion/libsvn_subr/mergeinfo.lo: subversion/libsvn_subr/mergeinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
+subversion/libsvn_subr/mergeinfo.lo: subversion/libsvn_subr/mergeinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h
subversion/libsvn_subr/mutex.lo: subversion/libsvn_subr/mutex.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/svn_private_config.h
@@ -2371,7 +2371,7 @@
subversion/libsvn_subr/prompt.lo: subversion/libsvn_subr/prompt.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
-subversion/libsvn_subr/properties.lo: subversion/libsvn_subr/properties.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h
+subversion/libsvn_subr/properties.lo: subversion/libsvn_subr/properties.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h
subversion/libsvn_subr/pseudo_md5.lo: subversion/libsvn_subr/pseudo_md5.c subversion/include/private/svn_pseudo_md5.h
@@ -2385,7 +2385,7 @@
subversion/libsvn_subr/sorts.lo: subversion/libsvn_subr/sorts.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h
-subversion/libsvn_subr/spillbuf.lo: subversion/libsvn_subr/spillbuf.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
+subversion/libsvn_subr/spillbuf.lo: subversion/libsvn_subr/spillbuf.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h
subversion/libsvn_subr/sqlite.lo: subversion/libsvn_subr/sqlite.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/internal_statements.h subversion/svn_private_config.h
@@ -2397,7 +2397,7 @@
subversion/libsvn_subr/ssl_server_trust_providers.lo: subversion/libsvn_subr/ssl_server_trust_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h
-subversion/libsvn_subr/stream.lo: subversion/libsvn_subr/stream.c subversion/include/private/svn_debug.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_error_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h
+subversion/libsvn_subr/stream.lo: subversion/libsvn_subr/stream.c subversion/include/private/svn_debug.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_error_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h
subversion/libsvn_subr/string.lo: subversion/libsvn_subr/string.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
@@ -2441,7 +2441,7 @@
subversion/libsvn_wc/adm_files.lo: subversion/libsvn_wc/adm_files.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
-subversion/libsvn_wc/adm_ops.lo: subversion/libsvn_wc/adm_ops.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/adm_ops.lo: subversion/libsvn_wc/adm_ops.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
subversion/libsvn_wc/ambient_depth_filter_editor.lo: subversion/libsvn_wc/ambient_depth_filter_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
@@ -2457,15 +2457,15 @@
subversion/libsvn_wc/delete.lo: subversion/libsvn_wc/delete.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
-subversion/libsvn_wc/deprecated.lo: subversion/libsvn_wc/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/deprecated.lo: subversion/libsvn_wc/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
-subversion/libsvn_wc/diff_editor.lo: subversion/libsvn_wc/diff_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
+subversion/libsvn_wc/diff_editor.lo: subversion/libsvn_wc/diff_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
subversion/libsvn_wc/diff_local.lo: subversion/libsvn_wc/diff_local.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
subversion/libsvn_wc/entries.lo: subversion/libsvn_wc/entries.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
-subversion/libsvn_wc/externals.lo: subversion/libsvn_wc/externals.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/externals.lo: subversion/libsvn_wc/externals.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
subversion/libsvn_wc/info.lo: subversion/libsvn_wc/info.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
@@ -2477,7 +2477,7 @@
subversion/libsvn_wc/old-and-busted.lo: subversion/libsvn_wc/old-and-busted.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
-subversion/libsvn_wc/props.lo: subversion/libsvn_wc/props.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/props.lo: subversion/libsvn_wc/props.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
subversion/libsvn_wc/questions.lo: subversion/libsvn_wc/questions.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
@@ -2493,7 +2493,7 @@
subversion/libsvn_wc/tree_conflicts.lo: subversion/libsvn_wc/tree_conflicts.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
-subversion/libsvn_wc/update_editor.lo: subversion/libsvn_wc/update_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/update_editor.lo: subversion/libsvn_wc/update_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
subversion/libsvn_wc/upgrade.lo: subversion/libsvn_wc/upgrade.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/props.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
@@ -2659,7 +2659,7 @@
subversion/svn/move-cmd.lo: subversion/svn/move-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
-subversion/svn/notify.lo: subversion/svn/notify.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
+subversion/svn/notify.lo: subversion/svn/notify.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
subversion/svn/patch-cmd.lo: subversion/svn/patch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
@@ -2687,7 +2687,7 @@
subversion/svn/status.lo: subversion/svn/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h
-subversion/svn/svn.lo: subversion/svn/svn.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
+subversion/svn/svn.lo: subversion/svn/svn.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
subversion/svn/switch-cmd.lo: subversion/svn/switch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
@@ -2701,13 +2701,13 @@
subversion/svnadmin/svnadmin.lo: subversion/svnadmin/svnadmin.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h
-subversion/svndumpfilter/svndumpfilter.lo: subversion/svndumpfilter/svndumpfilter.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h
+subversion/svndumpfilter/svndumpfilter.lo: subversion/svndumpfilter/svndumpfilter.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h
-subversion/svnlook/svnlook.lo: subversion/svnlook/svnlook.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h
+subversion/svnlook/svnlook.lo: subversion/svnlook/svnlook.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h
-subversion/svnmucc/svnmucc.lo: subversion/svnmucc/svnmucc.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/svnmucc/svnmucc.lo: subversion/svnmucc/svnmucc.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
-subversion/svnrdump/dump_editor.lo: subversion/svnrdump/dump_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/svnrdump/svnrdump.h
+subversion/svnrdump/dump_editor.lo: subversion/svnrdump/dump_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svnrdump/svnrdump.h
subversion/svnrdump/load_editor.lo: subversion/svnrdump/load_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnrdump/svnrdump.h
@@ -2721,15 +2721,15 @@
subversion/svnserve/serve.lo: subversion/svnserve/serve.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/svn_private_config.h subversion/svnserve/server.h
-subversion/svnserve/svnserve.lo: subversion/svnserve/svnserve.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnserve/server.h subversion/svnserve/winservice.h
+subversion/svnserve/svnserve.lo: subversion/svnserve/svnserve.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnserve/server.h subversion/svnserve/winservice.h
subversion/svnserve/winservice.lo: subversion/svnserve/winservice.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnserve/winservice.h
-subversion/svnsync/svnsync.lo: subversion/svnsync/svnsync.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnsync/sync.h
+subversion/svnsync/svnsync.lo: subversion/svnsync/svnsync.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnsync/sync.h
subversion/svnsync/sync.lo: subversion/svnsync/sync.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h subversion/svnsync/sync.h
-subversion/svnversion/svnversion.lo: subversion/svnversion/svnversion.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/svnversion/svnversion.lo: subversion/svnversion/svnversion.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
subversion/tests/cmdline/atomic-ra-revprop-change.lo: subversion/tests/cmdline/atomic-ra-revprop-change.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
@@ -2743,7 +2743,7 @@
subversion/tests/libsvn_delta/vdelta-test.lo: subversion/tests/libsvn_delta/vdelta-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h subversion/tests/libsvn_delta/delta-window-test.h subversion/tests/svn_test.h
-subversion/tests/libsvn_delta/window-test.lo: subversion/tests/libsvn_delta/window-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
+subversion/tests/libsvn_delta/window-test.lo: subversion/tests/libsvn_delta/window-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/tests/svn_test.h
subversion/tests/libsvn_diff/diff-diff3-test.lo: subversion/tests/libsvn_diff/diff-diff3-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h
@@ -2781,7 +2781,7 @@
subversion/tests/libsvn_subr/crypto-test.lo: subversion/tests/libsvn_subr/crypto-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/crypto.h subversion/tests/svn_test.h
-subversion/tests/libsvn_subr/dirent_uri-test.lo: subversion/tests/libsvn_subr/dirent_uri-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
+subversion/tests/libsvn_subr/dirent_uri-test.lo: subversion/tests/libsvn_subr/dirent_uri-test.c subversion/include/private/svn_cert.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
subversion/tests/libsvn_subr/error-code-test.lo: subversion/tests/libsvn_subr/error-code-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
@@ -2805,7 +2805,7 @@
subversion/tests/libsvn_subr/skel-test.lo: subversion/tests/libsvn_subr/skel-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
-subversion/tests/libsvn_subr/spillbuf-test.lo: subversion/tests/libsvn_subr/spillbuf-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
+subversion/tests/libsvn_subr/spillbuf-test.lo: subversion/tests/libsvn_subr/spillbuf-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/tests/svn_test.h
subversion/tests/libsvn_subr/stream-test.lo: subversion/tests/libsvn_subr/stream-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_io_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/tests/svn_test.h
@@ -2829,17 +2829,17 @@
subversion/tests/libsvn_wc/pristine-store-test.lo: subversion/tests/libsvn_wc/pristine-store-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h
-subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
-subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
-subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
-subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
-subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
-subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_wc/utils.lo: subversion/tests/libsvn_wc/utils.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/wc_db_private.h subversion/svn_private_config.h subversion/tests/libsvn_wc/utils.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
subversion/tests/libsvn_wc/wc-incomplete-tester.lo: subversion/tests/libsvn_wc/wc-incomplete-tester.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
@@ -2851,7 +2851,7 @@
subversion/tests/svn_test_fs.lo: subversion/tests/svn_test_fs.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
-subversion/tests/svn_test_main.lo: subversion/tests/svn_test_main.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/tests/svn_test.h
+subversion/tests/svn_test_main.lo: subversion/tests/svn_test_main.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h subversion/tests/svn_test.h
tools/client-side/svn-bench/help-cmd.lo: tools/client-side/svn-bench/help-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-bench/cl.h
@@ -2869,7 +2869,7 @@
tools/dev/fsfs-access-map.lo: tools/dev/fsfs-access-map.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
-tools/dev/fsfs-reorg.lo: tools/dev/fsfs-reorg.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h
+tools/dev/fsfs-reorg.lo: tools/dev/fsfs-reorg.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h
tools/dev/svnraisetreeconflict/svnraisetreeconflict.lo: tools/dev/svnraisetreeconflict/svnraisetreeconflict.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
@@ -2879,9 +2879,9 @@
tools/diff/diff4.lo: tools/diff/diff4.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
-tools/server-side/fsfs-stats.lo: tools/server-side/fsfs-stats.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h
+tools/server-side/fsfs-stats.lo: tools/server-side/fsfs-stats.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h
-tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h
+tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h
if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)tools/server-side/mod_dontdothat/mod_dontdothat.c ; else echo "fake" > tools/server-side/mod_dontdothat/mod_dontdothat.lo ; fi
tools/server-side/svn-populate-node-origins-index.lo: tools/server-side/svn-populate-node-origins-index.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h
Modified: trunk/contrib/subversion/build.conf
===================================================================
--- trunk/contrib/subversion/build.conf 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/build.conf 2017-02-20 02:39:09 UTC (rev 9266)
@@ -71,9 +71,9 @@
bdb-test-scripts =
-swig-python-opts = $(CPPFLAGS) -python -classic
-swig-perl-opts = $(CPPFLAGS) -perl -nopm -noproxy
-swig-ruby-opts = $(CPPFLAGS) -ruby
+swig-python-opts = $(SWIG_CPPFLAGS) -python -classic
+swig-perl-opts = $(SWIG_CPPFLAGS) -perl -nopm -noproxy
+swig-ruby-opts = $(SWIG_CPPFLAGS) -ruby
swig-languages = python perl ruby
swig-dirs =
subversion/bindings/swig/python
@@ -325,7 +325,7 @@
path = subversion/libsvn_subr
libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic
msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
- crypt32.lib version.lib psapi.lib
+ crypt32.lib version.lib
msvc-export =
svn_auth.h svn_base64.h svn_cache_config.h svn_checksum.h svn_cmdline.h
svn_compat.h svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h
@@ -342,6 +342,7 @@
private\svn_temp_serializer.h private\svn_io_private.h
private\svn_string_private.h private\svn_magic.h
private\svn_subr_private.h private\svn_mutex.h private\svn_named_atomic.h
+ private\svn_cert.h
# Working copy management lib
[libsvn_wc]
@@ -766,7 +767,7 @@
path = subversion/tests/libsvn_subr
sources = checksum-test.c
install = test
-libs = libsvn_test libsvn_subr apr
+libs = libsvn_test libsvn_subr apr zlib
[compat-test]
description = Test compatibility functions
@@ -1263,13 +1264,13 @@
[__SWIG_PERL__]
type = swig_project
path = build/win32
-libs = swig_client swig_delta swig_fs swig_ra swig_repos swig_wc swig_core
+libs = swig_client swig_delta swig_diff swig_fs swig_ra swig_repos swig_wc swig_core
lang = perl
[__SWIG_RUBY__]
type = swig_project
path = build/win32
-libs = swig_client swig_delta swig_fs swig_ra swig_repos swig_wc swig_core
+libs = swig_client swig_delta swig_diff swig_fs swig_ra swig_repos swig_wc swig_core
lang = ruby
[__JAVAHL__]
Modified: trunk/contrib/subversion/configure
===================================================================
--- trunk/contrib/subversion/configure 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/configure 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for subversion 1.8.1.
+# Generated by GNU Autoconf 2.69 for subversion 1.8.10.
#
# Report bugs to <http://subversion.apache.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='subversion'
PACKAGE_TARNAME='subversion'
-PACKAGE_VERSION='1.8.1'
-PACKAGE_STRING='subversion 1.8.1'
+PACKAGE_VERSION='1.8.10'
+PACKAGE_STRING='subversion 1.8.10'
PACKAGE_BUGREPORT='http://subversion.apache.org/'
PACKAGE_URL=''
@@ -635,6 +635,7 @@
ac_subst_vars='LTLIBOBJS
SVN_CONFIG_SCRIPT_FILES
INCLUDE_OUTPUTS
+SWIG_CPPFLAGS
JAVAHL_COMPAT_TESTS_TARGET
JAVAHL_TESTS_TARGET
JAVA_CLASSPATH
@@ -1456,7 +1457,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures subversion 1.8.1 to adapt to many kinds of systems.
+\`configure' configures subversion 1.8.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1522,7 +1523,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of subversion 1.8.1:";;
+ short | recursive ) echo "Configuration of subversion 1.8.10:";;
esac
cat <<\_ACEOF
@@ -1736,7 +1737,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-subversion configure 1.8.1
+subversion configure 1.8.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1788,6 +1789,52 @@
} # ac_fn_c_try_compile
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
# ac_fn_cxx_try_compile LINENO
# ----------------------------
# Try to compile conftest.$ac_ext, and return whether this succeeded.
@@ -1826,6 +1873,52 @@
} # ac_fn_cxx_try_compile
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
# ac_fn_c_try_cpp LINENO
# ----------------------
# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -2027,52 +2120,6 @@
} # ac_fn_c_check_header_compile
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- test -x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2177,52 +2224,6 @@
} # ac_fn_cxx_try_cpp
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- test -x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
# -------------------------------------------
# Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2280,7 +2281,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by subversion $as_me 1.8.1, which was
+It was created by subversion $as_me 1.8.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2660,8 +2661,8 @@
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.1" >&5
-$as_echo "$as_me: Configuring Subversion 1.8.1" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.10" >&5
+$as_echo "$as_me: Configuring Subversion 1.8.10" >&6;}
abs_srcdir="`cd $srcdir && pwd`"
@@ -3508,11 +3509,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -std=c90" >&5
$as_echo_n "checking if $CC accepts -std=c90... " >&6; }
CFLAGS="-std=c90 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3535,11 +3536,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -std=c89" >&5
$as_echo_n "checking if $CC accepts -std=c89... " >&6; }
CFLAGS="-std=c89 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3562,11 +3563,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -ansi" >&5
$as_echo_n "checking if $CC accepts -ansi... " >&6; }
CFLAGS="-ansi $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3580,7 +3581,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3591,7 +3593,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3602,7 +3605,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3627,11 +3631,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Werror=unknown-warning-option" >&5
$as_echo_n "checking if $CC accepts -Werror=unknown-warning-option... " >&6; }
CFLAGS="-Werror=unknown-warning-option $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3645,7 +3649,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3931,11 +3936,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -std=c++98" >&5
$as_echo_n "checking if $CXX accepts -std=c++98... " >&6; }
CXXFLAGS="-std=c++98 $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3949,7 +3954,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3974,11 +3980,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Werror=unknown-warning-option" >&5
$as_echo_n "checking if $CXX accepts -Werror=unknown-warning-option... " >&6; }
CXXFLAGS="-Werror=unknown-warning-option $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3992,7 +3998,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4577,7 +4584,7 @@
# ==== Libraries, for which we may have source to build ======================
-APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."
+APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."
APR_WANTED_REGEXES="$APR_VER_REGEXES"
@@ -5278,7 +5285,26 @@
_ACEOF
save_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ LDFLAGS="$LDFLAGS `
+ input_flags="-L$serf_prefix/lib"
+ output_flags=""
+ filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
+ for flag in $input_flags; do
+ filter="no"
+ for dir in $filtered_dirs; do
+ if test "$flag" = "-L$dir" || test "$flag" = "-L$dir/"; then
+ filter="yes"
+ break
+ fi
+ done
+ if test "$filter" = "no"; then
+ output_flags="$output_flags $flag"
+ fi
+ done
+ if test -n "$output_flags"; then
+ printf "%s" "${output_flags# }"
+ fi
+`"
as_ac_Lib=`$as_echo "ac_cv_lib_$serf_major''_serf_context_create" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for serf_context_create in -l$serf_major" >&5
$as_echo_n "checking for serf_context_create in -l$serf_major... " >&6; }
@@ -5362,9 +5388,28 @@
SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
else
SVN_SERF_LIBS="-l$serf_major"
- LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+ LDFLAGS="$LDFLAGS `
+ input_flags="-L$serf_prefix/lib"
+ output_flags=""
+ filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
+ for flag in $input_flags; do
+ filter="no"
+ for dir in $filtered_dirs; do
+ if test "$flag" = "-L$dir" || test "$flag" = "-L$dir/"; then
+ filter="yes"
+ break
+ fi
+ done
+ if test "$filter" = "no"; then
+ output_flags="$output_flags $flag"
fi
+ done
+ if test -n "$output_flags"; then
+ printf "%s" "${output_flags# }"
fi
+`"
+ fi
+ fi
fi
@@ -5717,7 +5762,39 @@
CPPFLAGS="$old_CPPFLAGS"
fi
+# check for some busted versions of mod_dav
+# in particular 2.2.25, 2.4.5, and 2.4.6 had the following bugs which are
+# troublesome for Subversion:
+# PR 55304: https://issues.apache.org/bugzilla/show_bug.cgi?id=55304
+# PR 55306: https://issues.apache.org/bugzilla/show_bug.cgi?id=55306
+# PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
+if test -n "$APXS" && test "$APXS" != "no"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking mod_dav version" >&5
+$as_echo_n "checking mod_dav version... " >&6; }
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+ blacklisted_versions_regex="\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include "$APXS_INCLUDE/ap_release.h"
+apache_version=AP_SERVER_BASEREVISION
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "apache_version= *$blacklisted_versions_regex" >/dev/null 2>&1; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: broken" >&5
+$as_echo "broken" >&6; }
+ as_fn_error $? "Apache httpd version includes a broken mod_dav; use a newer version of httpd" "$LINENO" 5
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: acceptable" >&5
+$as_echo "acceptable" >&6; }
+fi
+rm -f conftest*
+
+ CPPFLAGS="$old_CPPFLAGS"
+fi
+
+
# Check whether --with-apache-libexecdir was given.
if test "${with_apache_libexecdir+set}" = set; then :
withval=$with_apache_libexecdir; APACHE_LIBEXECDIR="$withval"
@@ -17963,7 +18040,26 @@
done
SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
for l in `echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`; do
- LDFLAGS="$LDFLAGS -L$l"
+ LDFLAGS="$LDFLAGS `
+ input_flags="-L$l"
+ output_flags=""
+ filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
+ for flag in $input_flags; do
+ filter="no"
+ for dir in $filtered_dirs; do
+ if test "$flag" = "-L$dir" || test "$flag" = "-L$dir/"; then
+ filter="yes"
+ break
+ fi
+ done
+ if test "$filter" = "no"; then
+ output_flags="$output_flags $flag"
+ fi
+ done
+ if test -n "$output_flags"; then
+ printf "%s" "${output_flags# }"
+ fi
+`"
done
SVN_DB_LIBS=""
for l in `echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`; do
@@ -19146,7 +19242,7 @@
_ACEOF
save_ldflags="$LDFLAGS"
- LDFLAGS="-L$libmagic_prefix/lib"
+ LDFLAGS="-L$libmagic_prefix/lib $LDFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_open in -lmagic" >&5
$as_echo_n "checking for magic_open in -lmagic... " >&6; }
if ${ac_cv_lib_magic_magic_open+:} false; then :
@@ -20012,11 +20108,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Werror=implicit-function-declaration" >&5
$as_echo_n "checking if $CC accepts -Werror=implicit-function-declaration... " >&6; }
CFLAGS="-Werror=implicit-function-declaration $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20030,7 +20126,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20049,11 +20146,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Werror=declaration-after-statement" >&5
$as_echo_n "checking if $CC accepts -Werror=declaration-after-statement... " >&6; }
CFLAGS="-Werror=declaration-after-statement $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20067,7 +20164,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20086,11 +20184,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wextra-tokens" >&5
$as_echo_n "checking if $CC accepts -Wextra-tokens... " >&6; }
CFLAGS="-Wextra-tokens $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20104,7 +20202,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20123,11 +20222,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wnewline-eof" >&5
$as_echo_n "checking if $CC accepts -Wnewline-eof... " >&6; }
CFLAGS="-Wnewline-eof $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20141,7 +20240,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20160,11 +20260,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wshorten-64-to-32" >&5
$as_echo_n "checking if $CC accepts -Wshorten-64-to-32... " >&6; }
CFLAGS="-Wshorten-64-to-32 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20178,7 +20278,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20197,11 +20298,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wold-style-definition" >&5
$as_echo_n "checking if $CC accepts -Wold-style-definition... " >&6; }
CFLAGS="-Wold-style-definition $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20215,7 +20316,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20234,11 +20336,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wno-system-headers" >&5
$as_echo_n "checking if $CC accepts -Wno-system-headers... " >&6; }
CFLAGS="-Wno-system-headers $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20252,7 +20354,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20271,11 +20374,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wno-format-nonliteral" >&5
$as_echo_n "checking if $CC accepts -Wno-format-nonliteral... " >&6; }
CFLAGS="-Wno-format-nonliteral $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20289,7 +20392,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20321,11 +20425,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Wextra-tokens" >&5
$as_echo_n "checking if $CXX accepts -Wextra-tokens... " >&6; }
CXXFLAGS="-Wextra-tokens $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20339,7 +20443,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20358,11 +20463,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Wnewline-eof" >&5
$as_echo_n "checking if $CXX accepts -Wnewline-eof... " >&6; }
CXXFLAGS="-Wnewline-eof $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20376,7 +20481,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20395,11 +20501,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Wshorten-64-to-32" >&5
$as_echo_n "checking if $CXX accepts -Wshorten-64-to-32... " >&6; }
CXXFLAGS="-Wshorten-64-to-32 $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20413,7 +20519,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20432,11 +20539,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Wno-system-headers" >&5
$as_echo_n "checking if $CXX accepts -Wno-system-headers... " >&6; }
CXXFLAGS="-Wno-system-headers $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20450,7 +20557,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20491,11 +20599,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fno-inline" >&5
$as_echo_n "checking if $CC accepts -fno-inline... " >&6; }
CFLAGS="-fno-inline $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20509,7 +20617,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20528,11 +20637,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fno-omit-frame-pointer" >&5
$as_echo_n "checking if $CC accepts -fno-omit-frame-pointer... " >&6; }
CFLAGS="-fno-omit-frame-pointer $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20546,7 +20655,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20565,11 +20675,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -g3" >&5
$as_echo_n "checking if $CC accepts -g3... " >&6; }
CFLAGS="-g3 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20592,11 +20702,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -g2" >&5
$as_echo_n "checking if $CC accepts -g2... " >&6; }
CFLAGS="-g2 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20619,11 +20729,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -g" >&5
$as_echo_n "checking if $CC accepts -g... " >&6; }
CFLAGS="-g $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20637,7 +20747,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20647,7 +20758,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20657,7 +20769,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20681,11 +20794,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -fno-inline" >&5
$as_echo_n "checking if $CXX accepts -fno-inline... " >&6; }
CXXFLAGS="-fno-inline $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20699,7 +20812,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20718,11 +20832,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -fno-omit-frame-pointer" >&5
$as_echo_n "checking if $CXX accepts -fno-omit-frame-pointer... " >&6; }
CXXFLAGS="-fno-omit-frame-pointer $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20736,7 +20850,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20755,11 +20870,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -g3" >&5
$as_echo_n "checking if $CXX accepts -g3... " >&6; }
CXXFLAGS="-g3 $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20782,11 +20897,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -g2" >&5
$as_echo_n "checking if $CXX accepts -g2... " >&6; }
CXXFLAGS="-g2 $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20809,11 +20924,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -g" >&5
$as_echo_n "checking if $CXX accepts -g... " >&6; }
CXXFLAGS="-g $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20827,7 +20942,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20837,7 +20953,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20847,7 +20964,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20886,11 +21004,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -O1" >&5
$as_echo_n "checking if $CC accepts -O1... " >&6; }
CFLAGS="-O1 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20913,11 +21031,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -O" >&5
$as_echo_n "checking if $CC accepts -O... " >&6; }
CFLAGS="-O $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20931,7 +21049,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20941,7 +21060,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20963,11 +21083,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -O3" >&5
$as_echo_n "checking if $CC accepts -O3... " >&6; }
CFLAGS="-O3 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -20990,11 +21110,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -O2" >&5
$as_echo_n "checking if $CC accepts -O2... " >&6; }
CFLAGS="-O2 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21017,11 +21137,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -O1" >&5
$as_echo_n "checking if $CC accepts -O1... " >&6; }
CFLAGS="-O1 $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21044,11 +21164,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -O" >&5
$as_echo_n "checking if $CC accepts -O... " >&6; }
CFLAGS="-O $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21062,7 +21182,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21072,7 +21193,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21082,7 +21204,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21092,7 +21215,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21111,11 +21235,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wno-clobbered" >&5
$as_echo_n "checking if $CC accepts -Wno-clobbered... " >&6; }
CFLAGS="-Wno-clobbered $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21129,7 +21253,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21148,11 +21273,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -flto" >&5
$as_echo_n "checking if $CC accepts -flto... " >&6; }
CFLAGS="-flto $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(void){return 0;}
_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21166,7 +21291,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21174,43 +21300,6 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- _svn_xxflags__save="$CFLAGS"
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fwhole-program" >&5
-$as_echo_n "checking if $CC accepts -fwhole-program... " >&6; }
- CFLAGS="-fwhole-program $CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- CFLAGS="$_svn_xxflags__save"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
fi
fi
if test -z "`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"; then
@@ -21229,11 +21318,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -O1" >&5
$as_echo_n "checking if $CXX accepts -O1... " >&6; }
CXXFLAGS="-O1 $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21256,11 +21345,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -O" >&5
$as_echo_n "checking if $CXX accepts -O... " >&6; }
CXXFLAGS="-O $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21274,7 +21363,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21284,7 +21374,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21306,11 +21397,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -O3" >&5
$as_echo_n "checking if $CXX accepts -O3... " >&6; }
CXXFLAGS="-O3 $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21333,11 +21424,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -O2" >&5
$as_echo_n "checking if $CXX accepts -O2... " >&6; }
CXXFLAGS="-O2 $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21360,11 +21451,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -O1" >&5
$as_echo_n "checking if $CXX accepts -O1... " >&6; }
CXXFLAGS="-O1 $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21387,11 +21478,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -O" >&5
$as_echo_n "checking if $CXX accepts -O... " >&6; }
CXXFLAGS="-O $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21405,7 +21496,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21415,7 +21507,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21425,7 +21518,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21435,7 +21529,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21454,11 +21549,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Wno-clobbered" >&5
$as_echo_n "checking if $CXX accepts -Wno-clobbered... " >&6; }
CXXFLAGS="-Wno-clobbered $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21472,7 +21567,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21491,11 +21587,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -flto" >&5
$as_echo_n "checking if $CXX accepts -flto... " >&6; }
CXXFLAGS="-flto $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+int main(){}
_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -21509,7 +21605,8 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -21517,43 +21614,6 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- _svn_xxflags__save="$CXXFLAGS"
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -fwhole-program" >&5
-$as_echo_n "checking if $CXX accepts -fwhole-program... " >&6; }
- CXXFLAGS="-fwhole-program $CXXFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- CXXFLAGS="$_svn_xxflags__save"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
fi
fi
elif test "$enable_optimization" = "no"; then
@@ -22725,12 +22785,6 @@
$as_echo "$as_me: WARNING: The detected Ruby is between 1.9 and 1.9.3" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Only 1.8.x and 1.9.3 releases are supported at this time" >&5
$as_echo "$as_me: WARNING: Only 1.8.x and 1.9.3 releases are supported at this time" >&2;}
- elif test \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "9" -a "$RUBY_TEENY" -eq "3" \); then
- #Warn about 1.9.3 support
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WARNING: The detected Ruby is 1.9.3" >&5
-$as_echo "$as_me: WARNING: WARNING: The detected Ruby is 1.9.3" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new" >&5
-$as_echo "$as_me: WARNING: WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new" >&2;}
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -25147,7 +25201,14 @@
fi
+# Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well.
+SWIG_CPPFLAGS="$CPPFLAGS"
+ SWIG_CPPFLAGS=`echo "$SWIG_CPPFLAGS" | $SED -e 's/-no-cpp-precomp //'`
+
+
+
+
cat >>confdefs.h <<_ACEOF
#define SVN_PATH_LOCAL_SEPARATOR '/'
_ACEOF
@@ -25736,7 +25797,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by subversion $as_me 1.8.1, which was
+This file was extended by subversion $as_me 1.8.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25802,7 +25863,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-subversion config.status 1.8.1
+subversion config.status 1.8.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Property changes on: trunk/contrib/subversion/configure
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/configure.ac
===================================================================
--- trunk/contrib/subversion/configure.ac 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/configure.ac 2017-02-20 02:39:09 UTC (rev 9266)
@@ -98,7 +98,7 @@
dnl them. Only .7 and later can guarantee repository
dnl integrity with FSFS.
-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."]
+APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."]
SVN_LIB_APR($APR_VER_REGEXES)
@@ -755,7 +755,7 @@
CPPFLAGS="$CPPFLAGS -I$libmagic_prefix/include"
AC_CHECK_HEADERS(magic.h,[
save_ldflags="$LDFLAGS"
- LDFLAGS="-L$libmagic_prefix/lib"
+ LDFLAGS="-L$libmagic_prefix/lib $LDFLAGS"
AC_CHECK_LIB(magic, magic_open, [libmagic_found="yes"])
LDFLAGS="$save_ldflags"
])
@@ -1089,7 +1089,6 @@
SVN_CFLAGS_ADD_IFELSE([-O])])])])
SVN_CFLAGS_ADD_IFELSE([-Wno-clobbered])
SVN_CFLAGS_ADD_IFELSE([-flto])
- SVN_CFLAGS_ADD_IFELSE([-fwhole-program])
fi
fi
if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then
@@ -1106,7 +1105,6 @@
SVN_CXXFLAGS_ADD_IFELSE([-O])])])])
SVN_CXXFLAGS_ADD_IFELSE([-Wno-clobbered])
SVN_CXXFLAGS_ADD_IFELSE([-flto])
- SVN_CXXFLAGS_ADD_IFELSE([-fwhole-program])
fi
fi
elif test "$enable_optimization" = "no"; then
@@ -1282,10 +1280,6 @@
RUBY="none"
AC_MSG_WARN([The detected Ruby is between 1.9 and 1.9.3])
AC_MSG_WARN([Only 1.8.x and 1.9.3 releases are supported at this time])
- elif test \( "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "9" -a "$RUBY_TEENY" -eq "3" \); then
- #Warn about 1.9.3 support
- AC_MSG_WARN([WARNING: The detected Ruby is 1.9.3])
- AC_MSG_WARN([WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new])
fi
else
AC_MSG_RESULT([no])
@@ -1445,6 +1439,11 @@
SVN_STRIP_FLAG(CPPFLAGS, [-no-cpp-precomp ])
fi
+# Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well.
+SWIG_CPPFLAGS="$CPPFLAGS"
+SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-no-cpp-precomp ])
+AC_SUBST([SWIG_CPPFLAGS])
+
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])
Index: trunk/contrib/subversion/gen-make.py
===================================================================
--- trunk/contrib/subversion/gen-make.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/gen-make.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/gen-make.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/get-deps.sh
===================================================================
--- trunk/contrib/subversion/get-deps.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/get-deps.sh 2017-02-20 02:39:09 UTC (rev 9266)
@@ -33,11 +33,11 @@
APR_VERSION=${APR_VERSION:-"1.4.6"}
APU_VERSION=${APU_VERSION:-"1.5.1"}
-SERF_VERSION=${SERF_VERSION:-"1.2.1"}
+SERF_VERSION=${SERF_VERSION:-"1.3.4"}
ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
GTEST_VERSION=${GTEST_VERSION:-"1.6.0"}
-HTTPD_VERSION=${HTTPD_VERSION:-"2.4.6"}
+HTTPD_VERSION=${HTTPD_VERSION:-"2.4.10"}
APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
APR=apr-${APR_VERSION}
@@ -57,7 +57,7 @@
HTTP_FETCH=
[ -z "$HTTP_FETCH" ] && type wget >/dev/null 2>&1 && HTTP_FETCH="wget -q -nc"
-[ -z "$HTTP_FETCH" ] && type curl >/dev/null 2>&1 && HTTP_FETCH="curl -sO"
+[ -z "$HTTP_FETCH" ] && type curl >/dev/null 2>&1 && HTTP_FETCH="curl -sOL"
[ -z "$HTTP_FETCH" ] && type fetch >/dev/null 2>&1 && HTTP_FETCH="fetch -q"
# Need this uncommented if any of the specific versions of the ASF tarballs to
@@ -89,7 +89,7 @@
test -d $BASEDIR/serf && return
cd $TEMPDIR
- $HTTP_FETCH http://serf.googlecode.com/files/$SERF.tar.bz2
+ $HTTP_FETCH http://serf.googlecode.com/svn/src_releases/$SERF.tar.bz2
cd $BASEDIR
bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf -
@@ -101,7 +101,7 @@
test -d $BASEDIR/zlib && return
cd $TEMPDIR
- $HTTP_FETCH http://www.zlib.net/$ZLIB.tar.gz
+ $HTTP_FETCH http://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VERSION/$ZLIB.tar.gz
cd $BASEDIR
gzip -dc $TEMPDIR/$ZLIB.tar.gz | tar -xf -
Property changes on: trunk/contrib/subversion/get-deps.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/bindings/ctypes-python/csvn/txn.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/csvn/txn.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/csvn/txn.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -90,7 +90,7 @@
if kind == svn_node_none:
if base_rev:
- message = "'%s' not found in rev %d" % (path, base_rev)
+ message = "'%s' not found in r%d" % (path, base_rev)
else:
message = "'%s' not found" % (path)
raise SubversionException(SVN_ERR_BAD_URL, message)
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/example.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/example.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/example.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/example.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/log.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/log.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/log.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/log.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/mucc.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/mucc.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/mucc.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/mucc.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/trunkify.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/trunkify.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/trunkify.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/examples/trunkify.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/setup.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/setup.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/setup.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/setup.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/localrepos.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/test/localrepos.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/test/localrepos.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/localrepos.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/remoterepos.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/test/remoterepos.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/test/remoterepos.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/remoterepos.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/run_all.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/test/run_all.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/test/run_all.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/run_all.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/setup_path.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/test/setup_path.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/test/setup_path.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/setup_path.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/svntypes.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/test/svntypes.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/test/svntypes.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/svntypes.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/wc.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/ctypes-python/test/wc.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/ctypes-python/test/wc.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/ctypes-python/test/wc.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/bindings/javahl/native/JNIUtil.cpp
===================================================================
--- trunk/contrib/subversion/subversion/bindings/javahl/native/JNIUtil.cpp 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/javahl/native/JNIUtil.cpp 2017-02-20 02:39:09 UTC (rev 9266)
@@ -418,7 +418,7 @@
env->DeleteLocalRef(jfileName);
}
-void JNIUtil::handleSVNError(svn_error_t *err)
+void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
{
std::string msg;
assembleErrorMessage(svn_error_purge_tracing(err), 0, APR_SUCCESS, msg);
@@ -546,7 +546,16 @@
#endif
env->Throw(static_cast<jthrowable>(env->PopLocalFrame(nativeException)));
+}
+void JNIUtil::handleSVNError(svn_error_t *err)
+{
+ try {
+ wrappedHandleSVNError(err);
+ } catch (...) {
+ svn_error_clear(err);
+ throw;
+ }
svn_error_clear(err);
}
@@ -646,28 +655,42 @@
const char *
JNIUtil::thrownExceptionToCString(SVN::Pool &in_pool)
{
- const char *msg;
+ const char *msg = NULL;
JNIEnv *env = getEnv();
+ apr_pool_t *pool = in_pool.getPool();
if (env->ExceptionCheck())
{
jthrowable t = env->ExceptionOccurred();
- static jmethodID getMessage = 0;
- if (getMessage == 0)
+ jclass cls = env->GetObjectClass(t);
+
+ jstring jclass_name;
+ {
+ jmethodID mid = env->GetMethodID(cls, "getClass", "()Ljava/lang/Class;");
+ jobject clsobj = env->CallObjectMethod(t, mid);
+ jclass basecls = env->GetObjectClass(clsobj);
+ mid = env->GetMethodID(basecls, "getName", "()Ljava/lang/String;");
+ jclass_name = (jstring) env->CallObjectMethod(clsobj, mid);
+ }
+
+ jstring jmessage;
+ {
+ jmethodID mid = env->GetMethodID(cls, "getMessage",
+ "()Ljava/lang/String;");
+ jmessage = (jstring) env->CallObjectMethod(t, mid);
+ }
+
+ JNIStringHolder class_name(jclass_name);
+ if (jmessage)
{
- jclass clazz = env->FindClass("java/lang/Throwable");
- getMessage = env->GetMethodID(clazz, "getMessage",
- "(V)Ljava/lang/String;");
- env->DeleteLocalRef(clazz);
+ JNIStringHolder message(jmessage);
+ msg = apr_pstrcat(pool,
+ static_cast<const char*>(class_name), ": ",
+ static_cast<const char*>(message), NULL);
}
- jstring jmsg = (jstring) env->CallObjectMethod(t, getMessage);
- JNIStringHolder tmp(jmsg);
- msg = tmp.pstrdup(in_pool.getPool());
+ else
+ msg = class_name.pstrdup(pool);
// ### Conditionally add t.printStackTrace() to msg?
}
- else
- {
- msg = NULL;
- }
return msg;
}
Modified: trunk/contrib/subversion/subversion/bindings/javahl/native/JNIUtil.h
===================================================================
--- trunk/contrib/subversion/subversion/bindings/javahl/native/JNIUtil.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/javahl/native/JNIUtil.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -141,6 +141,7 @@
enum { noLog, errorLog, exceptionLog, entryLog } LogLevel;
private:
+ static void wrappedHandleSVNError(svn_error_t *err);
static void assembleErrorMessage(svn_error_t *err, int depth,
apr_status_t parent_apr_err,
std::string &buffer);
Modified: trunk/contrib/subversion/subversion/bindings/javahl/native/SVNClient.cpp
===================================================================
--- trunk/contrib/subversion/subversion/bindings/javahl/native/SVNClient.cpp 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/javahl/native/SVNClient.cpp 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1169,7 +1169,7 @@
return;
SVN_JNI_ERR(svn_client_cat2(outputStream.getStream(subPool),
- path, pegRevision.revision(),
+ intPath.c_str(), pegRevision.revision(),
revision.revision(), ctx, subPool.getPool()),
);
}
Modified: trunk/contrib/subversion/subversion/bindings/swig/core.i
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/core.i 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/core.i 2017-02-20 02:39:09 UTC (rev 9266)
@@ -827,7 +827,6 @@
-#ifdef SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC
%inline %{
/* Helper function to set the gnome-keyring unlock prompt function. This
* C function accepts an auth baton, a function and a prompt baton, but
@@ -851,7 +850,6 @@
prompt_baton);
}
%}
-#endif
#if defined(SWIGPERL) || defined(SWIGRUBY)
%include svn_md5_h.swg
Modified: trunk/contrib/subversion/subversion/bindings/swig/include/svn_types.swg
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/include/svn_types.swg 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/include/svn_types.swg 2017-02-20 02:39:09 UTC (rev 9266)
@@ -922,6 +922,12 @@
$2 = (void *)baton;
}
#endif
+#ifdef SWIGPERL
+%ignore svn_fs_set_warning_func;
+#endif
+#ifdef SWIGPYTHON
+%ignore svn_fs_set_warning_func;
+#endif
/* -----------------------------------------------------------------------
svn_stream_t interoperability with language native io handles
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -185,9 +185,9 @@
h = (HV *)SvRV(source);
cnt = hv_iterinit(h);
while (cnt--) {
- SV* item = hv_iternextsv(h, &key, &retlen);
- void *val = cv(item, ctx, pool);
- svn_hash_sets(hash, key, val);
+ SV* item = hv_iternextsv(h, &key, &retlen);
+ void *val = cv(item, ctx, pool);
+ svn_hash_sets(hash, apr_pstrmemdup(pool, key, retlen), val);
}
return hash;
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/native/Makefile.PL.in
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/native/Makefile.PL.in 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/native/Makefile.PL.in 2017-02-20 02:39:09 UTC (rev 9266)
@@ -45,10 +45,17 @@
my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
-my $cppflags = '@CPPFLAGS@';
-my $cflags = '@CFLAGS@';
+my $cppflags = <<'EOT';
+ at CPPFLAGS@
+EOT
+my $cflags = <<'EOT';
+ at CFLAGS@
+EOT
my $includes = '@SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@';
+chomp($cppflags);
+chomp($cflags);
+
# Avoid this bug in SWIG:
# https://sourceforge.net/tracker/?func=detail&aid=3571361&group_id=1645&atid=101645
# SWIG is using C++ style comments in an extern "C" code.
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/native/core.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/native/core.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/native/core.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -5885,7 +5885,7 @@
arg1 = (struct svn_log_entry_t *)(argp1);
result = (apr_hash_t *) ((arg1)->changed_paths2);
{
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = (result) ? svn_swig_pl_convert_hash(result, SWIGTYPE_p_svn_log_changed_path2_t)
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = (result) ? svn_swig_pl_convert_hash(result, SWIGTYPE_p_svn_log_changed_path2_t)
:&PL_sv_undef; argvi++ /*@SWIG@*/
/*@SWIG@*/
@@ -17219,7 +17219,7 @@
}
}
{
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
SWIGTYPE_p_svn_auth_provider_object_t); argvi++ /*@SWIG@*/
/*@SWIG@*/
;
@@ -28366,7 +28366,7 @@
}
}
{
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
_global_pool),
0)); argvi++ /*@SWIG@*/
@@ -45121,2712 +45121,2712 @@
SvREADONLY_on(sv);
}
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_INVALID_REVNUM", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_long SWIG_PERL_CALL_ARGS_1((long)(-1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_IGNORED_REVNUM", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_long SWIG_PERL_CALL_ARGS_1((long)(-1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CATEGORY_SIZE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(5000)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WARNING", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_WARNING)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CONTAINING_POOL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CONTAINING_POOL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_FILENAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_FILENAME)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_URL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_URL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_DATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_DATE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_MIME_TYPE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_MIME_TYPE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_PROPERTY_VALUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_PROPERTY_VALUE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_VERSION_FILE_FORMAT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_VERSION_FILE_FORMAT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_RELATIVE_PATH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_RELATIVE_PATH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_UUID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_UUID)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CONFIG_VALUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CONFIG_VALUE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_SERVER_SPECIFICATION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_SERVER_SPECIFICATION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHECKSUM_KIND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHECKSUM_KIND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHECKSUM_PARSE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHECKSUM_PARSE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_TOKEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_CHANGELIST_NAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_CHANGELIST_NAME)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_ATOMIC", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_ATOMIC)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_ATTRIB_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_ATTRIB_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_MISSING_ANCESTRY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_MISSING_ANCESTRY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_UNKNOWN_ENCODING", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_UNKNOWN_ENCODING)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_MALFORMED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_MALFORMED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_XML_UNESCAPABLE_DATA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_XML_UNESCAPABLE_DATA)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_INCONSISTENT_EOL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_INCONSISTENT_EOL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_UNKNOWN_EOL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_UNKNOWN_EOL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_CORRUPT_EOL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_CORRUPT_EOL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_FRAME_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_FRAME_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_READ_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_READ_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_WRITE_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_WRITE_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_IO_PIPE_WRITE_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_IO_PIPE_WRITE_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_UNEXPECTED_EOF", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_UNEXPECTED_EOF)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_MALFORMED_DATA)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_UNRECOGNIZED_DATA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_UNRECOGNIZED_DATA)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_STREAM_SEEK_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_STREAM_SEEK_NOT_SUPPORTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NODE_UNKNOWN_KIND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NODE_UNKNOWN_KIND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NODE_UNEXPECTED_KIND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NODE_UNEXPECTED_KIND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_EXISTS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_EXISTS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_MISSING_REVISION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_MISSING_REVISION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_MISSING_URL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_MISSING_URL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_ATTRIBUTE_INVALID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_ATTRIBUTE_INVALID)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ENTRY_FORBIDDEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ENTRY_FORBIDDEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_OBSTRUCTED_UPDATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_OBSTRUCTED_UPDATE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_MISMATCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_EMPTY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_EMPTY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNWIND_NOT_EMPTY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNWIND_NOT_EMPTY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_LOCKED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_LOCKED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_LOCK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_LOCK)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_WORKING_COPY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_WORKING_COPY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_DIRECTORY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_FILE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_FILE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_ADM_LOG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_ADM_LOG)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_UP_TO_DATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_UP_TO_DATE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_LEFT_LOCAL_MOD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_LEFT_LOCAL_MOD)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_SCHEDULE_CONFLICT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_SCHEDULE_CONFLICT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_FOUND_CONFLICT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_FOUND_CONFLICT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CORRUPT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CORRUPT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CORRUPT_TEXT_BASE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CORRUPT_TEXT_BASE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NODE_KIND_CHANGE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NODE_KIND_CHANGE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_OP_ON_CWD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_OP_ON_CWD)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_ADM_LOG_START", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_ADM_LOG_START)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UNSUPPORTED_FORMAT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UNSUPPORTED_FORMAT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_BAD_PATH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_BAD_PATH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_SCHEDULE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_SCHEDULE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_RELOCATION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_RELOCATION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_SWITCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_SWITCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MISMATCHED_CHANGELIST", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MISMATCHED_CHANGELIST)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_COPYFROM_PATH_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CHANGELIST_MOVE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CHANGELIST_MOVE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CANNOT_DELETE_FILE_EXTERNAL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CANNOT_DELETE_FILE_EXTERNAL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CANNOT_MOVE_FILE_EXTERNAL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CANNOT_MOVE_FILE_EXTERNAL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_DB_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_DB_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MISSING", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MISSING)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_NOT_SYMLINK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_NOT_SYMLINK)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_UNEXPECTED_STATUS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_UNEXPECTED_STATUS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_UPGRADE_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_UPGRADE_REQUIRED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_CLEANUP_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_CLEANUP_REQUIRED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_INVALID_OPERATION_DEPTH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_INVALID_OPERATION_DEPTH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_PATH_ACCESS_DENIED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_PATH_ACCESS_DENIED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_MIXED_REVISIONS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_MIXED_REVISIONS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_WC_DUPLICATE_EXTERNALS_TARGET", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_WC_DUPLICATE_EXTERNALS_TARGET)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_GENERAL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_GENERAL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CLEANUP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CLEANUP)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ALREADY_OPEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ALREADY_OPEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_OPEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_OPEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CORRUPT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CORRUPT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_SYNTAX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_SYNTAX)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_REVISION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_REVISION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_TRANSACTION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_TRANSACTION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_ENTRY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_ENTRY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_REPRESENTATION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_REPRESENTATION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_STRING", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_STRING)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_COPY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_COPY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_NOT_MUTABLE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ID_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ID_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_ID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_ID)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_DIRECTORY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_FILE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_FILE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_SINGLE_PATH_COMPONENT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_MUTABLE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ALREADY_EXISTS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ALREADY_EXISTS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_ROOT_DIR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_ROOT_DIR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_TXN_ROOT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_TXN_ROOT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NOT_REVISION_ROOT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NOT_REVISION_ROOT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_CONFLICT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_CONFLICT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_CHANGED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_CHANGED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_NOT_MUTABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_NOT_MUTABLE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_MALFORMED_SKEL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_MALFORMED_SKEL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TXN_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TXN_OUT_OF_DATE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BERKELEY_DB", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BERKELEY_DB)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BERKELEY_DB_DEADLOCK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BERKELEY_DB_DEADLOCK)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_DEAD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_DEAD)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TRANSACTION_NOT_DEAD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TRANSACTION_NOT_DEAD)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNKNOWN_FS_TYPE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNKNOWN_FS_TYPE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_USER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_USER)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_ALREADY_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_ALREADY_LOCKED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PATH_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PATH_NOT_LOCKED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_BAD_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_BAD_LOCK_TOKEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_LOCK_TOKEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_LOCK_OWNER_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_LOCK_OWNER_MISMATCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_LOCK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_LOCK)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_LOCK_EXPIRED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_LOCK_EXPIRED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_OUT_OF_DATE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNSUPPORTED_FORMAT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNSUPPORTED_FORMAT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REP_BEING_WRITTEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REP_BEING_WRITTEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_TXN_NAME_TOO_LONG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_TXN_NAME_TOO_LONG)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_NODE_ORIGIN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_NODE_ORIGIN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_UNSUPPORTED_UPGRADE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_UNSUPPORTED_UPGRADE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_NO_SUCH_CHECKSUM_REP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_NO_SUCH_CHECKSUM_REP)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PROP_BASEVALUE_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PROP_BASEVALUE_MISMATCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_INCORRECT_EDITOR_COMPLETION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_FS_REVPROP_CACHE_INIT_FAILURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_LOCKED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_HOOK_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_HOOK_FAILURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_BAD_ARGS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_BAD_ARGS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_NO_DATA_FOR_REPORT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_NO_DATA_FOR_REPORT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_BAD_REVISION_REPORT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_BAD_REVISION_REPORT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_UNSUPPORTED_VERSION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_UNSUPPORTED_VERSION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_DISABLED_FEATURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_DISABLED_FEATURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_COMMIT_HOOK_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_POST_UNLOCK_HOOK_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_POST_UNLOCK_HOOK_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REPOS_UNSUPPORTED_UPGRADE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REPOS_UNSUPPORTED_UPGRADE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_ILLEGAL_URL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_ILLEGAL_URL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_AUTHORIZED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_AUTHORIZED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UNKNOWN_AUTH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UNKNOWN_AUTH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_IMPLEMENTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_IMPLEMENTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_OUT_OF_DATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_OUT_OF_DATE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NO_REPOS_UUID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NO_REPOS_UUID)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UNSUPPORTED_ABI_VERSION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UNSUPPORTED_ABI_VERSION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_NOT_LOCKED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_NOT_LOCKED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_PARTIAL_REPLAY_NOT_SUPPORTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_PARTIAL_REPLAY_NOT_SUPPORTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_UUID_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_UUID_MISMATCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_REPOS_ROOT_URL_MISMATCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SESSION_URL_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SESSION_URL_MISMATCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_CANNOT_CREATE_TUNNEL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_CANNOT_CREATE_TUNNEL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_SOCK_INIT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_SOCK_INIT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_CREATING_REQUEST", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_CREATING_REQUEST)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_REQUEST_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_REQUEST_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_OPTIONS_REQ_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PROPS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PROPS_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_ALREADY_EXISTS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_ALREADY_EXISTS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PATH_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PATH_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_PROPPATCH_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_PROPPATCH_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_MALFORMED_DATA)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_RESPONSE_HEADER_BADNESS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_RESPONSE_HEADER_BADNESS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_RELOCATED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_RELOCATED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_CONN_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_CONN_TIMEOUT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_DAV_FORBIDDEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_DAV_FORBIDDEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_LOCAL_REPOS_OPEN_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_HEADER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_HEADER)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_CORRUPT_WINDOW", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_CORRUPT_WINDOW)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_BACKWARD_VIEW", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_BACKWARD_VIEW)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_OPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_OPS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_UNEXPECTED_END", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_UNEXPECTED_END)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_MISSING_PATH_TO_FS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_MISSING_PATH_TO_FS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_MALFORMED_URI", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_MALFORMED_URI)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_ACTIVITY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_ACTIVITY_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_BAD_BASELINE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_BAD_BASELINE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_APMOD_CONNECTION_ABORTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_APMOD_CONNECTION_ABORTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_RA_ACCESS_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_RA_ACCESS_REQUIRED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_BAD_REVISION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_BAD_REVISION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_DUPLICATE_COMMIT_URL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_DUPLICATE_COMMIT_URL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_IS_BINARY_FILE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_IS_BINARY_FILE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MODIFIED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MODIFIED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_IS_DIRECTORY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_IS_DIRECTORY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_REVISION_RANGE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_REVISION_RANGE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_RELOCATION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_RELOCATION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_REVISION_AUTHOR_CONTAINS_NEWLINE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_REVISION_AUTHOR_CONTAINS_NEWLINE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_PROPERTY_NAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_PROPERTY_NAME)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_UNRELATED_RESOURCES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_UNRELATED_RESOURCES)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MISSING_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MISSING_LOCK_TOKEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MULTIPLE_SOURCES_DISALLOWED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MULTIPLE_SOURCES_DISALLOWED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NO_VERSIONED_PARENT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NO_VERSIONED_PARENT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NOT_READY_TO_MERGE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NOT_READY_TO_MERGE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_FILE_EXTERNAL_OVERWRITE_VERSIONED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_FILE_EXTERNAL_OVERWRITE_VERSIONED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_PATCH_BAD_STRIP_COUNT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_PATCH_BAD_STRIP_COUNT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_CYCLE_DETECTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_CYCLE_DETECTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_MERGE_UPDATE_REQUIRED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_NO_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_NO_LOCK_TOKEN)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CLIENT_FORBIDDEN_BY_SERVER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CLIENT_FORBIDDEN_BY_SERVER)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BASE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BASE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_PLUGIN_LOAD_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_PLUGIN_LOAD_FAILURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MALFORMED_FILE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MALFORMED_FILE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INCOMPLETE_DATA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INCOMPLETE_DATA)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INCORRECT_PARAMS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INCORRECT_PARAMS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNVERSIONED_RESOURCE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNVERSIONED_RESOURCE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TEST_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TEST_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNSUPPORTED_FEATURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNSUPPORTED_FEATURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_BAD_PROP_KIND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_BAD_PROP_KIND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ILLEGAL_TARGET", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ILLEGAL_TARGET)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DELTA_MD5_CHECKSUM_ABSENT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DIR_NOT_EMPTY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DIR_NOT_EMPTY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_EXTERNAL_PROGRAM", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_EXTERNAL_PROGRAM)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SWIG_PY_EXCEPTION_SET", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SWIG_PY_EXCEPTION_SET)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CHECKSUM_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CHECKSUM_MISMATCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CANCELLED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CANCELLED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_INVALID_DIFF_OPTION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_INVALID_DIFF_OPTION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_PROPERTY_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_PROPERTY_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NO_AUTH_FILE_PATH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NO_AUTH_FILE_PATH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_VERSION_MISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_VERSION_MISMATCH)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MERGEINFO_PARSE_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MERGEINFO_PARSE_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CEASE_INVOCATION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CEASE_INVOCATION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_REVNUM_PARSE_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_REVNUM_PARSE_FAILURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ITER_BREAK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ITER_BREAK)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNKNOWN_CHANGELIST", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNKNOWN_CHANGELIST)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RESERVED_FILENAME_SPECIFIED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RESERVED_FILENAME_SPECIFIED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_UNKNOWN_CAPABILITY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_UNKNOWN_CAPABILITY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TEST_SKIPPED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TEST_SKIPPED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_NO_APR_MEMCACHE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_NO_APR_MEMCACHE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ATOMIC_INIT_FAILURE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ATOMIC_INIT_FAILURE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_READONLY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_READONLY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_UNSUPPORTED_SCHEMA)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_BUSY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_BUSY)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_RESETTING_FOR_ROLLBACK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_RESETTING_FOR_ROLLBACK)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_SQLITE_CONSTRAINT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_SQLITE_CONSTRAINT)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_TOO_MANY_MEMCACHED_SERVERS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_TOO_MANY_MEMCACHED_SERVERS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_MALFORMED_VERSION_STRING", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_MALFORMED_VERSION_STRING)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CORRUPTED_ATOMIC_STORAGE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CORRUPTED_ATOMIC_STORAGE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ARG_PARSING_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ARG_PARSING_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_INSUFFICIENT_ARGS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_INSUFFICIENT_ARGS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ADM_DIR_RESERVED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ADM_DIR_RESERVED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_LOG_MESSAGE_IS_VERSIONED_FILE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_LOG_MESSAGE_IS_VERSIONED_FILE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_LOG_MESSAGE_IS_PATHNAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_LOG_MESSAGE_IS_PATHNAME)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_COMMIT_IN_ADDED_DIR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_COMMIT_IN_ADDED_DIR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_NO_EXTERNAL_EDITOR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_NO_EXTERNAL_EDITOR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_BAD_LOG_MESSAGE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_BAD_LOG_MESSAGE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_NO_EXTERNAL_MERGE_TOOL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_CMD_ERR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_CMD_ERR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_UNKNOWN_CMD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_UNKNOWN_CMD)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_CONNECTION_CLOSED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_CONNECTION_CLOSED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_IO_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_IO_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_MALFORMED_DATA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_MALFORMED_DATA)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_REPOS_NOT_FOUND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_REPOS_NOT_FOUND)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_BAD_VERSION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_BAD_VERSION)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_NO_MECHANISMS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_NO_MECHANISMS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SVN_EDIT_ABORTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SVN_EDIT_ABORTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_CREDS_UNAVAILABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_CREDS_UNAVAILABLE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_NO_PROVIDER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_NO_PROVIDER)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_PROVIDERS_EXHAUSTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_PROVIDERS_EXHAUSTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_CREDS_NOT_SAVED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_CREDS_NOT_SAVED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHN_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHN_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_ROOT_UNREADABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_ROOT_UNREADABLE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_UNREADABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_UNREADABLE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_PARTIALLY_READABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_PARTIALLY_READABLE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_INVALID_CONFIG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_INVALID_CONFIG)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_AUTHZ_UNWRITABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_AUTHZ_UNWRITABLE)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_DIFF_DATASOURCE_MODIFIED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_DIFF_DATASOURCE_MODIFIED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_SSPI_INITIALISATION_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_GSSAPI_INITIALISATION_FAILED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_GSSAPI_INITIALISATION_FAILED)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_RA_SERF_WRAPPED_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_RA_SERF_WRAPPED_ERROR)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASSERTION_FAIL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASSERTION_FAIL)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_ASSERTION_ONLY_TRACING_LINKS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_ASSERTION_ONLY_TRACING_LINKS)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ERR_LAST", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(SVN_ERR_LAST)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_UNALIGNED_ACCESS_IS_OK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "TRUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "FALSE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_none", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_none)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_file", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_file)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_dir", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_dir)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_unknown", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_unknown)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_symlink", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_symlink)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_false", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_false)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_true", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_true)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_tristate_unknown", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_tristate_unknown)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REVNUM_T_FMT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ld"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_nonrecursive", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_nonrecursive)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_recursive", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_recursive)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_depth_unknown", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_unknown)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_depth_exclude", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_exclude)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_depth_empty", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_empty)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_depth_files", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_files)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_depth_immediates", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_immediates)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_depth_infinity", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_depth_infinity)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_KIND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00001)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_SIZE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00002)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_HAS_PROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00004)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_CREATED_REV", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00008)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_TIME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00010)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DIRENT_LAST_AUTHOR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00020)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_MAX_LEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(255)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_LONG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("LastChangedRevision"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_SHORT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Rev"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_REVISION_MEDIUM", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Revision"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_DATE_LONG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("LastChangedDate"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_DATE_SHORT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Date"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_AUTHOR_LONG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("LastChangedBy"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_AUTHOR_SHORT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Author"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_URL_LONG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("HeadURL"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_URL_SHORT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("URL"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_ID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Id"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_KEYWORD_HEADER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Header"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_STREAM_CHUNK_SIZE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(102400)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN__STREAM_CHUNK_SIZE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(16384)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_ALLOCATOR_RECOMMENDED_MAX_FREE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)((4096*1024))));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MAJOR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MINOR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(8)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_PATCH", TRUE | 0x2 | GV_ADDMULTI);
- sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1)));
+ sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(10)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_MICRO", TRUE | 0x2 | GV_ADDMULTI);
- sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1)));
+ sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(10)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_LIBRARY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_TAG", TRUE | 0x2 | GV_ADDMULTI);
- sv_setsv(sv, SWIG_FromCharPtr(" (r1503906)"));
+ sv_setsv(sv, SWIG_FromCharPtr(" (r1615264)"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUMTAG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr(""));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_REVISION", TRUE | 0x2 | GV_ADDMULTI);
- sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1503906)));
+ sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1615264)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUM", TRUE | 0x2 | GV_ADDMULTI);
- sv_setsv(sv, SWIG_FromCharPtr("1.8.1"));
+ sv_setsv(sv, SWIG_FromCharPtr("1.8.10"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VER_NUMBER", TRUE | 0x2 | GV_ADDMULTI);
- sv_setsv(sv, SWIG_FromCharPtr("1.8.1"));
+ sv_setsv(sv, SWIG_FromCharPtr("1.8.10"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_VERSION", TRUE | 0x2 | GV_ADDMULTI);
- sv_setsv(sv, SWIG_FromCharPtr("1.8.1 (r1503906)"));
+ sv_setsv(sv, SWIG_FromCharPtr("1.8.10 (r1615264)"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_prop_entry_kind", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_prop_entry_kind)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_prop_wc_kind", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_prop_wc_kind)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_prop_regular_kind", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_prop_regular_kind)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_BOOLEAN_TRUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("*"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_MIME_TYPE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:mime-type"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_IGNORE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:ignore"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EOL_STYLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:eol-style"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_KEYWORDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:keywords"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXECUTABLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:executable"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXECUTABLE_VALUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("*"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_NEEDS_LOCK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:needs-lock"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_NEEDS_LOCK_VALUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("*"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_SPECIAL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:special"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_SPECIAL_VALUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("*"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_EXTERNALS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:externals"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:mergeinfo"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_INHERITABLE_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auto-props"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_INHERITABLE_IGNORES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:global-ignores"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TEXT_TIME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:text-time"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_OWNER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:owner"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_GROUP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:group"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_UNIX_MODE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:unix-mode"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_WC_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:wc:"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:entry:"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_COMMITTED_REV", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:entry:committed-rev"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_COMMITTED_DATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:entry:committed-date"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_LAST_AUTHOR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:entry:last-author"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_UUID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:entry:uuid"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_ENTRY_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:entry:lock-token"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_CUSTOM_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:custom:"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_AUTHOR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:author"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_LOG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:log"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_DATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:date"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_ORIG_DATE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:original-date"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_AUTOVERSIONED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:autoversioned"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:sync-"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_LOCK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:sync-lock"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_FROM_URL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:sync-from-url"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_FROM_UUID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:sync-from-uuid"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_LAST_MERGED_REV", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:sync-last-merged-rev"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVNSYNC_PROP_CURRENTLY_COPYING", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:sync-currently-copying"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:txn-"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_CLIENT_COMPAT_VERSION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:txn-client-compat-version"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_TXN_USER_AGENT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:txn-user-agent"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_PROP_REVISION_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:revision-"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_ALIASES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(3)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_MAX_OPTIONS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(50)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_OPT_FIRST_LONGOPT_ID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(256)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_unspecified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_unspecified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_number", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_number)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_date", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_date)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_committed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_committed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_previous", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_previous)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_base", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_base)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_working", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_working)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_opt_revision_head", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_opt_revision_head)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SIMPLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn.simple"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn.username"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_CLIENT_CERT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.client-cert"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_CLIENT_CERT_PW", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.client-passphrase"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_CRED_SSL_SERVER_TRUST", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn.ssl.server"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_NOTYETVALID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000001)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_EXPIRED", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000002)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_CNMISMATCH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000004)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_UNKNOWNCA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000008)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_SSL_OTHER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x40000000)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_PREFIX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DEFAULT_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:username"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DEFAULT_PASSWORD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:password"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_NON_INTERACTIVE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:non-interactive"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DONT_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:dont-store-passwords"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:store-plaintext-passwords"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_DONT_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:dont-store-ssl-client-cert-pp"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:store-ssl-client-cert-pp-plaintext"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_NO_AUTH_CACHE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:no-auth-cache"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SSL_SERVER_FAILURES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:ssl:failures"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:ssl:cert-info"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_CATEGORY_CONFIG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-config"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_CATEGORY_SERVERS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-servers"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-category-servers"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_SERVER_GROUP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:server-group"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_CONFIG_DIR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:auth:config-dir"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("gnome-keyring-unlock-prompt-func"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("gnome-keyring-unlock-prompt-baton"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_CATEGORY_SERVERS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("servers"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GROUPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("groups"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GLOBAL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("global"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_HOST", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-proxy-host"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_PORT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-proxy-port"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-proxy-username"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_PASSWORD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-proxy-password"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_PROXY_EXCEPTIONS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-proxy-exceptions"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_TIMEOUT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-timeout"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_COMPRESSION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-compression"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_NEON_DEBUG_MASK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("neon-debug-mask"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_AUTH_TYPES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-auth-types"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_AUTHORITY_FILES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ssl-authority-files"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_TRUST_DEFAULT_CA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ssl-trust-default-ca"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_FILE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-file"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_PASSWORD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-password"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_PKCS11_PROVIDER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ssl-pkcs11-provider"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_LIBRARY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-library"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("store-passwords"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("store-plaintext-passwords"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_AUTH_CREDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("store-auth-creds"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("store-ssl-client-cert-pp"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("store-ssl-client-cert-pp-plaintext"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("username"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_BULK_UPDATES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-bulk-updates"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HTTP_MAX_CONNECTIONS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("http-max-connections"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_CATEGORY_CONFIG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("config"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_AUTH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("auth"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PASSWORD_STORES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("password-stores"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_KWALLET_WALLET", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("kwallet-wallet"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_KWALLET_SVN_APPLICATION_NAME_WITH_PID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("kwallet-svn-application-name-with-pid"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SSL_CLIENT_CERT_FILE_PROMPT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ssl-client-cert-file-prompt"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_HELPERS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("helpers"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_EDITOR_CMD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("editor-cmd"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF_CMD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("diff-cmd"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF_EXTENSIONS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("diff-extensions"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF3_CMD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("diff3-cmd"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_DIFF3_HAS_PROGRAM_ARG", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("diff3-has-program-arg"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MERGE_TOOL_CMD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("merge-tool-cmd"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_MISCELLANY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("miscellany"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_GLOBAL_IGNORES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("global-ignores"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_LOG_ENCODING", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("log-encoding"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USE_COMMIT_TIMES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("use-commit-times"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_TEMPLATE_ROOT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("template-root"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("enable-auto-props"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_NO_UNLOCK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("no-unlock"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MIMETYPES_FILE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("mime-types-file"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PRESERVED_CF_EXTS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("preserved-conflict-file-exts"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("interactive-conflicts"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MEMORY_CACHE_SIZE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("memory-cache-size"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_TUNNELS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("tunnels"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_AUTO_PROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("auto-props"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_WORKING_COPY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("working-copy"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("exclusive-locking"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE_CLIENTS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("exclusive-locking-clients"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_GENERAL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("general"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_ANON_ACCESS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("anon-access"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_AUTH_ACCESS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("auth-access"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_PASSWORD_DB", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("password-db"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_REALM", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("realm"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_AUTHZ_DB", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("authz-db"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_GROUPS_DB", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("groups-db"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_FORCE_USERNAME_CASE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("force-username-case"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_HOOKS_ENV", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("hooks-env"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_SASL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("sasl"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_USE_SASL", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("use-sasl"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MIN_SSF", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("min-encryption"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_OPTION_MAX_SSF", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("max-encryption"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_SECTION_USERS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("users"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("*.rej *~ #*# .#* .*.swp .DS_Store"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_GLOBAL_IGNORES", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__ *.rej *~ #*# .#* .*.swp .DS_Store"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_TRUE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("TRUE"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_FALSE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("FALSE"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_ASK", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ASK"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_PLAINTEXT_PASSWORDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ASK"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_AUTH_CREDS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_STORE_SSL_CLIENT_CERT_PP_PLAINTEXT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ASK"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_DEFAULT_OPTION_HTTP_MAX_CONNECTIONS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(4)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CONFIG_REALMSTRING_KEY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("svn:realmstring"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_MERGEINFO_NONINHERITABLE_STR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("*"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_explicit", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_explicit)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_inherited", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_inherited)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_mergeinfo_nearest_ancestor", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_mergeinfo_nearest_ancestor)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_none", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_none)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_on_close", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_on_close)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_io_file_del_on_pool_cleanup", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_io_file_del_on_pool_cleanup)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_md5", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_md5)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_checksum_sha1", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_checksum_sha1)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_original", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_original)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_modified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_modified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_latest", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_latest)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_datasource_ancestor", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_datasource_ancestor)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified_latest", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified_latest)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_resolved_modified_latest", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_resolved_modified_latest)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified_original_latest", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified_original_latest)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_modified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_modified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_latest", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_latest)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_conflict_display_only_conflicts", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_conflict_display_only_conflicts)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_none", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_none)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_change", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_change)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_file_ignore_space_all", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_file_ignore_space_all)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_unchanged", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_unchanged)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_added", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_added)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_deleted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_deleted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_copied", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_copied)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_moved", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_moved)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_diff_op_modified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_diff_op_modified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_NO_ERROR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0)));
SvREADONLY_on(sv);
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_client.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_client.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_client.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -25367,7 +25367,7 @@
}
}
{
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
SWIGTYPE_p_svn_client_proplist_item_t); argvi++ /*@SWIG@*/
/*@SWIG@*/
;
@@ -25471,7 +25471,7 @@
}
}
{
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = svn_swig_pl_convert_array(*arg1,
SWIGTYPE_p_svn_client_proplist_item_t); argvi++ /*@SWIG@*/
/*@SWIG@*/
;
@@ -35192,72 +35192,72 @@
SvREADONLY_on(sv);
}
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_ADD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x01)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_DELETE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x02)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_TEXT_MODS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x04)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_PROP_MODS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x08)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_IS_COPY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x10)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x20)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_COMMIT_ITEM_MOVED_HERE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x40)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_normal", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_normal)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_added", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_added)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_modified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_modified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_client_diff_summarize_kind_deleted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_client_diff_summarize_kind_deleted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_AUTH_USERNAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("username"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_CLIENT_AUTH_PASSWORD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("password"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SWIG_SVN_INFO_SIZE_UNKNOWN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_unsigned_SS_long SWIG_PERL_CALL_ARGS_1((unsigned long)(-1)));
SvREADONLY_on(sv);
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_delta.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_delta.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_delta.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -3686,7 +3686,7 @@
}
}
{
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg4,
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg4,
_global_pool),
0)); argvi++ /*@SWIG@*/
@@ -8683,32 +8683,32 @@
SvREADONLY_on(sv);
}
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_NONE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_MAX", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(9)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_DELTA_COMPRESSION_LEVEL_DEFAULT", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(5)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_source", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_source)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_target", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_target)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_txdelta_new", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_txdelta_new)));
SvREADONLY_on(sv);
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_fs.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_fs.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_fs.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2130,55 +2130,6 @@
}
-XS(_wrap_svn_fs_set_warning_func) {
- {
- svn_fs_t *arg1 = (svn_fs_t *) 0 ;
- svn_fs_warning_callback_t arg2 = (svn_fs_warning_callback_t) 0 ;
- void *arg3 = (void *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- int res3 ;
- int argvi = 0;
- dXSARGS;
-
- if ((items < 3) || (items > 3)) {
- SWIG_croak("Usage: svn_fs_set_warning_func(fs,warning,warning_baton);");
- }
- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_svn_fs_t, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "svn_fs_set_warning_func" "', argument " "1"" of type '" "svn_fs_t *""'");
- }
- arg1 = (svn_fs_t *)(argp1);
- {
- int res = SWIG_ConvertFunctionPtr(ST(1), (void**)(&arg2), SWIGTYPE_p_f_p_void_p_struct_svn_error_t__void);
- if (!SWIG_IsOK(res)) {
- SWIG_exception_fail(SWIG_ArgError(res), "in method '" "svn_fs_set_warning_func" "', argument " "2"" of type '" "svn_fs_warning_callback_t""'");
- }
- }
- res3 = SWIG_ConvertPtr(ST(2),SWIG_as_voidptrptr(&arg3), 0, 0);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "svn_fs_set_warning_func" "', argument " "3"" of type '" "void *""'");
- }
- {
- svn_fs_set_warning_func(arg1,arg2,arg3);
-
-
-
- }
- ST(argvi) = sv_newmortal();
-
-
-
- XSRETURN(argvi);
- fail:
-
-
-
- SWIG_croak_null();
- }
-}
-
-
XS(_wrap_svn_fs_create) {
{
svn_fs_t **arg1 = (svn_fs_t **) 0 ;
@@ -8745,7 +8696,7 @@
}
}
{
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg1,
_global_pool),
0)); argvi++ /*@SWIG@*/
@@ -11842,7 +11793,6 @@
static swig_command_info swig_commands[] = {
{"SVN::_Fs::svn_fs_version", _wrap_svn_fs_version},
{"SVN::_Fs::svn_fs_initialize", _wrap_svn_fs_initialize},
-{"SVN::_Fs::svn_fs_set_warning_func", _wrap_svn_fs_set_warning_func},
{"SVN::_Fs::svn_fs_create", _wrap_svn_fs_create},
{"SVN::_Fs::svn_fs_open", _wrap_svn_fs_open},
{"SVN::_Fs::svn_fs_upgrade", _wrap_svn_fs_upgrade},
@@ -12282,122 +12232,122 @@
SvREADONLY_on(sv);
}
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_BDB_TXN_NOSYNC", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("bdb-txn-nosync"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_BDB_LOG_AUTOREMOVE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("bdb-log-autoremove"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_DELTAS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-deltas"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-fulltexts"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_REVPROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-revprops"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FSFS_CACHE_NS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("fsfs-cache-namespace"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_FS_TYPE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("fs-type"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_BDB", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("bdb"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TYPE_FSFS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("fsfs"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_4_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("pre-1.4-compatible"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_5_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("pre-1.5-compatible"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_6_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("pre-1.6-compatible"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_CONFIG_PRE_1_8_COMPATIBLE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("pre-1.8-compatible"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TXN_CHECK_OOD", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00001)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_FS_TXN_CHECK_LOCKS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00002)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_modify", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_modify)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_add", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_add)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_delete", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_delete)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_replace", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_replace)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_path_change_reset", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_path_change_reset)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_start", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_start)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_end", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_end)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_start_revprop", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_start_revprop)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_fs_pack_notify_end_revprop", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_fs_pack_notify_end_revprop)));
SvREADONLY_on(sv);
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_ra.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_ra.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_ra.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -17744,52 +17744,52 @@
SvREADONLY_on(sv);
}
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_DEPTH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("depth"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("mergeinfo"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_LOG_REVPROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("log-revprops"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_PARTIAL_REPLAY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("partial-replay"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_COMMIT_REVPROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("commit-revprops"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_ATOMIC_REVPROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("atomic-revprops"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_INHERITED_PROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("inherited-props"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_EPHEMERAL_TXNPROPS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("ephemeral-txnprops"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_CAPABILITY_GET_FILE_REVS_REVERSE", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("get-file-revs-reversed"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_RA_ABI_VERSION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(2)));
SvREADONLY_on(sv);
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_repos.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_repos.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_repos.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -19793,312 +19793,312 @@
SvREADONLY_on(sv);
}
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_change", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_change)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_add", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_add)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_delete", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_delete)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_node_action_replace", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_node_action_replace)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_default", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_default)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_ignore", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_ignore)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_load_uuid_force", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_load_uuid_force)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_authz_none", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_authz_none)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_authz_read", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_authz_read)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_authz_write", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_authz_write)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_authz_recursive", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_authz_recursive)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_dump_rev_end", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_dump_rev_end)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_rev_end", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_rev_end)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_dump_end", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_dump_end)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_end", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_end)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_start", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_start)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_end", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_end)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_start_revprop", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_start_revprop)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_pack_shard_end_revprop", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_pack_shard_end_revprop)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_txn_start", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_txn_start)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_txn_committed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_txn_committed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_node_start", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_node_start)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_node_done", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_node_done)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_copied_node", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_copied_node)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_normalized_mergeinfo", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_normalized_mergeinfo)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_mutex_acquired", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_mutex_acquired)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_recover_start", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_recover_start)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_upgrade_start", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_upgrade_start)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_load_skipped_rev", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_load_skipped_rev)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_verify_rev_structure", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_verify_rev_structure)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_found_old_reference", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_found_old_reference)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_found_old_mergeinfo", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_found_old_mergeinfo)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_notify_warning_invalid_fspath", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_notify_warning_invalid_fspath)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_CAPABILITY_MERGEINFO", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("mergeinfo"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_MAGIC_HEADER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("SVN-fs-dump-format-version"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_FORMAT_VERSION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(3)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_FORMAT_VERSION_DELTAS", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(3)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_UUID", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("UUID"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Content-length"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_REVISION_NUMBER", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Revision-number"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_PATH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Node-path"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_KIND", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Node-kind"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_ACTION", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Node-action"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Node-copyfrom-path"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Node-copyfrom-rev"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_MD5", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-md5"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_SHA1", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-sha1"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_COPY_SOURCE_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-copy-source-md5"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_MD5", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-content-md5"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_SHA1", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-content-sha1"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-content-md5"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Prop-content-length"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-content-length"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_PROP_DELTA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Prop-delta"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-delta"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_MD5", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-md5"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_SHA1", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-sha1"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_REPOS_DUMPFILE_TEXT_DELTA_BASE_CHECKSUM", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr("Text-delta-base-md5"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_none", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_none)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_partial", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_partial)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_repos_revision_access_full", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_repos_revision_access_full)));
SvREADONLY_on(sv);
Modified: trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_wc.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_wc.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/perl/native/svn_wc.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -38529,7 +38529,7 @@
}
}
{
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg2,
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,59,%append_output@*/ if (argvi >= items) EXTEND(sp,1); /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,56,%set_output@*/ ST(argvi) = sv_2mortal(newSVpv(svn_md5_digest_to_cstring(arg2,
_global_pool),
0)); argvi++ /*@SWIG@*/
@@ -48395,747 +48395,747 @@
SvREADONLY_on(sv);
}
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FROM_NF", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000000)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_TO_NF", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000001)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FORCE_EOL_REPAIR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000002)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_NO_OUTPUT_CLEANUP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000004)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_FORCE_COPY", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000008)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_TRANSLATE_USE_GLOBAL_TMP", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(0x00000010)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ADM_DIR_NAME", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr(".svn"));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_add", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_add)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_copy", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_copy)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_delete", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_delete)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_restore", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_restore)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revert", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revert)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_revert", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_revert)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_resolved", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_resolved)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_skip", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_skip)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_delete", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_delete)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_add", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_add)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_update", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_update)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_completed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_completed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_external", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_external)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_status_completed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_status_completed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_status_external", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_status_external)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_modified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_modified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_added", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_added)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_deleted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_deleted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_replaced", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_replaced)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_postfix_txdelta", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_postfix_txdelta)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_blame_revision", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_blame_revision)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_locked", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_locked)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_unlocked", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_unlocked)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_lock", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_lock)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_unlock", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_unlock)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_exists", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_exists)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_set", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_set)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_clear", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_clear)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_changelist_moved", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_changelist_moved)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_begin", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_begin)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_foreign_merge_begin", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_foreign_merge_begin)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_replace", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_replace)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_added", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_added)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_modified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_modified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_deleted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_deleted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_property_deleted_nonexistent", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_property_deleted_nonexistent)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revprop_set", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revprop_set)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_revprop_deleted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_revprop_deleted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_completed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_completed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_tree_conflict", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_tree_conflict)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_external", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_external)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_started", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_started)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_obstruction", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_obstruction)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_working_only", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_working_only)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_skip_access_denied", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_skip_access_denied)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_external_removed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_external_removed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_add", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_add)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_update", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_update)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_shadowed_delete", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_shadowed_delete)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_record_info", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_record_info)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_upgraded_path", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_upgraded_path)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_record_info_begin", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_record_info_begin)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_merge_elide_info", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_merge_elide_info)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_applied_hunk", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_applied_hunk)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_rejected_hunk", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_rejected_hunk)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_patch_hunk_already_applied", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_patch_hunk_already_applied)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_copied", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_copied)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_commit_copied_replaced", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_commit_copied_replaced)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_url_redirect", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_url_redirect)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_path_nonexistent", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_path_nonexistent)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_exclude", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_exclude)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_conflict", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_conflict)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_missing", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_missing)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_out_of_date", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_out_of_date)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_no_parent", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_no_parent)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_locked", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_locked)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_forbidden_by_server", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_forbidden_by_server)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_skip_conflicted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_skip_conflicted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_update_broken_lock", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_update_broken_lock)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_failed_obstruction", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_failed_obstruction)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_conflict_resolver_starting", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_conflict_resolver_starting)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_conflict_resolver_done", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_conflict_resolver_done)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_left_local_modifications", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_left_local_modifications)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_foreign_copy_begin", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_foreign_copy_begin)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_move_broken", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_move_broken)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_inapplicable", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_inapplicable)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_unknown", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_unknown)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_unchanged", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_unchanged)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_missing", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_missing)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_obstructed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_obstructed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_changed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_changed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_merged", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_merged)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_conflicted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_conflicted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_state_source_missing", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_state_source_missing)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_inapplicable", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_inapplicable)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unknown", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unknown)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unchanged", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unchanged)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_locked", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_locked)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_notify_lock_state_unlocked", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_notify_lock_state_unlocked)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_edit", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_edit)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_add", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_add)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_delete", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_delete)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_action_replace", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_action_replace)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_edited", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_edited)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_obstructed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_obstructed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_deleted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_deleted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_missing", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_missing)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_unversioned", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_unversioned)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_added", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_added)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_replaced", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_replaced)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_moved_away", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_moved_away)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_reason_moved_here", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_reason_moved_here)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_text", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_text)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_property", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_property)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_kind_tree", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_kind_tree)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_none", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_none)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_update", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_update)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_switch", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_switch)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_operation_merge", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_operation_merge)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_postpone", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_postpone)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_base", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_base)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_theirs_full", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_theirs_full)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_mine_full", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_mine_full)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_theirs_conflict", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_theirs_conflict)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_mine_conflict", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_mine_conflict)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_merged", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_merged)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_conflict_choose_unspecified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_conflict_choose_unspecified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_normal", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_normal)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_add", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_add)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_delete", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_delete)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_schedule_replace", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_schedule_replace)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)((-1))));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "SVN_WC_ENTRY_THIS_DIR", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_FromCharPtr(""));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_none", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_none)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_unversioned", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_unversioned)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_normal", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_normal)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_added", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_added)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_missing", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_missing)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_deleted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_deleted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_replaced", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_replaced)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_modified", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_modified)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_merged", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_merged)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_conflicted", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_conflicted)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_ignored", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_ignored)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_obstructed", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_obstructed)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_external", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_external)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_status_incomplete", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_status_incomplete)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_unchanged", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_unchanged)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_merged", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_merged)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_conflict", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_conflict)));
SvREADONLY_on(sv);
} while(0) /*@SWIG@*/;
- /*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
+ /*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/perl5/perltypemaps.swg,65,%set_constant@*/ do {
SV *sv = get_sv((char*) SWIG_prefix "svn_wc_merge_no_merge", TRUE | 0x2 | GV_ADDMULTI);
sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1((int)(svn_wc_merge_no_merge)));
SvREADONLY_on(sv);
Modified: trunk/contrib/subversion/subversion/bindings/swig/python/client.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/python/client.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/python/client.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -3263,6 +3263,7 @@
svn_swig_py_cancel_func = _client.svn_swig_py_cancel_func
svn_swig_py_get_commit_log_func = _client.svn_swig_py_get_commit_log_func
svn_swig_py_notify_func = _client.svn_swig_py_notify_func
+svn_swig_py_notify_func2 = _client.svn_swig_py_notify_func2
# This file is compatible with both classic and new-style classes.
Modified: trunk/contrib/subversion/subversion/bindings/swig/python/core.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/python/core.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/python/core.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -35546,15 +35546,15 @@
SWIG_Python_SetConstant(d, "SVN_ALLOCATOR_RECOMMENDED_MAX_FREE",SWIG_From_long((long)((4096*1024))));
SWIG_Python_SetConstant(d, "SVN_VER_MAJOR",SWIG_From_long((long)(1)));
SWIG_Python_SetConstant(d, "SVN_VER_MINOR",SWIG_From_long((long)(8)));
- SWIG_Python_SetConstant(d, "SVN_VER_PATCH",SWIG_From_long((long)(1)));
- SWIG_Python_SetConstant(d, "SVN_VER_MICRO",SWIG_From_long((long)(1)));
+ SWIG_Python_SetConstant(d, "SVN_VER_PATCH",SWIG_From_long((long)(10)));
+ SWIG_Python_SetConstant(d, "SVN_VER_MICRO",SWIG_From_long((long)(10)));
SWIG_Python_SetConstant(d, "SVN_VER_LIBRARY",SWIG_From_long((long)(1)));
- SWIG_Python_SetConstant(d, "SVN_VER_TAG",SWIG_FromCharPtr(" (r1503906)"));
+ SWIG_Python_SetConstant(d, "SVN_VER_TAG",SWIG_FromCharPtr(" (r1615264)"));
SWIG_Python_SetConstant(d, "SVN_VER_NUMTAG",SWIG_FromCharPtr(""));
- SWIG_Python_SetConstant(d, "SVN_VER_REVISION",SWIG_From_long((long)(1503906)));
- SWIG_Python_SetConstant(d, "SVN_VER_NUM",SWIG_FromCharPtr("1.8.1"));
- SWIG_Python_SetConstant(d, "SVN_VER_NUMBER",SWIG_FromCharPtr("1.8.1"));
- SWIG_Python_SetConstant(d, "SVN_VERSION",SWIG_FromCharPtr("1.8.1 (r1503906)"));
+ SWIG_Python_SetConstant(d, "SVN_VER_REVISION",SWIG_From_long((long)(1615264)));
+ SWIG_Python_SetConstant(d, "SVN_VER_NUM",SWIG_FromCharPtr("1.8.10"));
+ SWIG_Python_SetConstant(d, "SVN_VER_NUMBER",SWIG_FromCharPtr("1.8.10"));
+ SWIG_Python_SetConstant(d, "SVN_VERSION",SWIG_FromCharPtr("1.8.10 (r1615264)"));
SWIG_Python_SetConstant(d, "svn_prop_entry_kind",SWIG_From_long((long)(svn_prop_entry_kind)));
SWIG_Python_SetConstant(d, "svn_prop_wc_kind",SWIG_From_long((long)(svn_prop_wc_kind)));
SWIG_Python_SetConstant(d, "svn_prop_regular_kind",SWIG_From_long((long)(svn_prop_regular_kind)));
Modified: trunk/contrib/subversion/subversion/bindings/swig/python/fs.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/python/fs.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/python/fs.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -108,10 +108,6 @@
"""svn_fs_initialize(apr_pool_t pool) -> svn_error_t"""
return _fs.svn_fs_initialize(*args)
-def svn_fs_set_warning_func(*args):
- """svn_fs_set_warning_func(svn_fs_t * fs, svn_fs_warning_callback_t warning, void * warning_baton)"""
- return _fs.svn_fs_set_warning_func(*args)
-
def svn_fs_create(*args):
"""svn_fs_create(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"""
return _fs.svn_fs_create(*args)
Modified: trunk/contrib/subversion/subversion/bindings/swig/python/svn_client.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/python/svn_client.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/python/svn_client.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -33164,7 +33164,8 @@
static swig_const_info swig_const_table[] = {
{ SWIG_PY_POINTER, (char*)"svn_swig_py_cancel_func", 0, 0, (void *)(svn_swig_py_cancel_func), &SWIGTYPE_p_f_p_void__p_svn_error_t },
{ SWIG_PY_POINTER, (char*)"svn_swig_py_get_commit_log_func", 0, 0, (void *)(svn_swig_py_get_commit_log_func), &SWIGTYPE_p_f_p_p_q_const__char_p_p_q_const__char_p_q_const__apr_array_header_t_p_void_p_apr_pool_t__p_svn_error_t },
-{ SWIG_PY_POINTER, (char*)"svn_swig_py_notify_func", 0, 0, (void *)(svn_swig_py_notify_func), &SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void },
+{ SWIG_PY_POINTER, (char*)"svn_swig_py_notify_func", 0, 0, (void *)(svn_swig_py_notify_func), &SWIGTYPE_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void },
+{ SWIG_PY_POINTER, (char*)"svn_swig_py_notify_func2", 0, 0, (void *)(svn_swig_py_notify_func2), &SWIGTYPE_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void },
{0, 0, 0, 0.0, 0, 0}};
#ifdef __cplusplus
@@ -33876,10 +33877,19 @@
}
{
+ svn_wc_notify_func_t * tmp = malloc(sizeof(svn_wc_notify_func_t));
+ *tmp = (svn_wc_notify_func_t) svn_swig_py_notify_func;
+
+ SWIG_Python_SetConstant(d, "svn_swig_py_notify_func",svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__char_enum_svn_wc_notify_action_t_enum_svn_node_kind_t_p_q_const__char_enum_svn_wc_notify_state_t_enum_svn_wc_notify_state_t_long__void, NULL, NULL))
+
+ ;
+
+ }
+ {
svn_wc_notify_func2_t * tmp = malloc(sizeof(svn_wc_notify_func2_t));
- *tmp = (svn_wc_notify_func2_t) svn_swig_py_notify_func;
+ *tmp = (svn_wc_notify_func2_t) svn_swig_py_notify_func2;
- SWIG_Python_SetConstant(d, "svn_swig_py_notify_func",svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, NULL, NULL))
+ SWIG_Python_SetConstant(d, "svn_swig_py_notify_func2",svn_swig_NewPointerObj(tmp, SWIGTYPE_p_p_f_p_void_p_q_const__struct_svn_wc_notify_t_p_apr_pool_t__void, NULL, NULL))
;
Modified: trunk/contrib/subversion/subversion/bindings/swig/python/svn_fs.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/python/svn_fs.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/python/svn_fs.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -3571,53 +3571,6 @@
}
-SWIGINTERN PyObject *_wrap_svn_fs_set_warning_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- svn_fs_t *arg1 = (svn_fs_t *) 0 ;
- svn_fs_warning_callback_t arg2 = (svn_fs_warning_callback_t) 0 ;
- void *arg3 = (void *) 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"OOO:svn_fs_set_warning_func",&obj0,&obj1,&obj2)) SWIG_fail;
- {
- arg1 = (svn_fs_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_fs_t, svn_argnum_obj0);
- if (PyErr_Occurred()) {
- SWIG_fail;
- }
- }
- {
- svn_fs_warning_callback_t * tmp =
- svn_swig_MustGetPtr(obj1, SWIGTYPE_p_p_f_p_void_p_struct_svn_error_t__void, svn_argnum_obj1);
- if (tmp == NULL || PyErr_Occurred()) {
- SWIG_fail;
- }
- arg2 = *tmp;
- }
- {
- if (obj2 == Py_None) {
- arg3 = NULL;
- } else if (SWIG_ConvertPtr(obj2, (void **) &arg3, 0, 0) == -1) {
- arg3 = (void *) obj2;
- PyErr_Clear();
- }
- }
- {
- svn_swig_py_release_py_lock();
-
- svn_fs_set_warning_func(arg1,arg2,arg3);
-
- svn_swig_py_acquire_py_lock();
-
- }
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
SWIGINTERN PyObject *_wrap_svn_fs_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
svn_fs_t **arg1 = (svn_fs_t **) 0 ;
@@ -11937,7 +11890,6 @@
{ (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
{ (char *)"svn_fs_version", _wrap_svn_fs_version, METH_VARARGS, (char *)"svn_fs_version() -> svn_version_t const *"},
{ (char *)"svn_fs_initialize", _wrap_svn_fs_initialize, METH_VARARGS, (char *)"svn_fs_initialize(apr_pool_t pool) -> svn_error_t"},
- { (char *)"svn_fs_set_warning_func", _wrap_svn_fs_set_warning_func, METH_VARARGS, (char *)"svn_fs_set_warning_func(svn_fs_t * fs, svn_fs_warning_callback_t warning, void * warning_baton)"},
{ (char *)"svn_fs_create", _wrap_svn_fs_create, METH_VARARGS, (char *)"svn_fs_create(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"},
{ (char *)"svn_fs_open", _wrap_svn_fs_open, METH_VARARGS, (char *)"svn_fs_open(char const * path, apr_hash_t fs_config, apr_pool_t pool) -> svn_error_t"},
{ (char *)"svn_fs_upgrade", _wrap_svn_fs_upgrade, METH_VARARGS, (char *)"svn_fs_upgrade(char const * path, apr_pool_t pool) -> svn_error_t"},
Modified: trunk/contrib/subversion/subversion/bindings/swig/python/tests/client.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/python/tests/client.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/python/tests/client.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -437,7 +437,69 @@
self.proplist_receiver_dir1, self.client_ctx)
self.assertEquals(self.proplist_receiver_dir1_calls, 1)
+ def test_update4(self):
+ """Test update and the notify function callbacks"""
+ rev = core.svn_opt_revision_t()
+ rev.kind = core.svn_opt_revision_number
+ rev.value.number = 0
+
+ path = self.temper.alloc_empty_dir('-update')
+
+ self.assertRaises(ValueError, client.checkout2,
+ self.repos_uri, path, None, None, True, True,
+ self.client_ctx)
+
+ client.checkout2(self.repos_uri, path, rev, rev, True, True,
+ self.client_ctx)
+
+ def notify_func(path, action, kind, mime_type, content_state, prop_state, rev):
+ self.notified_paths.append(path)
+
+ self.client_ctx.notify_func = client.svn_swig_py_notify_func
+ self.client_ctx.notify_baton = notify_func
+ rev.value.number = 1
+ self.notified_paths = []
+ client.update4((path,), rev, core.svn_depth_unknown, True, False, False,
+ False, False, self.client_ctx)
+ expected_paths = [
+ path,
+ os.path.join(path, 'branches'),
+ os.path.join(path, 'tags'),
+ os.path.join(path, 'trunk'),
+ path,
+ path
+ ]
+ # All normal subversion apis process paths in Subversion's canonical format,
+ # which isn't the platform specific format
+ expected_paths = [x.replace(os.path.sep, '/') for x in expected_paths]
+ self.notified_paths.sort()
+ expected_paths.sort()
+
+ self.assertEquals(self.notified_paths, expected_paths)
+
+ def notify_func2(notify, pool):
+ self.notified_paths.append(notify.path)
+
+ self.client_ctx.notify_func2 = client.svn_swig_py_notify_func2
+ self.client_ctx.notify_baton2 = notify_func2
+ rev.value.number = 2
+ self.notified_paths = []
+ expected_paths = [
+ path,
+ os.path.join(path, 'trunk', 'README.txt'),
+ os.path.join(path, 'trunk'),
+ path,
+ path
+ ]
+ expected_paths = [x.replace(os.path.sep, '/') for x in expected_paths]
+ client.update4((path,), rev, core.svn_depth_unknown, True, False, False,
+ False, False, self.client_ctx)
+ self.notified_paths.sort()
+ expected_paths.sort()
+ self.assertEquals(self.notified_paths, expected_paths)
+
+
def suite():
return unittest.defaultTestLoader.loadTestsFromTestCase(
SubversionClientTestCase)
Index: trunk/contrib/subversion/subversion/bindings/swig/python/tests/trac/test.py
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/python/tests/trac/test.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/python/tests/trac/test.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/swig/python/tests/trac/test.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/core.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/core.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/core.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2107,7 +2107,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2318,7 +2318,7 @@
#include "svn_auth.h"
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
{
VALUE obj = args[0];
@@ -42290,15 +42290,15 @@
rb_define_module_function(mCore, "svn_pool_create_allocator", _wrap_svn_pool_create_allocator, -1);
rb_define_const(mCore, "SVN_VER_MAJOR", SWIG_From_int((int)(1)));
rb_define_const(mCore, "SVN_VER_MINOR", SWIG_From_int((int)(8)));
- rb_define_const(mCore, "SVN_VER_PATCH", SWIG_From_int((int)(1)));
- rb_define_const(mCore, "SVN_VER_MICRO", SWIG_From_int((int)(1)));
+ rb_define_const(mCore, "SVN_VER_PATCH", SWIG_From_int((int)(10)));
+ rb_define_const(mCore, "SVN_VER_MICRO", SWIG_From_int((int)(10)));
rb_define_const(mCore, "SVN_VER_LIBRARY", SWIG_From_int((int)(1)));
- rb_define_const(mCore, "SVN_VER_TAG", SWIG_FromCharPtr(" (r1503906)"));
+ rb_define_const(mCore, "SVN_VER_TAG", SWIG_FromCharPtr(" (r1615264)"));
rb_define_const(mCore, "SVN_VER_NUMTAG", SWIG_FromCharPtr(""));
- rb_define_const(mCore, "SVN_VER_REVISION", SWIG_From_int((int)(1503906)));
- rb_define_const(mCore, "SVN_VER_NUM", SWIG_FromCharPtr("1.8.1"));
- rb_define_const(mCore, "SVN_VER_NUMBER", SWIG_FromCharPtr("1.8.1"));
- rb_define_const(mCore, "SVN_VERSION", SWIG_FromCharPtr("1.8.1 (r1503906)"));
+ rb_define_const(mCore, "SVN_VER_REVISION", SWIG_From_int((int)(1615264)));
+ rb_define_const(mCore, "SVN_VER_NUM", SWIG_FromCharPtr("1.8.10"));
+ rb_define_const(mCore, "SVN_VER_NUMBER", SWIG_FromCharPtr("1.8.10"));
+ rb_define_const(mCore, "SVN_VERSION", SWIG_FromCharPtr("1.8.10 (r1615264)"));
SwigClassSvn_version_t.klass = rb_define_class_under(mCore, "Svn_version_t", rb_cObject);
SWIG_TypeClientData(SWIGTYPE_p_svn_version_t, (void *) &SwigClassSvn_version_t);
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1192,6 +1192,7 @@
DEFINE_DUP(wc_entry)
DEFINE_DUP(client_diff_summarize)
DEFINE_DUP(dirent)
+DEFINE_DUP(log_entry)
DEFINE_DUP_NO_CONVENIENCE(client_commit_item3)
DEFINE_DUP_NO_CONVENIENCE(client_proplist_item)
DEFINE_DUP_NO_CONVENIENCE(wc_external_item2)
@@ -2155,9 +2156,7 @@
cbb.receiver = proc;
cbb.message = id_call;
- cbb.args = rb_ary_new3(1,
- c2r_swig_type((void *)entry,
- (void *)"svn_log_entry_t *"));
+ cbb.args = rb_ary_new3(1, c2r_log_entry__dup(entry));
invoke_callback_handle_error((VALUE)(&cbb), rb_pool, &err);
}
return err;
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_client.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_client.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_client.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2052,7 +2052,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2157,7 +2157,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2206,9 +2206,15 @@
SWIGINTERN struct svn_client_ctx_t *new_svn_client_ctx_t(apr_pool_t *pool){
svn_error_t *err;
svn_client_ctx_t *self;
- err = svn_client_create_context(&self, pool);
+ apr_hash_t *cfg_hash;
+
+ err = svn_config_get_config(&cfg_hash, NULL, pool);
if (err)
svn_swig_rb_handle_svn_error(err);
+
+ err = svn_client_create_context2(&self, cfg_hash, pool);
+ if (err)
+ svn_swig_rb_handle_svn_error(err);
return self;
}
@@ -2388,7 +2394,13 @@
apr_hash_t *config,
apr_pool_t *pool)
{
- ctx->config = config;
+ svn_error_t *err;
+
+ apr_hash_clear(ctx->config);
+ err = svn_config_copy_config(&ctx->config, config,
+ apr_hash_pool_get(ctx->config));
+ if (err)
+ svn_swig_rb_handle_svn_error(err);
return Qnil;
}
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_delta.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_delta.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_delta.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1999,7 +1999,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2044,7 +2044,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
{
VALUE obj = args[0];
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_fs.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_fs.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_fs.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2082,7 +2082,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2137,7 +2137,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
{
VALUE obj = args[0];
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_ra.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_ra.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_ra.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2079,7 +2079,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2124,7 +2124,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
{
VALUE obj = args[0];
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_repos.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_repos.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_repos.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2006,7 +2006,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2148,7 +2148,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
{
VALUE obj = args[0];
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_wc.c
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_wc.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/svn_wc.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2119,7 +2119,7 @@
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@@ -2199,7 +2199,7 @@
return svn_wc_external_item2_dup(self, pool);
}
-/*@SWIG:/home/breser/wandisco/svnrm-1.8/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/home/breser/wandisco/rm/1.8.10/prefix/share/swig/2.0.9/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
{
VALUE obj = args[0];
Index: trunk/contrib/subversion/subversion/bindings/swig/ruby/test/run-test.rb
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/test/run-test.rb 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/test/run-test.rb 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/bindings/swig/ruby/test/run-test.rb
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/test/test_client.rb
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/test/test_client.rb 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/test/test_client.rb 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2262,7 +2262,6 @@
end
end
config = Svn::Core::Config.config(@config_path)
- assert_nil(ctx.config)
assert_equal(options, config[Svn::Core::CONFIG_CATEGORY_SERVERS].to_hash)
ctx.config = config
assert_equal(options,
Modified: trunk/contrib/subversion/subversion/bindings/swig/ruby/test/test_wc.rb
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/ruby/test/test_wc.rb 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/ruby/test/test_wc.rb 2017-02-20 02:39:09 UTC (rev 9266)
@@ -584,13 +584,13 @@
end
def assert_translated_keyword(method_name)
- src_file = "$Revision: 1.1.1.1 $"
+ src_file = "$Revision$"
revision_file = "revision_file"
src_path = File.join(@wc_path, src_file)
revision_path = File.join(@wc_path, revision_file)
- source = "$Revision: 1.1.1.1 $\n"
- revision_source = source.gsub(/\$Revision\$/, "$Revision: 1.1.1.1 $")
+ source = "$Revision$\n"
+ revision_source = source.gsub(/\$Revision\$/, "$Revision: 1 $")
File.open(revision_path, "w") {}
Modified: trunk/contrib/subversion/subversion/bindings/swig/svn_client.i
===================================================================
--- trunk/contrib/subversion/subversion/bindings/swig/svn_client.i 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/bindings/swig/svn_client.i 2017-02-20 02:39:09 UTC (rev 9266)
@@ -385,7 +385,8 @@
/* provide Python with access to some thunks. */
%constant svn_cancel_func_t svn_swig_py_cancel_func;
%constant svn_client_get_commit_log3_t svn_swig_py_get_commit_log_func;
-%constant svn_wc_notify_func2_t svn_swig_py_notify_func;
+%constant svn_wc_notify_func_t svn_swig_py_notify_func;
+%constant svn_wc_notify_func2_t svn_swig_py_notify_func2;
#endif
@@ -395,9 +396,15 @@
svn_client_ctx_t(apr_pool_t *pool) {
svn_error_t *err;
svn_client_ctx_t *self;
- err = svn_client_create_context(&self, pool);
+ apr_hash_t *cfg_hash;
+
+ err = svn_config_get_config(&cfg_hash, NULL, pool);
if (err)
svn_swig_rb_handle_svn_error(err);
+
+ err = svn_client_create_context2(&self, cfg_hash, pool);
+ if (err)
+ svn_swig_rb_handle_svn_error(err);
return self;
};
@@ -512,7 +519,13 @@
apr_hash_t *config,
apr_pool_t *pool)
{
- ctx->config = config;
+ svn_error_t *err;
+
+ apr_hash_clear(ctx->config);
+ err = svn_config_copy_config(&ctx->config, config,
+ apr_hash_pool_get(ctx->config));
+ if (err)
+ svn_swig_rb_handle_svn_error(err);
return Qnil;
}
Modified: trunk/contrib/subversion/subversion/include/private/svn_auth_private.h
===================================================================
--- trunk/contrib/subversion/subversion/include/private/svn_auth_private.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/private/svn_auth_private.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -37,6 +37,24 @@
extern "C" {
#endif /* __cplusplus */
+/** SSL server authority verification credential type.
+ *
+ * The followin auth parameters are available to the providers:
+ *
+ * - @c SVN_AUTH_PARAM_SSL_SERVER_FAILURES (@c apr_uint32_t*)
+ * - @c SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO
+ * (@c svn_auth_ssl_server_cert_info_t*)
+ *
+ * The following optional auth parameters are relevant to the providers:
+ *
+ * - @c SVN_AUTH_PARAM_NO_AUTH_CACHE (@c void*)
+ *
+ * @since New in 1.9.
+ */
+#define SVN_AUTH_CRED_SSL_SERVER_AUTHORITY "svn.ssl.server.authority"
+
+
+
/* If you add a password type for a provider which stores
* passwords on disk in encrypted form, remember to update
* svn_auth__simple_save_creds_helper. Otherwise it will be
@@ -213,6 +231,25 @@
svn_boolean_t non_interactive,
apr_pool_t *pool);
+#if (defined(WIN32) && !defined(__MINGW32__)) || defined(DOXYGEN)
+/**
+ * Set @a *provider to an authentication provider that implements
+ * ssl authority verification via the Windows CryptoApi.
+ *
+ * This provider automatically validates authority certificates with
+ * the CryptoApi, like Internet Explorer and the Windows network API do.
+ * This allows the rollout of root certificates via Windows Domain
+ * policies, instead of Subversion specific configuration.
+ *
+ * @note This function is only available on Windows.
+ */
+void
+svn_auth__get_windows_ssl_server_authority_provider(
+ svn_auth_provider_object_t **provider,
+ apr_pool_t *pool);
+#endif
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: trunk/contrib/subversion/subversion/include/private/svn_cache.h
===================================================================
--- trunk/contrib/subversion/subversion/include/private/svn_cache.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/private/svn_cache.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -182,6 +182,10 @@
* if they are strings. Cached values will be copied in and out of
* the cache using @a serialize_func and @a deserialize_func, respectively.
*
+ * If @a deserialize_func is NULL, then the data is returned as an
+ * svn_stringbuf_t; if @a serialize_func is NULL, then the data is
+ * assumed to be an svn_stringbuf_t.
+ *
* The cache stores up to @a pages * @a items_per_page items at a
* time. The exact cache invalidation strategy is not defined here,
* but in general, a lower value for @a items_per_page means more
@@ -224,7 +228,7 @@
* other caches. @a *cache_p will be allocated in @a result_pool.
*
* If @a deserialize_func is NULL, then the data is returned as an
- * svn_string_t; if @a serialize_func is NULL, then the data is
+ * svn_stringbuf_t; if @a serialize_func is NULL, then the data is
* assumed to be an svn_stringbuf_t.
*
* These caches are always thread safe.
@@ -309,7 +313,7 @@
* this cache from other caches. @a *cache_p will be allocated in @a result_pool.
*
* If @a deserialize_func is NULL, then the data is returned as an
- * svn_string_t; if @a serialize_func is NULL, then the data is
+ * svn_stringbuf_t; if @a serialize_func is NULL, then the data is
* assumed to be an svn_stringbuf_t.
*
* If @a thread_safe is true, and APR is compiled with threads, all
Copied: trunk/contrib/subversion/subversion/include/private/svn_cert.h (from rev 9265, vendor/apache/subversion/dist/subversion/include/private/svn_cert.h)
===================================================================
--- trunk/contrib/subversion/subversion/include/private/svn_cert.h (rev 0)
+++ trunk/contrib/subversion/subversion/include/private/svn_cert.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -0,0 +1,68 @@
+/**
+ * @copyright
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file svn_cert.h
+ * @brief Implementation of certificate validation functions
+ */
+
+#ifndef SVN_CERT_H
+#define SVN_CERT_H
+
+#include <apr.h>
+
+#include "svn_types.h"
+#include "svn_string.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* Return TRUE iff @a pattern matches @a hostname as defined
+ * by the matching rules of RFC 6125. In the context of RFC
+ * 6125 the pattern is the domain name portion of the presented
+ * identifier (which comes from the Common Name or a DNSName
+ * portion of the subjectAltName of an X.509 certificate) and
+ * the hostname is the source domain (i.e. the host portion
+ * of the URI the user entered).
+ *
+ * @note With respect to wildcards we only support matching
+ * wildcards in the left-most label and as the only character
+ * in the left-most label (i.e. we support RFC 6125 § 6.4.3
+ * Rule 1 and 2 but not the optional Rule 3). This may change
+ * in the future.
+ *
+ * @note Subversion does not at current support internationalized
+ * domain names. Both values are presumed to be in NR-LDH label
+ * or A-label form (see RFC 5890 for the definition).
+ *
+ * @since New in 1.9.
+ */
+svn_boolean_t
+svn_cert__match_dns_identity(svn_string_t *pattern, svn_string_t *hostname);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_CERT_H */
Modified: trunk/contrib/subversion/subversion/include/private/svn_client_private.h
===================================================================
--- trunk/contrib/subversion/subversion/include/private/svn_client_private.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/private/svn_client_private.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -306,6 +306,11 @@
* The keys for the subtree mergeinfo are the repository root-relative
* paths of TARGET_PATH_OR_URL and/or its subtrees, regardless of whether
* TARGET_PATH_OR_URL is a URL or WC path.
+ *
+ * If RA_SESSION is not NULL, use it to obtain merge information instead of
+ * opening a new session. The session might be reparented after usage, so
+ * callers should reparent the session back to their original location if
+ * needed.
*/
svn_error_t *
svn_client__mergeinfo_log(svn_boolean_t finding_merged,
@@ -322,6 +327,7 @@
svn_depth_t depth,
const apr_array_header_t *revprops,
svn_client_ctx_t *ctx,
+ svn_ra_session_t *ra_session,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: trunk/contrib/subversion/subversion/include/private/svn_dep_compat.h
===================================================================
--- trunk/contrib/subversion/subversion/include/private/svn_dep_compat.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/private/svn_dep_compat.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -78,6 +78,7 @@
#if !APR_VERSION_AT_LEAST(1,0,0)
#define APR_UINT64_C(val) UINT64_C(val)
#define APR_FPROT_OS_DEFAULT APR_OS_DEFAULT
+#define apr_hash_make_custom(pool,hash_func) apr_hash_make(pool)
#endif
#if !APR_VERSION_AT_LEAST(1,3,0)
@@ -114,6 +115,12 @@
#define SVN_LOCK_IS_BUSY(x) APR_STATUS_IS_EBUSY(x)
#endif
+#if !APR_VERSION_AT_LEAST(1,4,0)
+#ifndef apr_time_from_msec
+#define apr_time_from_msec(msec) ((apr_time_t)(msec) * 1000)
+#endif
+#endif
+
/**
* Check at compile time if the Serf version is at least a certain
* level.
Modified: trunk/contrib/subversion/subversion/include/private/svn_diff_tree.h
===================================================================
--- trunk/contrib/subversion/subversion/include/private/svn_diff_tree.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/private/svn_diff_tree.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -20,13 +20,13 @@
* ====================================================================
* @endcopyright
*
- * @file svn_wc.h
+ * @file svn_diff_tree.h
* @brief Generic diff handler. Replacing the old svn_wc_diff_callbacks4_t
* infrastructure
*/
-#ifndef SVN_DIFF_PROCESSOR_H
-#define SVN_DIFF_PROCESSOR_H
+#ifndef SVN_DIFF_TREE_H
+#define SVN_DIFF_TREE_H
#include "svn_types.h"
@@ -353,5 +353,5 @@
}
#endif /* __cplusplus */
-#endif /* SVN_DIFF_PROCESSOR_H */
+#endif /* SVN_DIFF_TREE_H */
Modified: trunk/contrib/subversion/subversion/include/private/svn_mutex.h
===================================================================
--- trunk/contrib/subversion/subversion/include/private/svn_mutex.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/private/svn_mutex.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -21,7 +21,7 @@
* @endcopyright
*
* @file svn_mutex.h
- * @brief Strutures and functions for mutual exclusion
+ * @brief Structures and functions for mutual exclusion
*/
#ifndef SVN_MUTEX_H
@@ -72,7 +72,7 @@
* thread to release the mutex again. Recursive locking are not supported.
*
* @note You should use #SVN_MUTEX__WITH_LOCK instead of explicit lock
- * aquisition and release.
+ * acquisition and release.
*/
svn_error_t *
svn_mutex__lock(svn_mutex__t *mutex);
@@ -88,19 +88,19 @@
* reported in the return value.
*
* @note You should use #SVN_MUTEX__WITH_LOCK instead of explicit lock
- * aquisition and release.
+ * acquisition and release.
*/
svn_error_t *
svn_mutex__unlock(svn_mutex__t *mutex,
svn_error_t *err);
-/** Aquires the @a mutex, executes the expression @a expr and finally
+/** Acquires the @a mutex, executes the expression @a expr and finally
* releases the @a mutex. If any of these steps fail, the function using
* this macro will return an #svn_error_t. This macro guarantees that
* the @a mutex will always be unlocked again if it got locked successfully
* by the first step.
*
- * @note Prefer using this macro instead of explicit lock aquisition and
+ * @note Prefer using this macro instead of explicit lock acquisition and
* release.
*/
#define SVN_MUTEX__WITH_LOCK(mutex, expr) \
Modified: trunk/contrib/subversion/subversion/include/private/svn_subr_private.h
===================================================================
--- trunk/contrib/subversion/subversion/include/private/svn_subr_private.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/private/svn_subr_private.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -26,6 +26,7 @@
#include "svn_types.h"
#include "svn_io.h"
+#include "svn_version.h"
#ifdef __cplusplus
@@ -331,6 +332,18 @@
int minor,
int patch);
+/** Like svn_ver_check_list(), but with a @a comparator parameter.
+ * Private backport of svn_ver_check_list2() from trunk.
+ */
+svn_error_t *
+svn_ver__check_list2(const svn_version_t *my_version,
+ const svn_version_checklist_t *checklist,
+ svn_boolean_t (*comparator)(const svn_version_t *,
+ const svn_version_t *));
+
+/** To minimize merge churn in callers, alias the trunk name privately. */
+#define svn_ver_check_list2 svn_ver__check_list2
+
/** @} */
#ifdef __cplusplus
Modified: trunk/contrib/subversion/subversion/include/svn_auth.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_auth.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_auth.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -966,7 +966,10 @@
apr_pool_t *pool);
#endif /* DARWIN || DOXYGEN */
-#if (!defined(DARWIN) && !defined(WIN32)) || defined(DOXYGEN)
+/* Note that the gnome keyring unlock prompt related items below must be
+ * declared for all platforms in order to allow SWIG interfaces to be
+ * used regardless of the platform. */
+
/** A type of callback function for obtaining the GNOME Keyring password.
*
* In this callback, the client should ask the user for default keyring
@@ -996,7 +999,7 @@
* @c *SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC. */
#define SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON "gnome-keyring-unlock-prompt-baton"
-
+#if (!defined(DARWIN) && !defined(WIN32)) || defined(DOXYGEN)
/**
* Get libsvn_auth_gnome_keyring version information.
*
Modified: trunk/contrib/subversion/subversion/include/svn_client.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_client.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_client.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -439,9 +439,17 @@
#define SVN_CLIENT_COMMIT_ITEM_TEXT_MODS 0x04
#define SVN_CLIENT_COMMIT_ITEM_PROP_MODS 0x08
#define SVN_CLIENT_COMMIT_ITEM_IS_COPY 0x10
-/** @since New in 1.2. */
+/** One of the flags for a commit item. The node has a lock token that
+ * should be released after a successful commit and, if the node is also
+ * modified, transferred to the server as part of the commit process.
+ *
+ * @since New in 1.2. */
#define SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN 0x20
-/** @since New in 1.8. */
+/** One of the flags for a commit item. The node is the 'moved here'
+ * side of a local move. This is used to check and enforce that the
+ * other side of the move is also included in the commit.
+ *
+ * @since New in 1.8. */
#define SVN_CLIENT_COMMIT_ITEM_MOVED_HERE 0x40
/** @} */
@@ -6449,7 +6457,7 @@
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/** Similar to svn_client_open_ra_session(), but with @ wri_abspath
+/** Similar to svn_client_open_ra_session2(), but with @ wri_abspath
* always passed as NULL, and with the same pool used as both @a
* result_pool and @a scratch_pool.
*
Modified: trunk/contrib/subversion/subversion/include/svn_config.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_config.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_config.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -98,8 +98,11 @@
#define SVN_CONFIG_CATEGORY_CONFIG "config"
#define SVN_CONFIG_SECTION_AUTH "auth"
+/** @since New in 1.6. */
#define SVN_CONFIG_OPTION_PASSWORD_STORES "password-stores"
+/** @since New in 1.6. */
#define SVN_CONFIG_OPTION_KWALLET_WALLET "kwallet-wallet"
+/** @since New in 1.6. */
#define SVN_CONFIG_OPTION_KWALLET_SVN_APPLICATION_NAME_WITH_PID "kwallet-svn-application-name-with-pid"
/** @since New in 1.8. */
#define SVN_CONFIG_OPTION_SSL_CLIENT_CERT_FILE_PROMPT "ssl-client-cert-file-prompt"
@@ -123,7 +126,9 @@
#define SVN_CONFIG_OPTION_NO_UNLOCK "no-unlock"
#define SVN_CONFIG_OPTION_MIMETYPES_FILE "mime-types-file"
#define SVN_CONFIG_OPTION_PRESERVED_CF_EXTS "preserved-conflict-file-exts"
+/** @since New in 1.7. */
#define SVN_CONFIG_OPTION_INTERACTIVE_CONFLICTS "interactive-conflicts"
+/** @since New in 1.7. */
#define SVN_CONFIG_OPTION_MEMORY_CACHE_SIZE "memory-cache-size"
#define SVN_CONFIG_SECTION_TUNNELS "tunnels"
#define SVN_CONFIG_SECTION_AUTO_PROPS "auto-props"
@@ -168,10 +173,12 @@
/* We want this to be printed on two lines in the generated config file,
* but we don't want the # character to end up in the variable.
*/
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
#define SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1 \
"*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__"
#define SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2 \
"*.rej *~ #*# .#* .*.swp .DS_Store"
+#endif
#define SVN_CONFIG_DEFAULT_GLOBAL_IGNORES \
SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1 " " \
@@ -732,6 +739,12 @@
* under @a config_dir. If the callback sets its delete_cred return
* flag, delete the associated credential.
*
+ * If @a config_dir is not NULL, it must point to an alternative
+ * config directory location. If it is NULL, the default location
+ * is used.
+ *
+ * @note @a config_dir may only be NULL in 1.8.2 and later.
+ *
* @note Removing credentials from the config-based disk store will
* not purge them from any open svn_auth_baton_t instance. Consider
* using svn_auth_forget_credentials() -- from the @a cleanup_func,
Modified: trunk/contrib/subversion/subversion/include/svn_diff.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_diff.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_diff.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -911,8 +911,8 @@
/**
* Allocate @a *stringbuf in @a result_pool, and read into it one line
- * of the diff text of @a hunk. The first line returned is the hunk header.
- * Any subsequent lines are unidiff data (starting with '+', '-', or ' ').
+ * of the diff text of @a hunk. The hunk header is not returned only the
+ * unidiff data lines (starting with '+', '-', or ' ') are returned.
* If the @a hunk is being interpreted in reverse (i.e. the reverse
* parameter of svn_diff_parse_next_patch() was @c TRUE), the diff
* text will be returned in reversed form.
@@ -922,6 +922,13 @@
* hunk does not end with a newline character and @a eol is not NULL.
* Temporary allocations will be performed in @a scratch_pool.
*
+ * @note The hunk header information can be retrievied with the following
+ * functions:
+ * @see svn_diff_hunk_get_original_start()
+ * @see svn_diff_hunk_get_original_length()
+ * @see svn_diff_hunk_get_modified_start()
+ * @see svn_diff_hunk_get_modified_length()
+ *
* @since New in 1.7.
*/
svn_error_t *
Modified: trunk/contrib/subversion/subversion/include/svn_dirent_uri.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_dirent_uri.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_dirent_uri.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -646,8 +646,8 @@
/** Return the relative path part of @a child_relpath that is below
* @a parent_relpath, or just "" if @a parent_relpath is equal to
- * @a child_relpath. If @a child_relpath is not below or equal to
- * @a parent_relpath, return NULL.
+ * @a child_relpath. If @a child_relpath is not below @a parent_relpath,
+ * return NULL.
*
* @since New in 1.7.
*/
@@ -657,7 +657,7 @@
/** Return the URI-decoded relative path of @a child_uri that is below
* @a parent_uri, or just "" if @a parent_uri is equal to @a child_uri. If
- * @a child_uri is not below or equal to @a parent_uri, return NULL.
+ * @a child_uri is not below @a parent_uri, return NULL.
*
* Allocate the result in @a result_pool.
*
Modified: trunk/contrib/subversion/subversion/include/svn_io.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_io.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_io.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -182,10 +182,11 @@
* may be @c NULL. If @a file is @c NULL, the file will be created but not
* open.
*
- * If @a delete_when is #svn_io_file_del_on_close, then the @c APR_DELONCLOSE
- * flag will be used when opening the file. The @c APR_BUFFERED flag will
- * always be used.
+ * The file will be deleted according to @a delete_when. If that is
+ * #svn_io_file_del_on_pool_cleanup, it refers to @a result_pool.
*
+ * The @c APR_BUFFERED flag will always be used when opening the file.
+ *
* The first attempt will just append @a suffix. If the result is not
* a unique name, then subsequent attempts will append a dot,
* followed by an iteration number ("2", then "3", and so on),
@@ -248,8 +249,9 @@
* be possible to atomically rename the resulting file due to cross-device
* issues.)
*
- * The file will be deleted according to @a delete_when. If @a delete_when
- * is @c svn_io_file_del_on_close and @a file is @c NULL, the file will be
+ * The file will be deleted according to @a delete_when. If that is
+ * #svn_io_file_del_on_pool_cleanup, it refers to @a result_pool. If it
+ * is #svn_io_file_del_on_close and @a file is @c NULL, the file will be
* deleted before this function returns.
*
* When passing @c svn_io_file_del_none please don't forget to eventually
@@ -917,7 +919,7 @@
/** Return a stream allocated in @a pool which forwards all requests
* to @a stream. Destruction is explicitly excluded from forwarding.
*
- * @see notes/destruction-of-stacked-resources
+ * @see http://subversion.apache.org/docs/community-guide/conventions.html#destruction-of-stacked-resources
*
* @since New in 1.4.
*/
@@ -972,7 +974,8 @@
* be possible to atomically rename the resulting file due to cross-device
* issues.)
*
- * The file will be deleted according to @a delete_when.
+ * The file will be deleted according to @a delete_when. If that is
+ * #svn_io_file_del_on_pool_cleanup, it refers to @a result_pool.
*
* Temporary allocations will be performed in @a scratch_pool.
*
@@ -1589,8 +1592,8 @@
apr_pool_t *scratch_pool);
-/** Similar to svn_io_stat_dirent2, but always passes FALSE for
- * verify_truename.
+/** Similar to svn_io_stat_dirent2(), but always passes FALSE for
+ * @a verify_truename.
*
* @since New in 1.7.
* @deprecated Provided for backwards compatibility with the 1.7 API.
@@ -1681,7 +1684,7 @@
*
* @note An APR bug affects Windows: passing a NULL @a env does not
* guarantee the invoked program to run with an empty environment when
- * @a inherits is FALSE, the program may inherit its parent's environment.
+ * @a inherit is FALSE, the program may inherit its parent's environment.
* Explicitly pass an empty @a env to get an empty environment.
*
* @since New in 1.8.
Modified: trunk/contrib/subversion/subversion/include/svn_repos.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_repos.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_repos.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -298,8 +298,7 @@
* the revision which just completed. */
svn_revnum_t revision;
- /** For #svn_repos_notify_warning, the warning object. Must be cleared
- by the consumer of the notification. */
+ /** For #svn_repos_notify_warning, the warning object. */
const char *warning_str;
svn_repos_notify_warning_t warning;
Modified: trunk/contrib/subversion/subversion/include/svn_types.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_types.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_types.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -219,6 +219,16 @@
|| ((s) == APR_OS_START_SYSERR + ERROR_INVALID_NAME))
#endif
+/** On Windows, APR_STATUS_IS_EPIPE does not include ERROR_NO_DATA error.
+ * So we include it.*/
+/* ### These fixes should go into APR. */
+#ifndef WIN32
+#define SVN__APR_STATUS_IS_EPIPE(s) APR_STATUS_IS_EPIPE(s)
+#else
+#define SVN__APR_STATUS_IS_EPIPE(s) (APR_STATUS_IS_EPIPE(s) \
+ || ((s) == APR_OS_START_SYSERR + ERROR_NO_DATA))
+#endif
+
/** @} */
Modified: trunk/contrib/subversion/subversion/include/svn_version.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_version.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_version.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -72,7 +72,7 @@
*
* @since New in 1.1.
*/
-#define SVN_VER_PATCH 1
+#define SVN_VER_PATCH 10
/** @deprecated Provided for backward compatibility with the 1.0 API. */
@@ -95,7 +95,7 @@
*
* Always change this at the same time as SVN_VER_NUMTAG.
*/
-#define SVN_VER_TAG " (r1503906)"
+#define SVN_VER_TAG " (r1615264)"
/** Number tag: a string describing the version.
@@ -121,7 +121,7 @@
* When rolling a tarball, we automatically replace it with what we
* guess to be the correct revision number.
*/
-#define SVN_VER_REVISION 1503906
+#define SVN_VER_REVISION 1615264
/* Version strings composed from the above definitions. */
Modified: trunk/contrib/subversion/subversion/include/svn_wc.h
===================================================================
--- trunk/contrib/subversion/subversion/include/svn_wc.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/include/svn_wc.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2109,9 +2109,8 @@
* Allocate an #svn_wc_conflict_result_t structure in @a pool,
* initialize and return it.
*
- * Set the @c choice field of the structure to @a choice, and @c
- * merged_file to @a merged_file. Set all other fields to their @c
- * _unknown, @c NULL or invalid value, respectively. Make only a shallow
+ * Set the @c choice field of the structure to @a choice, @c merged_file
+ * to @a merged_file, and @c save_merged to false. Make only a shallow
* copy of the pointer argument @a merged_file.
*
* @since New in 1.5.
@@ -4078,6 +4077,9 @@
* @a ignore_patterns is an array of file patterns matching
* unversioned files to ignore for the purposes of status reporting,
* or @c NULL if the default set of ignorable file patterns should be used.
+ * Patterns from #SVN_PROP_IGNORE (and, as of 1.8,
+ * #SVN_PROP_INHERITABLE_IGNORES) properties are always used, even if not
+ * specified in @a ignore_patterns.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton while walking
* to determine if the client has canceled the operation.
Modified: trunk/contrib/subversion/subversion/libsvn_client/commit.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/commit.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/commit.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -999,10 +999,23 @@
}
cleanup:
- /* Sleep to ensure timestamp integrity. */
+ /* Sleep to ensure timestamp integrity. BASE_ABSPATH may have been
+ removed by the commit or it may the common ancestor of multiple
+ working copies. */
if (timestamp_sleep)
- svn_io_sleep_for_timestamps(base_abspath, pool);
+ {
+ const char *wcroot_abspath;
+ svn_error_t *err = svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx,
+ base_abspath, pool, pool);
+ if (err)
+ {
+ svn_error_clear(err);
+ wcroot_abspath = NULL;
+ }
+ svn_io_sleep_for_timestamps(wcroot_abspath, pool);
+ }
+
/* Abort the commit if it is still in progress. */
svn_pool_clear(iterpool); /* Close open handles before aborting */
if (commit_in_progress)
Modified: trunk/contrib/subversion/subversion/libsvn_client/commit_util.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/commit_util.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/commit_util.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -892,7 +892,7 @@
if (matches_changelists
&& (is_harvest_root || baton->changelists)
&& state_flags
- && is_added
+ && (is_added || (is_deleted && is_op_root && status->copied))
&& baton->danglers)
{
/* If a node is added, its parent must exist in the repository at the
@@ -966,17 +966,19 @@
void *cancel_baton;
svn_client__check_url_kind_t check_url_func;
void *check_url_baton;
+ svn_client__committables_t *committables;
};
/* Helper for the commit harvesters */
static svn_error_t *
handle_descendants(void *baton,
- const void *key, apr_ssize_t klen, void *val,
- apr_pool_t *pool)
+ const void *key, apr_ssize_t klen, void *val,
+ apr_pool_t *pool)
{
struct handle_descendants_baton *hdb = baton;
apr_array_header_t *commit_items = val;
apr_pool_t *iterpool = svn_pool_create(pool);
+ const char *repos_root_url = key;
int i;
for (i = 0; i < commit_items->nelts; i++)
@@ -1002,32 +1004,64 @@
for (j = 0; j < absent_descendants->nelts; j++)
{
- int k;
- svn_boolean_t found_item = FALSE;
svn_node_kind_t kind;
+ svn_client_commit_item3_t *desc_item;
const char *relpath = APR_ARRAY_IDX(absent_descendants, j,
const char *);
const char *local_abspath = svn_dirent_join(item->path, relpath,
iterpool);
- /* If the path has a commit operation, we do nothing.
- (It will be deleted by the operation) */
- for (k = 0; k < commit_items->nelts; k++)
+ /* ### Need a sub-iterpool? */
+
+
+ /* We found a 'not present' descendant during a copy (at op_depth>0),
+ this is most commonly caused by copying some mixed revision tree.
+
+ In this case not present can imply that the node does not exist
+ in the parent revision, or that the node does. But we want to copy
+ the working copy state in which it does not exist, but might be
+ replaced. */
+
+ desc_item = svn_hash_gets(hdb->committables->by_path, local_abspath);
+
+ /* If the path has a commit operation (possibly at an higher
+ op_depth, we might want to turn an add in a replace. */
+ if (desc_item)
{
- svn_client_commit_item3_t *cmt_item =
- APR_ARRAY_IDX(commit_items, k, svn_client_commit_item3_t *);
+ const char *dir;
+ svn_boolean_t found_intermediate = FALSE;
- if (! strcmp(cmt_item->path, local_abspath))
+ if (desc_item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
+ continue; /* We already have a delete or replace */
+ else if (!(desc_item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD))
+ continue; /* Not a copy/add, just a modification */
+
+ dir = svn_dirent_dirname(local_abspath, iterpool);
+
+ while (strcmp(dir, item->path))
{
- found_item = TRUE;
- break;
+ svn_client_commit_item3_t *i_item;
+
+ i_item = svn_hash_gets(hdb->committables->by_path, dir);
+
+ if (i_item)
+ {
+ if ((i_item->state_flags & SVN_CLIENT_COMMIT_ITEM_DELETE)
+ || (i_item->state_flags & SVN_CLIENT_COMMIT_ITEM_ADD))
+ {
+ found_intermediate = TRUE;
+ break;
+ }
+ }
+ dir = svn_dirent_dirname(dir, iterpool);
}
- }
- if (found_item)
- continue; /* We have an explicit delete or replace for this path */
+ if (found_intermediate)
+ continue; /* Some intermediate ancestor is an add or delete */
- /* ### Need a sub-iterpool? */
+ /* Fall through to detect if we need to turn the add in a
+ replace. */
+ }
if (hdb->check_url_func)
{
@@ -1045,25 +1079,35 @@
else
kind = svn_node_unknown; /* 'Ok' for a delete of something */
- {
- /* Add a new commit item that describes the delete */
- apr_pool_t *result_pool = commit_items->pool;
- svn_client_commit_item3_t *new_item
- = svn_client_commit_item3_create(result_pool);
+ if (desc_item)
+ {
+ /* Extend the existing add/copy item to create a replace */
+ desc_item->state_flags |= SVN_CLIENT_COMMIT_ITEM_DELETE;
+ continue;
+ }
- new_item->path = svn_dirent_join(item->path, relpath,
- result_pool);
- new_item->kind = kind;
- new_item->url = svn_path_url_add_component2(item->url, relpath,
- result_pool);
- new_item->revision = SVN_INVALID_REVNUM;
- new_item->state_flags = SVN_CLIENT_COMMIT_ITEM_DELETE;
- new_item->incoming_prop_changes = apr_array_make(result_pool, 1,
- sizeof(svn_prop_t *));
+ /* Add a new commit item that describes the delete */
- APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *)
- = new_item;
- }
+ SVN_ERR(add_committable(hdb->committables,
+ svn_dirent_join(item->path, relpath,
+ iterpool),
+ kind,
+ repos_root_url,
+ svn_uri_skip_ancestor(
+ repos_root_url,
+ svn_path_url_add_component2(item->url,
+ relpath,
+ iterpool),
+ iterpool),
+ SVN_INVALID_REVNUM,
+ NULL /* copyfrom_relpath */,
+ SVN_INVALID_REVNUM,
+ NULL /* moved_from_abspath */,
+ SVN_CLIENT_COMMIT_ITEM_DELETE,
+ NULL /* lock tokens */,
+ NULL /* lock */,
+ commit_items->pool,
+ iterpool));
}
}
@@ -1181,6 +1225,7 @@
hdb.cancel_baton = ctx->cancel_baton;
hdb.check_url_func = check_url_func;
hdb.check_url_baton = check_url_baton;
+ hdb.committables = *committables;
SVN_ERR(svn_iter_apr_hash(NULL, (*committables)->by_repository,
handle_descendants, &hdb, iterpool));
@@ -1274,6 +1319,7 @@
hdb.cancel_baton = btn->ctx->cancel_baton;
hdb.check_url_func = btn->check_url_func;
hdb.check_url_baton = btn->check_url_baton;
+ hdb.committables = btn->committables;
SVN_ERR(svn_iter_apr_hash(NULL, btn->committables->by_repository,
handle_descendants, &hdb, pool));
Modified: trunk/contrib/subversion/subversion/libsvn_client/copy.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/copy.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/copy.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -314,6 +314,8 @@
{
const char *src_parent_abspath;
svn_boolean_t lock_src, lock_dst;
+ const char *src_wcroot_abspath;
+ const char *dst_wcroot_abspath;
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
@@ -326,6 +328,13 @@
src_parent_abspath = svn_dirent_dirname(pair->src_abspath_or_url,
iterpool);
+ SVN_ERR(svn_wc__get_wcroot(&src_wcroot_abspath,
+ ctx->wc_ctx, src_parent_abspath,
+ iterpool, iterpool));
+ SVN_ERR(svn_wc__get_wcroot(&dst_wcroot_abspath,
+ ctx->wc_ctx, pair->dst_parent_abspath,
+ iterpool, iterpool));
+
/* We now need to lock the right combination of batons.
Four cases:
1) src_parent == dst_parent
@@ -334,15 +343,18 @@
4) src_parent and dst_parent are disjoint
We can handle 1) as either 2) or 3) */
if (strcmp(src_parent_abspath, pair->dst_parent_abspath) == 0
- || svn_dirent_is_child(src_parent_abspath, pair->dst_parent_abspath,
- iterpool))
+ || (svn_dirent_is_child(src_parent_abspath, pair->dst_parent_abspath,
+ NULL)
+ && !svn_dirent_is_child(src_parent_abspath, dst_wcroot_abspath,
+ NULL)))
{
lock_src = TRUE;
lock_dst = FALSE;
}
else if (svn_dirent_is_child(pair->dst_parent_abspath,
- src_parent_abspath,
- iterpool))
+ src_parent_abspath, NULL)
+ && !svn_dirent_is_child(pair->dst_parent_abspath,
+ src_wcroot_abspath, NULL))
{
lock_src = FALSE;
lock_dst = TRUE;
Modified: trunk/contrib/subversion/subversion/libsvn_client/delete.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/delete.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/delete.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -193,7 +193,7 @@
static svn_error_t *
single_repos_delete(svn_ra_session_t *ra_session,
- const char *repos_root,
+ const char *base_uri,
const apr_array_header_t *relpaths,
const apr_hash_t *revprop_table,
svn_commit_callback2_t commit_callback,
@@ -221,7 +221,7 @@
const char *relpath = APR_ARRAY_IDX(relpaths, i, const char *);
item = svn_client_commit_item3_create(pool);
- item->url = svn_path_url_add_component2(repos_root, relpath, pool);
+ item->url = svn_path_url_add_component2(base_uri, relpath, pool);
item->state_flags = SVN_CLIENT_COMMIT_ITEM_DELETE;
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
}
@@ -361,7 +361,6 @@
iterpool = svn_pool_create(pool);
for (hi = apr_hash_first(pool, deletables); hi; hi = apr_hash_next(hi))
{
- const char *repos_root = svn__apr_hash_index_key(hi);
struct repos_deletables_t *repos_deletables = svn__apr_hash_index_val(hi);
const char *base_uri;
apr_array_header_t *target_relpaths;
@@ -398,7 +397,7 @@
}
SVN_ERR(svn_ra_reparent(repos_deletables->ra_session, base_uri, pool));
- SVN_ERR(single_repos_delete(repos_deletables->ra_session, repos_root,
+ SVN_ERR(single_repos_delete(repos_deletables->ra_session, base_uri,
target_relpaths,
revprop_table, commit_callback,
commit_baton, ctx, iterpool));
Modified: trunk/contrib/subversion/subversion/libsvn_client/export.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/export.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/export.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -267,7 +267,9 @@
scratch_pool));
}
- if (status->file_external)
+ /* Skip file externals if they are a descendant of the export,
+ BUT NOT if we are explictly exporting the file external. */
+ if (status->file_external && strcmp(eib->origin_abspath, local_abspath) != 0)
return SVN_NO_ERROR;
/* Produce overwrite errors for the export root */
@@ -1587,3 +1589,4 @@
return SVN_NO_ERROR;
}
+
Modified: trunk/contrib/subversion/subversion/libsvn_client/externals.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/externals.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/externals.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -737,7 +737,7 @@
switch (ext_kind)
{
case svn_node_dir:
- SVN_ERR(switch_dir_external(local_abspath, new_url,
+ SVN_ERR(switch_dir_external(local_abspath, new_loc->url,
&(new_item->peg_revision),
&(new_item->revision),
parent_dir_abspath,
@@ -1017,19 +1017,30 @@
parent_abspath = svn_dirent_dirname(parent_abspath, iterpool);
SVN_ERR(svn_wc_read_kind2(&kind, ctx->wc_ctx, parent_abspath,
- TRUE, FALSE, iterpool));
+ FALSE /* show_deleted*/,
+ FALSE /* show_hidden */,
+ iterpool));
if (kind == svn_node_none)
{
svn_error_t *err;
err = svn_io_dir_remove_nonrecursive(parent_abspath, iterpool);
- if (err && APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+ if (err)
{
- svn_error_clear(err);
- break;
+ if (APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+ {
+ svn_error_clear(err);
+ break; /* No parents to delete */
+ }
+ else if (APR_STATUS_IS_ENOENT(err->apr_err)
+ || APR_STATUS_IS_ENOTDIR(err->apr_err))
+ {
+ svn_error_clear(err);
+ /* Fall through; parent dir might be unversioned */
+ }
+ else
+ return svn_error_trace(err);
}
- else
- SVN_ERR(err);
}
} while (strcmp(parent_abspath, defining_abspath) != 0);
}
Modified: trunk/contrib/subversion/subversion/libsvn_client/log.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/log.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/log.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -861,10 +861,11 @@
actual_loc->url, pool));
/* Save us an RA layer round trip if we are on the repository root and
- know the result in advance. All the revision data has already been
- validated.
+ know the result in advance, or if we don't need multiple ranges.
+ All the revision data has already been validated.
*/
- if (strcmp(actual_loc->url, actual_loc->repos_root_url) == 0)
+ if (strcmp(actual_loc->url, actual_loc->repos_root_url) == 0
+ || opt_rev_ranges->nelts <= 1)
{
svn_location_segment_t *segment = apr_pcalloc(pool, sizeof(*segment));
log_segments = apr_array_make(pool, 1, sizeof(segment));
@@ -871,7 +872,8 @@
segment->range_start = oldest_rev;
segment->range_end = actual_loc->rev;
- segment->path = "";
+ segment->path = svn_uri_skip_ancestor(actual_loc->repos_root_url,
+ actual_loc->url, pool);
APR_ARRAY_PUSH(log_segments, svn_location_segment_t *) = segment;
}
else
Modified: trunk/contrib/subversion/subversion/libsvn_client/merge.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/merge.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/merge.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -322,6 +322,10 @@
const char *diff3_cmd;
const apr_array_header_t *merge_options;
+ /* Array of file extension patterns to preserve as extensions in
+ generated conflict files. */
+ const apr_array_header_t *ext_patterns;
+
/* RA sessions used throughout a merge operation. Opened/re-parented
as needed.
@@ -2023,18 +2027,37 @@
{
svn_boolean_t has_local_mods;
enum svn_wc_merge_outcome_t content_outcome;
+ const char *target_label;
+ const char *left_label;
+ const char *right_label;
+ const char *path_ext = "";
+ if (merge_b->ext_patterns && merge_b->ext_patterns->nelts)
+ {
+ svn_path_splitext(NULL, &path_ext, local_abspath, scratch_pool);
+ if (! (*path_ext
+ && svn_cstring_match_glob_list(path_ext,
+ merge_b->ext_patterns)))
+ {
+ path_ext = "";
+ }
+ }
+
/* xgettext: the '.working', '.merge-left.r%ld' and
'.merge-right.r%ld' strings are used to tag onto a file
name in case of a merge conflict */
- const char *target_label = _(".working");
- const char *left_label = apr_psprintf(scratch_pool,
- _(".merge-left.r%ld"),
- left_source->revision);
- const char *right_label = apr_psprintf(scratch_pool,
- _(".merge-right.r%ld"),
- right_source->revision);
+ target_label = apr_psprintf(scratch_pool, _(".working%s%s"),
+ *path_ext ? "." : "", path_ext);
+ left_label = apr_psprintf(scratch_pool,
+ _(".merge-left.r%ld%s%s"),
+ left_source->revision,
+ *path_ext ? "." : "", path_ext);
+ right_label = apr_psprintf(scratch_pool,
+ _(".merge-right.r%ld%s%s"),
+ right_source->revision,
+ *path_ext ? "." : "", path_ext);
+
SVN_ERR(svn_wc_text_modified_p2(&has_local_mods, ctx->wc_ctx,
local_abspath, FALSE, scratch_pool));
@@ -3062,7 +3085,6 @@
struct merge_dir_baton_t *db = dir_baton;
const char *local_abspath = svn_dirent_join(merge_b->target->abspath,
relpath, scratch_pool);
- struct dir_delete_baton_t *delb;
svn_boolean_t same;
apr_hash_t *working_props;
@@ -3093,66 +3115,69 @@
scratch_pool, scratch_pool));
if (merge_b->force_delete)
- same = TRUE;
+ {
+ /* In this legacy mode we just assume that a directory delete
+ matches any directory. db->delete_state is NULL */
+ same = TRUE;
+ }
else
{
+ struct dir_delete_baton_t *delb;
+
/* Compare the properties */
SVN_ERR(properties_same_p(&same, left_props, working_props,
scratch_pool));
- }
+ delb = db->delete_state;
+ assert(delb != NULL);
- delb = db->delete_state;
- assert(delb != NULL);
+ if (! same)
+ {
+ delb->found_edit = TRUE;
+ }
+ else
+ {
+ store_path(delb->compared_abspaths, local_abspath);
+ }
- if (! same)
- {
- delb->found_edit = TRUE;
- }
- else
- {
- store_path(delb->compared_abspaths, local_abspath);
- }
+ if (delb->del_root != db)
+ return SVN_NO_ERROR;
- if (delb->del_root != db)
- return SVN_NO_ERROR;
+ if (delb->found_edit)
+ same = FALSE;
+ else
+ {
+ apr_array_header_t *ignores;
+ svn_error_t *err;
+ same = TRUE;
- if (delb->found_edit)
- same = FALSE;
- else if (merge_b->force_delete)
- same = TRUE;
- else
- {
- apr_array_header_t *ignores;
- svn_error_t *err;
- same = TRUE;
+ SVN_ERR(svn_wc_get_default_ignores(&ignores, merge_b->ctx->config,
+ scratch_pool));
- SVN_ERR(svn_wc_get_default_ignores(&ignores, merge_b->ctx->config,
- scratch_pool));
+ /* None of the descendants was modified, but maybe there are
+ descendants we haven't walked?
- /* None of the descendants was modified, but maybe there are
- descendants we haven't walked?
+ Note that we aren't interested in changes, as we already verified
+ changes in the paths touched by the merge. And the existence of
+ other paths is enough to mark the directory edited */
+ err = svn_wc_walk_status(merge_b->ctx->wc_ctx, local_abspath,
+ svn_depth_infinity, TRUE /* get-all */,
+ FALSE /* no-ignore */,
+ TRUE /* ignore-text-mods */, ignores,
+ verify_touched_by_del_check, delb,
+ merge_b->ctx->cancel_func,
+ merge_b->ctx->cancel_baton,
+ scratch_pool);
- Note that we aren't interested in changes, as we already verified
- changes in the paths touched by the merge. And the existance of
- other paths is enough to mark the directory edited */
- err = svn_wc_walk_status(merge_b->ctx->wc_ctx, local_abspath,
- svn_depth_infinity, TRUE /* get-all */,
- FALSE /* no-ignore */,
- TRUE /* ignore-text-mods */, ignores,
- verify_touched_by_del_check, delb,
- merge_b->ctx->cancel_func,
- merge_b->ctx->cancel_baton,
- scratch_pool);
+ if (err)
+ {
+ if (err->apr_err != SVN_ERR_CEASE_INVOCATION)
+ return svn_error_trace(err);
- if (err)
- {
- if (err->apr_err != SVN_ERR_CEASE_INVOCATION)
- return svn_error_trace(err);
+ svn_error_clear(err);
+ }
- svn_error_clear(err);
+ same = ! delb->found_edit;
}
-
- same = ! delb->found_edit;
}
if (same && !merge_b->dry_run)
@@ -9668,6 +9693,7 @@
merge_cmd_baton_t merge_cmd_baton = { 0 };
svn_config_t *cfg;
const char *diff3_cmd;
+ const char *preserved_exts_str;
int i;
svn_boolean_t checked_mergeinfo_capability = FALSE;
svn_ra_session_t *ra_session1 = NULL, *ra_session2 = NULL;
@@ -9728,6 +9754,11 @@
if (diff3_cmd != NULL)
SVN_ERR(svn_path_cstring_to_utf8(&diff3_cmd, diff3_cmd, scratch_pool));
+ /* See which files the user wants to preserve the extension of when
+ conflict files are made. */
+ svn_config_get(cfg, &preserved_exts_str, SVN_CONFIG_SECTION_MISCELLANY,
+ SVN_CONFIG_OPTION_PRESERVED_CF_EXTS, "");
+
/* Build the merge context baton (or at least the parts of it that
don't need to be reset for each merge source). */
merge_cmd_baton.force_delete = force_delete;
@@ -9743,6 +9774,11 @@
merge_cmd_baton.pool = iterpool;
merge_cmd_baton.merge_options = merge_options;
merge_cmd_baton.diff3_cmd = diff3_cmd;
+ merge_cmd_baton.ext_patterns = *preserved_exts_str
+ ? svn_cstring_split(preserved_exts_str, "\n\r\t\v ",
+ FALSE, scratch_pool)
+ : NULL;
+
merge_cmd_baton.use_sleep = use_sleep;
/* Do we already know the specific subtrees with mergeinfo we want
@@ -10447,15 +10483,10 @@
}
else
{
- merge_source_t source;
-
- source.loc1 = source1_loc;
- source.loc2 = source2_loc;
- source.ancestral = FALSE;
-
/* Build a single-item merge_source_t array. */
merge_sources = apr_array_make(scratch_pool, 1, sizeof(merge_source_t *));
- APR_ARRAY_PUSH(merge_sources, merge_source_t *) = &source;
+ APR_ARRAY_PUSH(merge_sources, merge_source_t *)
+ = merge_source_create(source1_loc, source2_loc, FALSE, scratch_pool);
}
err = do_merge(NULL, NULL, conflict_report, &use_sleep,
@@ -10716,7 +10747,7 @@
suffix = svn_relpath_skip_ancestor(subtree_missing_this_rev,
source_rel_path);
- if (suffix)
+ if (suffix && suffix[0] != '\0')
{
missing_path = apr_pstrmemdup(pool, path,
strlen(path) - strlen(suffix) - 1);
@@ -10761,7 +10792,7 @@
UNMERGED_CATALOG represents the history (as mergeinfo) from
TARGET_LOC that is not represented in SOURCE_LOC's
explicit/inherited mergeinfo as represented by MERGED_CATALOG.
- MERGEINFO_CATALOG may be empty if the source has no explicit or inherited
+ MERGED_CATALOG may be empty if the source has no explicit or inherited
mergeinfo.
Check that all of the unmerged revisions in UNMERGED_CATALOG's
@@ -11464,7 +11495,7 @@
prefix. */
svn_mergeinfo_catalog_t final_unmerged_catalog = apr_hash_make(scratch_pool);
- SVN_ERR(find_unsynced_ranges(source_loc, yc_ancestor,
+ SVN_ERR(find_unsynced_ranges(source_loc, &target->loc,
unmerged_to_source_mergeinfo_catalog,
merged_to_source_mergeinfo_catalog,
final_unmerged_catalog,
@@ -12051,12 +12082,16 @@
svn_log_entry_receiver_t receiver,
svn_revnum_t *revision,
svn_client_ctx_t *ctx,
+ svn_ra_session_t *ra_session,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
apr_array_header_t *revprops;
svn_error_t *err;
+ const char *session_url;
+ SVN_ERR(svn_ra_get_session_url(ra_session, &session_url, scratch_pool));
+
revprops = apr_array_make(scratch_pool, 0, sizeof(const char *));
err = svn_client__mergeinfo_log(finding_merged,
target_path_or_url,
@@ -12068,9 +12103,13 @@
source_end_revision,
receiver, revision,
TRUE, svn_depth_infinity,
- revprops, ctx, result_pool,
- scratch_pool);
+ revprops, ctx, ra_session,
+ result_pool, scratch_pool);
+ err = svn_error_compose_create(
+ err,
+ svn_ra_reparent(ra_session, session_url, scratch_pool));
+
if (err)
{
/* We expect RECEIVER to short-circuit the (potentially expensive) log
@@ -12133,6 +12172,7 @@
const branch_history_t *source_branch,
svn_client__pathrev_t *target,
svn_client_ctx_t *ctx,
+ svn_ra_session_t *ra_session,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -12160,7 +12200,8 @@
&source_end_rev, &source_start_rev,
operative_rev_receiver,
&youngest_merged_rev,
- ctx, result_pool, scratch_pool));
+ ctx, ra_session,
+ result_pool, scratch_pool));
if (!SVN_IS_VALID_REVNUM(youngest_merged_rev))
{
@@ -12195,7 +12236,8 @@
&source_start_rev, &source_end_rev,
operative_rev_receiver,
&oldest_eligible_rev,
- ctx, scratch_pool, scratch_pool));
+ ctx, ra_session,
+ scratch_pool, scratch_pool));
/* If there are revisions eligible for merging, use the oldest one
to calculate the base. Otherwise there are no operative revisions
@@ -12249,7 +12291,9 @@
s_t->yca,
&s_t->source_branch,
s_t->target_branch.tip,
- ctx, result_pool, scratch_pool));
+ ctx,
+ s_t->source_ra_session,
+ result_pool, scratch_pool));
return SVN_NO_ERROR;
}
@@ -12282,7 +12326,9 @@
s_t->yca,
&s_t->target_branch,
s_t->source,
- ctx, result_pool, scratch_pool));
+ ctx,
+ s_t->target_ra_session,
+ result_pool, scratch_pool));
return SVN_NO_ERROR;
}
Modified: trunk/contrib/subversion/subversion/libsvn_client/mergeinfo.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/mergeinfo.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/mergeinfo.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1021,6 +1021,11 @@
Set *REPOS_ROOT to the root URL of the repository associated with
PATH_OR_URL.
+ If RA_SESSION is NOT NULL and PATH_OR_URL refers to a URL, RA_SESSION
+ (which must be of the repository containing PATH_OR_URL) will be used
+ instead of a temporary RA session. Caller is responsible for reparenting
+ the session if it wants to use it after the call.
+
Allocate *MERGEINFO_CATALOG and all its contents in RESULT_POOL. Use
SCRATCH_POOL for all temporary allocations.
@@ -1034,17 +1039,30 @@
svn_boolean_t include_descendants,
svn_boolean_t ignore_invalid_mergeinfo,
svn_client_ctx_t *ctx,
+ svn_ra_session_t *ra_session,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_ra_session_t *ra_session;
const char *local_abspath;
svn_boolean_t use_url = svn_path_is_url(path_or_url);
svn_client__pathrev_t *peg_loc;
- SVN_ERR(svn_client__ra_session_from_path2(&ra_session, &peg_loc,
- path_or_url, NULL, peg_revision,
- peg_revision, ctx, scratch_pool));
+ if (ra_session && svn_path_is_url(path_or_url))
+ {
+ SVN_ERR(svn_ra_reparent(ra_session, path_or_url, scratch_pool));
+ SVN_ERR(svn_client__resolve_rev_and_url(&peg_loc, ra_session,
+ path_or_url,
+ peg_revision,
+ peg_revision,
+ ctx, scratch_pool));
+ }
+ else
+ {
+ SVN_ERR(svn_client__ra_session_from_path2(&ra_session, &peg_loc,
+ path_or_url, NULL,
+ peg_revision,
+ peg_revision, ctx, scratch_pool));
+ }
/* If PATH_OR_URL is as working copy path determine if we will need to
contact the repository for the requested PEG_REVISION. */
@@ -1064,10 +1082,6 @@
}
}
- /* Check server Merge Tracking capability. */
- SVN_ERR(svn_ra__assert_mergeinfo_capable_server(ra_session, path_or_url,
- scratch_pool));
-
SVN_ERR(svn_ra_get_repos_root2(ra_session, repos_root, result_pool));
if (use_url)
@@ -1391,17 +1405,21 @@
obviously back. If it was added or replaced it's still around
possibly it was replaced one or more times, but it's back now.
Regardless, LOG_ENTRY->REVISION is *not* an eligible revision! */
- if (ancestor_is_self /* Explicit mergeinfo on TARGET_PATH_AFFECTED */
+ if (nearest_ancestor_mergeinfo &&
+ ancestor_is_self /* Explicit mergeinfo on TARGET_PATH_AFFECTED */
&& (change->action != 'M'))
{
svn_rangelist_t *rangelist =
svn_hash_gets(nearest_ancestor_mergeinfo, path);
- svn_merge_range_t *youngest_range = APR_ARRAY_IDX(
- rangelist, rangelist->nelts - 1, svn_merge_range_t *);
+ if (rangelist)
+ {
+ svn_merge_range_t *youngest_range = APR_ARRAY_IDX(
+ rangelist, rangelist->nelts - 1, svn_merge_range_t *);
- if (youngest_range
- && (youngest_range->end > log_entry->revision))
- continue;
+ if (youngest_range
+ && (youngest_range->end > log_entry->revision))
+ continue;
+ }
}
if (nearest_ancestor_mergeinfo)
@@ -1496,33 +1514,22 @@
svn_log_entry_receiver_t log_receiver,
void *log_receiver_baton,
svn_client_ctx_t *ctx,
+ svn_ra_session_t *ra_session,
apr_pool_t *scratch_pool)
{
- apr_array_header_t *target;
svn_merge_range_t *oldest_range, *youngest_range;
- apr_array_header_t *revision_ranges;
- svn_opt_revision_t oldest_rev, youngest_rev;
+ svn_revnum_t oldest_rev, youngest_rev;
struct filter_log_entry_baton_t fleb;
if (! rangelist->nelts)
return SVN_NO_ERROR;
- /* Sort the rangelist. */
- qsort(rangelist->elts, rangelist->nelts,
- rangelist->elt_size, svn_sort_compare_ranges);
-
- /* Build a single-member log target list using SOURCE_URL. */
- target = apr_array_make(scratch_pool, 1, sizeof(const char *));
- APR_ARRAY_PUSH(target, const char *) = source_url;
-
/* Calculate and construct the bounds of our log request. */
youngest_range = APR_ARRAY_IDX(rangelist, rangelist->nelts - 1,
svn_merge_range_t *);
- youngest_rev.kind = svn_opt_revision_number;
- youngest_rev.value.number = youngest_range->end;
+ youngest_rev = youngest_range->end;
oldest_range = APR_ARRAY_IDX(rangelist, 0, svn_merge_range_t *);
- oldest_rev.kind = svn_opt_revision_number;
- oldest_rev.value.number = oldest_range->start;
+ oldest_rev = oldest_range->start;
if (! target_mergeinfo_catalog)
target_mergeinfo_catalog = apr_hash_make(scratch_pool);
@@ -1547,20 +1554,30 @@
fleb.log_receiver_baton = log_receiver_baton;
fleb.ctx = ctx;
- /* Drive the log. */
- revision_ranges = apr_array_make(scratch_pool, 1,
- sizeof(svn_opt_revision_range_t *));
- if (oldest_revs_first)
- APR_ARRAY_PUSH(revision_ranges, svn_opt_revision_range_t *)
- = svn_opt__revision_range_create(&oldest_rev, &youngest_rev, scratch_pool);
+ if (!ra_session)
+ SVN_ERR(svn_client__open_ra_session_internal(&ra_session, NULL, source_url,
+ NULL, NULL, FALSE, FALSE, ctx,
+ scratch_pool, scratch_pool));
else
- APR_ARRAY_PUSH(revision_ranges, svn_opt_revision_range_t *)
- = svn_opt__revision_range_create(&youngest_rev, &oldest_rev, scratch_pool);
- SVN_ERR(svn_client_log5(target, &youngest_rev, revision_ranges,
- 0, discover_changed_paths, FALSE, FALSE, revprops,
- filter_log_entry_with_rangelist, &fleb, ctx,
- scratch_pool));
+ SVN_ERR(svn_ra_reparent(ra_session, source_url, scratch_pool));
+ {
+ apr_array_header_t *target;
+ target = apr_array_make(scratch_pool, 1, sizeof(const char *));
+ APR_ARRAY_PUSH(target, const char *) = "";
+
+ SVN_ERR(svn_ra_get_log2(ra_session, target,
+ oldest_revs_first ? oldest_rev : youngest_rev,
+ oldest_revs_first ? youngest_rev : oldest_rev,
+ 0 /* limit */,
+ discover_changed_paths,
+ FALSE /* strict_node_history */,
+ FALSE /* include_merged_revisions */,
+ revprops,
+ filter_log_entry_with_rangelist, &fleb,
+ scratch_pool));
+ }
+
/* Check for cancellation. */
if (ctx->cancel_func)
SVN_ERR(ctx->cancel_func(ctx->cancel_baton));
@@ -1620,7 +1637,7 @@
svn_mergeinfo_t mergeinfo;
SVN_ERR(get_mergeinfo(&mergeinfo_cat, &repos_root, path_or_url,
- peg_revision, FALSE, FALSE, ctx, pool, pool));
+ peg_revision, FALSE, FALSE, ctx, NULL, pool, pool));
if (mergeinfo_cat)
{
const char *repos_relpath;
@@ -1666,6 +1683,7 @@
svn_depth_t depth,
const apr_array_header_t *revprops,
svn_client_ctx_t *ctx,
+ svn_ra_session_t *ra_session,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1719,6 +1737,9 @@
subpool = svn_pool_create(scratch_pool);
+ if (ra_session)
+ target_session = ra_session;
+
/* We need the union of TARGET_PATH_OR_URL at TARGET_PEG_REVISION's mergeinfo
and MERGE_SOURCE_URL's history. It's not enough to do path
matching, because renames in the history of MERGE_SOURCE_URL
@@ -1735,11 +1756,27 @@
it ourselves. We do need to get the repos_root
though, because get_mergeinfo() won't do it for us. */
target_mergeinfo_cat = *target_mergeinfo_catalog;
- SVN_ERR(svn_client__ra_session_from_path2(&target_session, &pathrev,
- target_path_or_url, NULL,
- target_peg_revision,
- target_peg_revision,
- ctx, subpool));
+
+ if (ra_session && svn_path_is_url(target_path_or_url))
+ {
+ SVN_ERR(svn_ra_reparent(ra_session, target_path_or_url, subpool));
+ SVN_ERR(svn_client__resolve_rev_and_url(&pathrev, ra_session,
+ target_path_or_url,
+ target_peg_revision,
+ target_peg_revision,
+ ctx, subpool));
+ target_session = ra_session;
+ }
+ else
+ {
+ SVN_ERR(svn_client__ra_session_from_path2(&target_session,
+ &pathrev,
+ target_path_or_url,
+ NULL,
+ target_peg_revision,
+ target_peg_revision,
+ ctx, subpool));
+ }
SVN_ERR(svn_ra_get_repos_root2(target_session, &repos_root,
scratch_pool));
}
@@ -1751,7 +1788,7 @@
SVN_ERR(get_mergeinfo(target_mergeinfo_catalog, &repos_root,
target_path_or_url, target_peg_revision,
depth == svn_depth_infinity, TRUE,
- ctx, result_pool, scratch_pool));
+ ctx, ra_session, result_pool, scratch_pool));
target_mergeinfo_cat = *target_mergeinfo_catalog;
}
}
@@ -1763,7 +1800,7 @@
SVN_ERR(get_mergeinfo(&target_mergeinfo_cat, &repos_root,
target_path_or_url, target_peg_revision,
depth == svn_depth_infinity, TRUE,
- ctx, scratch_pool, scratch_pool));
+ ctx, ra_session, scratch_pool, scratch_pool));
}
if (!svn_path_is_url(target_path_or_url))
@@ -1833,11 +1870,28 @@
scratch_pool));
}
- SVN_ERR(svn_client__ra_session_from_path2(&source_session, &pathrev,
- source_path_or_url, NULL,
- source_peg_revision,
- source_peg_revision,
- ctx, subpool));
+ if (target_session
+ && svn_path_is_url(source_path_or_url)
+ && repos_root
+ && svn_uri_skip_ancestor(repos_root, source_path_or_url, subpool))
+ {
+ /* We can re-use the existing session */
+ source_session = target_session;
+ SVN_ERR(svn_ra_reparent(source_session, source_path_or_url, subpool));
+ SVN_ERR(svn_client__resolve_rev_and_url(&pathrev, source_session,
+ source_path_or_url,
+ source_peg_revision,
+ source_peg_revision,
+ ctx, subpool));
+ }
+ else
+ {
+ SVN_ERR(svn_client__ra_session_from_path2(&source_session, &pathrev,
+ source_path_or_url, NULL,
+ source_peg_revision,
+ source_peg_revision,
+ ctx, subpool));
+ }
SVN_ERR(svn_client__get_revision_number(&start_rev, &youngest_rev,
ctx->wc_ctx, source_path_or_url,
source_session,
@@ -1856,9 +1910,6 @@
scratch_pool));
if (start_rev > end_rev)
oldest_revs_first = FALSE;
-
- /* Close the source and target sessions. */
- svn_pool_destroy(subpool);
}
/* Separate the explicit or inherited mergeinfo on TARGET_PATH_OR_URL,
@@ -2115,7 +2166,10 @@
log_target = svn_path_url_add_component2(repos_root, log_target + 1,
scratch_pool);
- SVN_ERR(logs_for_mergeinfo_rangelist(log_target, merge_source_fspaths,
+ {
+ svn_error_t *err;
+
+ err = logs_for_mergeinfo_rangelist(log_target, merge_source_fspaths,
finding_merged,
master_inheritable_rangelist,
oldest_revs_first,
@@ -2126,8 +2180,13 @@
discover_changed_paths,
revprops,
log_receiver, log_receiver_baton,
- ctx, scratch_pool));
- return SVN_NO_ERROR;
+ ctx, target_session, scratch_pool);
+
+ /* Close the source and target sessions. */
+ svn_pool_destroy(subpool); /* For SVN_ERR_CEASE_INVOCATION */
+
+ return svn_error_trace(err);
+ }
}
svn_error_t *
@@ -2146,13 +2205,15 @@
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
{
- return svn_client__mergeinfo_log(finding_merged, target_path_or_url,
+ return svn_error_trace(
+ svn_client__mergeinfo_log(finding_merged, target_path_or_url,
target_peg_revision, NULL,
source_path_or_url, source_peg_revision,
source_start_revision, source_end_revision,
log_receiver, log_receiver_baton,
discover_changed_paths, depth, revprops,
- ctx, scratch_pool, scratch_pool);
+ ctx, NULL,
+ scratch_pool, scratch_pool));
}
svn_error_t *
@@ -2190,7 +2251,7 @@
/* ### TODO: Share ra_session batons to improve efficiency? */
SVN_ERR(get_mergeinfo(&mergeinfo_cat, &repos_root, path_or_url,
- peg_revision, FALSE, FALSE, ctx, pool, pool));
+ peg_revision, FALSE, FALSE, ctx, NULL, pool, pool));
if (mergeinfo_cat && apr_hash_count(mergeinfo_cat))
{
Modified: trunk/contrib/subversion/subversion/libsvn_client/prop_commands.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/prop_commands.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/prop_commands.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -890,9 +890,15 @@
const char *copy_root_abspath;
svn_boolean_t is_copy;
- SVN_ERR(svn_dirent_get_absolute(&local_abspath, target,
- scratch_pool));
+ /* Avoid assertion on the next line when somebody accidentally asks for
+ a working copy revision on a URL */
+ if (svn_path_is_url(target))
+ return svn_error_create(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED,
+ NULL, NULL);
+ SVN_ERR_ASSERT(svn_dirent_is_absolute(target));
+ local_abspath = target;
+
if (SVN_CLIENT__REVKIND_NEEDS_WC(peg_revision->kind))
{
SVN_ERR(svn_wc__node_get_origin(&is_copy,
@@ -1201,6 +1207,7 @@
svn_wc_context_t *wc_ctx; /* Working copy context. */
svn_proplist_receiver2_t wrapped_receiver; /* Proplist receiver to call. */
void *wrapped_receiver_baton; /* Baton for the proplist receiver. */
+ apr_array_header_t *iprops;
/* Anchor, anchor_abspath pair for converting to relative paths */
const char *anchor;
@@ -1216,7 +1223,28 @@
{
struct recursive_proplist_receiver_baton *b = baton;
const char *path;
+ apr_array_header_t *iprops = NULL;
+ if (b->iprops
+ && ! strcmp(local_abspath, b->anchor_abspath))
+ {
+ /* Report iprops with the properties for the anchor */
+ iprops = b->iprops;
+ b->iprops = NULL;
+ }
+ else if (b->iprops)
+ {
+ /* No report for the root?
+ Report iprops anyway */
+
+ SVN_ERR(b->wrapped_receiver(b->wrapped_receiver_baton,
+ b->anchor ? b->anchor : b->anchor_abspath,
+ NULL /* prop_hash */,
+ b->iprops,
+ scratch_pool));
+ b->iprops = NULL;
+ }
+
/* Attempt to convert absolute paths to relative paths for
* presentation purposes, if needed. */
if (b->anchor && b->anchor_abspath)
@@ -1230,7 +1258,7 @@
path = local_abspath;
return svn_error_trace(b->wrapped_receiver(b->wrapped_receiver_baton,
- path, props, NULL,
+ path, props, iprops,
scratch_pool));
}
@@ -1271,6 +1299,12 @@
const char *copy_root_abspath;
svn_boolean_t is_copy;
+ /* Avoid assertion on the next line when somebody accidentally asks for
+ a working copy revision on a URL */
+ if (svn_path_is_url(path_or_url))
+ return svn_error_create(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED,
+ NULL, NULL);
+
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path_or_url,
scratch_pool));
@@ -1370,6 +1404,7 @@
svn_node_kind_t kind;
apr_hash_t *changelist_hash = NULL;
const char *local_abspath;
+ apr_array_header_t *iprops = NULL;
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path_or_url,
scratch_pool));
@@ -1392,7 +1427,6 @@
if (get_target_inherited_props)
{
- apr_array_header_t *iprops;
const char *repos_root_url;
SVN_ERR(svn_wc__get_iprops(&iprops, ctx->wc_ctx, local_abspath,
@@ -1402,8 +1436,6 @@
SVN_ERR(svn_client__iprop_relpaths_to_urls(iprops, repos_root_url,
scratch_pool,
scratch_pool));
- SVN_ERR(call_receiver(path_or_url, NULL, iprops, receiver,
- receiver_baton, scratch_pool));
}
if (changelists && changelists->nelts)
@@ -1418,16 +1450,16 @@
rb.wc_ctx = ctx->wc_ctx;
rb.wrapped_receiver = receiver;
rb.wrapped_receiver_baton = receiver_baton;
+ rb.iprops = iprops;
+ rb.anchor_abspath = local_abspath;
if (strcmp(path_or_url, local_abspath) != 0)
{
rb.anchor = path_or_url;
- rb.anchor_abspath = local_abspath;
}
else
{
rb.anchor = NULL;
- rb.anchor_abspath = NULL;
}
SVN_ERR(svn_wc__prop_list_recursive(ctx->wc_ctx, local_abspath, NULL,
@@ -1435,6 +1467,13 @@
recursive_proplist_receiver, &rb,
ctx->cancel_func, ctx->cancel_baton,
scratch_pool));
+
+ if (rb.iprops)
+ {
+ /* We didn't report for the root. Report iprops anyway */
+ SVN_ERR(call_receiver(path_or_url, NULL /* props */, rb.iprops,
+ receiver, receiver_baton, scratch_pool));
+ }
}
else if (svn_wc__changelist_match(ctx->wc_ctx, local_abspath,
changelist_hash, scratch_pool))
@@ -1464,7 +1503,7 @@
}
}
- SVN_ERR(call_receiver(path_or_url, props, NULL,
+ SVN_ERR(call_receiver(path_or_url, props, iprops,
receiver, receiver_baton, scratch_pool));
}
Modified: trunk/contrib/subversion/subversion/libsvn_client/update.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/update.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/update.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -383,7 +383,7 @@
SVN_ERR(svn_ra_get_repos_root2(ra_session, &new_repos_root_url, pool));
/* svn_client_relocate2() will check the uuid */
- SVN_ERR(svn_client_relocate2(anchor_abspath, anchor_url,
+ SVN_ERR(svn_client_relocate2(anchor_abspath, repos_root_url,
new_repos_root_url, ignore_externals,
ctx, pool));
@@ -701,7 +701,23 @@
cleanup:
if (sleep)
- svn_io_sleep_for_timestamps((paths->nelts == 1) ? path : NULL, pool);
+ {
+ const char *wcroot_abspath;
+ if (paths->nelts == 1)
+ {
+ const char *abspath;
+
+ /* PATH iteslf may have been removed by the update. */
+ SVN_ERR(svn_dirent_get_absolute(&abspath, path, pool));
+ SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, abspath,
+ pool, pool));
+ }
+ else
+ wcroot_abspath = NULL;
+
+ svn_io_sleep_for_timestamps(wcroot_abspath, pool);
+ }
+
return svn_error_trace(err);
}
Modified: trunk/contrib/subversion/subversion/libsvn_client/util.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_client/util.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_client/util.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -166,6 +166,13 @@
new_item->outgoing_prop_changes =
svn_prop_array_dup(new_item->outgoing_prop_changes, pool);
+ if (new_item->session_relpath)
+ new_item->session_relpath = apr_pstrdup(pool, new_item->session_relpath);
+
+ if (new_item->moved_from_abspath)
+ new_item->moved_from_abspath = apr_pstrdup(pool,
+ new_item->moved_from_abspath);
+
return new_item;
}
Modified: trunk/contrib/subversion/subversion/libsvn_delta/svndiff.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_delta/svndiff.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_delta/svndiff.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -723,8 +723,6 @@
svn_stringbuf_t *instout = svn_stringbuf_create_empty(pool);
svn_stringbuf_t *ndout = svn_stringbuf_create_empty(pool);
- /* these may in fact simply return references to insend */
-
SVN_ERR(zlib_decode(insend, newlen, ndout,
SVN_DELTA_WINDOW_SIZE));
SVN_ERR(zlib_decode(data, insend - data, instout,
@@ -739,7 +737,13 @@
}
else
{
- new_data->data = (const char *) insend;
+ /* Copy the data because an svn_string_t must have the invariant
+ data[len]=='\0'. */
+ char *buf = apr_palloc(pool, newlen + 1);
+
+ memcpy(buf, insend, newlen);
+ buf[newlen] = '\0';
+ new_data->data = buf;
new_data->len = newlen;
}
Modified: trunk/contrib/subversion/subversion/libsvn_diff/diff_file.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_diff/diff_file.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_diff/diff_file.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -166,11 +166,12 @@
static svn_error_t *
map_or_read_file(apr_file_t **file,
MMAP_T_PARAM(mm)
- char **buffer, apr_off_t *size,
+ char **buffer, apr_size_t *size_p,
const char *path, apr_pool_t *pool)
{
apr_finfo_t finfo;
apr_status_t rv;
+ apr_size_t size;
*buffer = NULL;
@@ -177,15 +178,27 @@
SVN_ERR(svn_io_file_open(file, path, APR_READ, APR_OS_DEFAULT, pool));
SVN_ERR(svn_io_file_info_get(&finfo, APR_FINFO_SIZE, *file, pool));
+ if (finfo.size > APR_SIZE_MAX)
+ {
+ return svn_error_createf(APR_ENOMEM, NULL,
+ _("File '%s' is too large to be read in "
+ "to memory"), path);
+ }
+
+ size = (apr_size_t) finfo.size;
#if APR_HAS_MMAP
- if (finfo.size > APR_MMAP_THRESHOLD)
+ if (size > APR_MMAP_THRESHOLD)
{
- rv = apr_mmap_create(mm, *file, 0, (apr_size_t) finfo.size,
- APR_MMAP_READ, pool);
+ rv = apr_mmap_create(mm, *file, 0, size, APR_MMAP_READ, pool);
if (rv == APR_SUCCESS)
{
*buffer = (*mm)->mm;
}
+ else
+ {
+ /* Clear *MM because output parameters are undefined on error. */
+ *mm = NULL;
+ }
/* On failure we just fall through and try reading the file into
* memory instead.
@@ -193,12 +206,11 @@
}
#endif /* APR_HAS_MMAP */
- if (*buffer == NULL && finfo.size > 0)
+ if (*buffer == NULL && size > 0)
{
- *buffer = apr_palloc(pool, (apr_size_t) finfo.size);
+ *buffer = apr_palloc(pool, size);
- SVN_ERR(svn_io_file_read_full2(*file, *buffer, (apr_size_t) finfo.size,
- NULL, NULL, pool));
+ SVN_ERR(svn_io_file_read_full2(*file, *buffer, size, NULL, NULL, pool));
/* Since we have the entire contents of the file we can
* close it now.
@@ -208,7 +220,7 @@
*file = NULL;
}
- *size = finfo.size;
+ *size_p = size;
return SVN_NO_ERROR;
}
@@ -2360,7 +2372,7 @@
for (idx = 0; idx < 3; idx++)
{
- apr_off_t size;
+ apr_size_t size;
SVN_ERR(map_or_read_file(&file[idx],
MMAP_T_ARG(mm[idx])
Modified: trunk/contrib/subversion/subversion/libsvn_fs/fs-loader.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_fs/fs-loader.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_fs/fs-loader.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -81,7 +81,8 @@
#else
NULL,
#endif
- NULL
+ NULL /* End of static list: this needs to be reset to NULL if the
+ common_pool used when setting it has been cleared. */
};
static struct fs_type_defn fsfs_defn =
@@ -355,6 +356,7 @@
return SVN_NO_ERROR;
common_pool = svn_pool_create(pool);
+ base_defn.next = NULL;
SVN_ERR(svn_mutex__init(&common_pool_lock, TRUE, common_pool));
/* ### This won't work if POOL is NULL and libsvn_fs is loaded as a DSO
Modified: trunk/contrib/subversion/subversion/libsvn_fs_base/fs.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_fs_base/fs.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_fs_base/fs.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -65,7 +65,9 @@
#include "../libsvn_fs/fs-loader.h"
#include "private/svn_fs_util.h"
+#include "private/svn_subr_private.h"
+
/* Checking for return values, and reporting errors. */
@@ -1427,7 +1429,7 @@
return svn_error_createf(SVN_ERR_VERSION_MISMATCH, NULL,
_("Unsupported FS loader version (%d) for bdb"),
loader_version->major);
- SVN_ERR(svn_ver_check_list(base_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(base_version(), checklist, svn_ver_equal));
SVN_ERR(check_bdb_version());
SVN_ERR(svn_fs_bdb__init(common_pool));
Modified: trunk/contrib/subversion/subversion/libsvn_fs_fs/fs.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_fs_fs/fs.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_fs_fs/fs.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -41,6 +41,7 @@
#include "rep-cache.h"
#include "svn_private_config.h"
#include "private/svn_fs_util.h"
+#include "private/svn_subr_private.h"
#include "../libsvn_fs/fs-loader.h"
@@ -97,8 +98,11 @@
SVN_ERR(svn_mutex__init(&ffsd->txn_current_lock,
SVN_FS_FS__USE_LOCK_MUTEX, common_pool));
+ /* We also need a mutex for synchronizing access to the active
+ transaction list and free transaction pointer. This one is
+ enabled unconditionally. */
SVN_ERR(svn_mutex__init(&ffsd->txn_list_lock,
- SVN_FS_FS__USE_LOCK_MUTEX, common_pool));
+ TRUE, common_pool));
key = apr_pstrdup(common_pool, key);
status = apr_pool_userdata_set(ffsd, key, NULL, common_pool);
@@ -449,7 +453,7 @@
return svn_error_createf(SVN_ERR_VERSION_MISMATCH, NULL,
_("Unsupported FS loader version (%d) for fsfs"),
loader_version->major);
- SVN_ERR(svn_ver_check_list(fs_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(fs_version(), checklist, svn_ver_equal));
*vtable = &library_vtable;
return SVN_NO_ERROR;
Modified: trunk/contrib/subversion/subversion/libsvn_fs_fs/fs.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_fs_fs/fs.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_fs_fs/fs.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -266,7 +266,7 @@
svn_cache__t *dir_cache;
/* Fulltext cache; currently only used with memcached. Maps from
- rep key (revision/offset) to svn_string_t. */
+ rep key (revision/offset) to svn_stringbuf_t. */
svn_cache__t *fulltext_cache;
/* Access object to the atomics namespace used by revprop caching.
Modified: trunk/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -982,6 +982,31 @@
return check_file_buffer_numeric(buf, offset, path, "Format", pool);
}
+/* Return the error SVN_ERR_FS_UNSUPPORTED_FORMAT if FS's format
+ number is not the same as a format number supported by this
+ Subversion. */
+static svn_error_t *
+check_format(int format)
+{
+ /* Blacklist. These formats may be either younger or older than
+ SVN_FS_FS__FORMAT_NUMBER, but we don't support them. */
+ if (format == SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT)
+ return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
+ _("Found format '%d', only created by "
+ "unreleased dev builds; see "
+ "http://subversion.apache.org"
+ "/docs/release-notes/1.7#revprop-packing"),
+ format);
+
+ /* We support all formats from 1-current simultaneously */
+ if (1 <= format && format <= SVN_FS_FS__FORMAT_NUMBER)
+ return SVN_NO_ERROR;
+
+ return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
+ _("Expected FS format between '1' and '%d'; found format '%d'"),
+ SVN_FS_FS__FORMAT_NUMBER, format);
+}
+
/* Read the format number and maximum number of files per directory
from PATH and return them in *PFORMAT and *MAX_FILES_PER_DIR
respectively.
@@ -1032,6 +1057,9 @@
SVN_ERR(check_format_file_buffer_numeric(buf->data, 0, path, pool));
SVN_ERR(svn_cstring_atoi(pformat, buf->data));
+ /* Check that we support this format at all */
+ SVN_ERR(check_format(*pformat));
+
/* Set the default values for anything that can be set via an option. */
*max_files_per_dir = 0;
@@ -1117,31 +1145,6 @@
return svn_io_set_file_read_only(path, FALSE, pool);
}
-/* Return the error SVN_ERR_FS_UNSUPPORTED_FORMAT if FS's format
- number is not the same as a format number supported by this
- Subversion. */
-static svn_error_t *
-check_format(int format)
-{
- /* Blacklist. These formats may be either younger or older than
- SVN_FS_FS__FORMAT_NUMBER, but we don't support them. */
- if (format == SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT)
- return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
- _("Found format '%d', only created by "
- "unreleased dev builds; see "
- "http://subversion.apache.org"
- "/docs/release-notes/1.7#revprop-packing"),
- format);
-
- /* We support all formats from 1-current simultaneously */
- if (1 <= format && format <= SVN_FS_FS__FORMAT_NUMBER)
- return SVN_NO_ERROR;
-
- return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
- _("Expected FS format between '1' and '%d'; found format '%d'"),
- SVN_FS_FS__FORMAT_NUMBER, format);
-}
-
svn_boolean_t
svn_fs_fs__fs_supports_mergeinfo(svn_fs_t *fs)
{
@@ -1404,7 +1407,6 @@
/* Read the FS format number. */
SVN_ERR(read_format(&format, &max_files_per_dir,
path_format(fs, pool), pool));
- SVN_ERR(check_format(format));
/* Now we've got a format number no matter what. */
ffd->format = format;
@@ -1564,7 +1566,6 @@
/* Read the FS format number and max-files-per-dir setting. */
SVN_ERR(read_format(&format, &max_files_per_dir, format_path, pool));
- SVN_ERR(check_format(format));
/* If the config file does not exist, create one. */
SVN_ERR(svn_io_check_path(svn_dirent_join(fs->path, PATH_CONFIG, pool),
@@ -3536,7 +3537,7 @@
/* sum of values in SIZES */
apr_size_t total_size;
- /* first revision in the pack */
+ /* first revision in the pack (>= MANIFEST_START) */
svn_revnum_t start_revision;
/* size of the revprops in PACKED_REVPROPS */
@@ -3550,8 +3551,12 @@
* in the pack, i.e. the pack content without header and compression */
svn_stringbuf_t *packed_revprops;
+ /* First revision covered by MANIFEST.
+ * Will equal the shard start revision or 1, for the 1st shard. */
+ svn_revnum_t manifest_start;
+
/* content of the manifest.
- * Maps long(rev - START_REVISION) to const char* pack file name */
+ * Maps long(rev - MANIFEST_START) to const char* pack file name */
apr_array_header_t *manifest;
} packed_revprops_t;
@@ -3655,7 +3660,10 @@
/* parse the manifest. Every line is a file name */
revprops->manifest = apr_array_make(pool, ffd->max_files_per_dir,
sizeof(const char*));
- while (content->data)
+
+ /* Read all lines. Since the last line ends with a newline, we will
+ end up with a valid but empty string after the last entry. */
+ while (content->data && *content->data)
{
APR_ARRAY_PUSH(revprops->manifest, const char*) = content->data;
content->data = strchr(content->data, '\n');
@@ -3667,13 +3675,15 @@
}
/* Index for our revision. Rev 0 is excluded from the first shard. */
- idx = (int)(revprops->revision % ffd->max_files_per_dir);
- if (revprops->revision < ffd->max_files_per_dir)
- --idx;
+ revprops->manifest_start = revprops->revision
+ - (revprops->revision % ffd->max_files_per_dir);
+ if (revprops->manifest_start == 0)
+ ++revprops->manifest_start;
+ idx = (int)(revprops->revision - revprops->manifest_start);
if (revprops->manifest->nelts <= idx)
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
- _("Packed revprop manifest for rev %ld too "
+ _("Packed revprop manifest for r%ld too "
"small"), revprops->revision);
/* Now get the file name */
@@ -3682,6 +3692,17 @@
return SVN_NO_ERROR;
}
+/* Return TRUE, if revision R1 and R2 refer to the same shard in FS.
+ */
+static svn_boolean_t
+same_shard(svn_fs_t *fs,
+ svn_revnum_t r1,
+ svn_revnum_t r2)
+{
+ fs_fs_data_t *ffd = fs->fsap_data;
+ return (r1 / ffd->max_files_per_dir) == (r2 / ffd->max_files_per_dir);
+}
+
/* Given FS and the full packed file content in REVPROPS->PACKED_REVPROPS,
* fill the START_REVISION, SIZES, OFFSETS members. Also, make
* PACKED_REVPROPS point to the first serialized revprop.
@@ -3714,6 +3735,26 @@
SVN_ERR(read_number_from_stream(&first_rev, NULL, stream, iterpool));
SVN_ERR(read_number_from_stream(&count, NULL, stream, iterpool));
+ /* Check revision range for validity. */
+ if ( !same_shard(fs, revprops->revision, first_rev)
+ || !same_shard(fs, revprops->revision, first_rev + count - 1)
+ || count < 1)
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
+ _("Revprop pack for revision r%ld"
+ " contains revprops for r%ld .. r%ld"),
+ revprops->revision,
+ (svn_revnum_t)first_rev,
+ (svn_revnum_t)(first_rev + count -1));
+
+ /* Since start & end are in the same shard, it is enough to just test
+ * the FIRST_REV for being actually packed. That will also cover the
+ * special case of rev 0 never being packed. */
+ if (!is_packed_revprop(fs, first_rev))
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
+ _("Revprop pack for revision r%ld"
+ " starts at non-packed revisions r%ld"),
+ revprops->revision, (svn_revnum_t)first_rev);
+
/* make PACKED_REVPROPS point to the first char after the header.
* This is where the serialized revprops are. */
header_end = strstr(uncompressed->data, "\n\n");
@@ -3846,7 +3887,7 @@
/* the file content should be available now */
if (!result->packed_revprops)
return svn_error_createf(SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE, NULL,
- _("Failed to read revprop pack file for rev %ld"), rev);
+ _("Failed to read revprop pack file for r%ld"), rev);
/* parse it. RESULT will be complete afterwards. */
err = parse_packed_revprops(fs, result, pool, iterpool);
@@ -3853,7 +3894,7 @@
svn_pool_destroy(iterpool);
if (err)
return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
- _("Revprop pack file for rev %ld is corrupt"), rev);
+ _("Revprop pack file for r%ld is corrupt"), rev);
*revprops = result;
@@ -4117,7 +4158,8 @@
return SVN_NO_ERROR;
}
-/* Allocate a new pack file name for the revisions at index [START,END)
+/* Allocate a new pack file name for revisions
+ * [REVPROPS->START_REVISION + START, REVPROPS->START_REVISION + END - 1]
* of REVPROPS->MANIFEST. Add the name of old file to FILES_TO_DELETE,
* auto-create that array if necessary. Return an open file stream to
* the new file in *STREAM allocated in POOL.
@@ -4136,10 +4178,13 @@
svn_string_t *new_filename;
int i;
apr_file_t *file;
+ int manifest_offset
+ = (int)(revprops->start_revision - revprops->manifest_start);
/* get the old (= current) file name and enlist it for later deletion */
- const char *old_filename
- = APR_ARRAY_IDX(revprops->manifest, start, const char*);
+ const char *old_filename = APR_ARRAY_IDX(revprops->manifest,
+ start + manifest_offset,
+ const char*);
if (*files_to_delete == NULL)
*files_to_delete = apr_array_make(pool, 3, sizeof(const char*));
@@ -4161,7 +4206,8 @@
/* update the manifest to point to the new file */
for (i = start; i < end; ++i)
- APR_ARRAY_IDX(revprops->manifest, i, const char*) = new_filename->data;
+ APR_ARRAY_IDX(revprops->manifest, i + manifest_offset, const char*)
+ = new_filename->data;
/* create a file stream for the new file */
SVN_ERR(svn_io_file_open(&file, svn_dirent_join(revprops->folder,
@@ -5334,11 +5380,13 @@
/* Read target's base rep if any. */
SVN_ERR(create_rep_state(&rep_state, &rep_args, NULL, NULL,
target->data_rep, fs, pool));
- /* If that matches source, then use this delta as is. */
+
+ /* If that matches source, then use this delta as is.
+ Note that we want an actual delta here. E.g. a self-delta would
+ not be good enough. */
if (rep_args->is_delta
- && (rep_args->is_delta_vs_empty
- || (rep_args->base_revision == source->data_rep->revision
- && rep_args->base_offset == source->data_rep->offset)))
+ && rep_args->base_revision == source->data_rep->revision
+ && rep_args->base_offset == source->data_rep->offset)
{
/* Create the delta read baton. */
struct delta_read_baton *drb = apr_pcalloc(pool, sizeof(*drb));
@@ -8829,7 +8877,12 @@
SVN_ERR(write_revision_zero(fs));
- SVN_ERR(write_config(fs, pool));
+ /* Create the fsfs.conf file if supported. Older server versions would
+ simply ignore the file but that might result in a different behavior
+ than with the later releases. Also, hotcopy would ignore, i.e. not
+ copy, a fsfs.conf with old formats. */
+ if (ffd->format >= SVN_FS_FS__MIN_CONFIG_FILE)
+ SVN_ERR(write_config(fs, pool));
SVN_ERR(read_config(ffd, fs->path, pool));
@@ -10883,26 +10936,23 @@
}
-/* Remove revisions between START_REV (inclusive) and END_REV (non-inclusive)
- * from DST_FS. Assume sharding as per MAX_FILES_PER_DIR.
+/* Remove revision or revprop files between START_REV (inclusive) and
+ * END_REV (non-inclusive) from folder DST_SUBDIR in DST_FS. Assume
+ * sharding as per MAX_FILES_PER_DIR.
* Use SCRATCH_POOL for temporary allocations. */
static svn_error_t *
-hotcopy_remove_rev_files(svn_fs_t *dst_fs,
- svn_revnum_t start_rev,
- svn_revnum_t end_rev,
- int max_files_per_dir,
- apr_pool_t *scratch_pool)
+hotcopy_remove_files(svn_fs_t *dst_fs,
+ const char *dst_subdir,
+ svn_revnum_t start_rev,
+ svn_revnum_t end_rev,
+ int max_files_per_dir,
+ apr_pool_t *scratch_pool)
{
- const char *dst_subdir;
const char *shard;
const char *dst_subdir_shard;
svn_revnum_t rev;
apr_pool_t *iterpool;
- SVN_ERR_ASSERT(start_rev <= end_rev);
-
- dst_subdir = svn_dirent_join(dst_fs->path, PATH_REVS_DIR, scratch_pool);
-
/* Pre-compute paths for initial shard. */
shard = apr_psprintf(scratch_pool, "%ld", start_rev / max_files_per_dir);
dst_subdir_shard = svn_dirent_join(dst_subdir, shard, scratch_pool);
@@ -10910,8 +10960,7 @@
iterpool = svn_pool_create(scratch_pool);
for (rev = start_rev; rev < end_rev; rev++)
{
- const char *rev_path;
-
+ const char *path;
svn_pool_clear(iterpool);
/* If necessary, update paths for shard. */
@@ -10921,19 +10970,66 @@
dst_subdir_shard = svn_dirent_join(dst_subdir, shard, scratch_pool);
}
- rev_path = svn_dirent_join(dst_subdir_shard,
- apr_psprintf(iterpool, "%ld", rev),
- iterpool);
+ /* remove files for REV */
+ path = svn_dirent_join(dst_subdir_shard,
+ apr_psprintf(iterpool, "%ld", rev),
+ iterpool);
/* Make the rev file writable and remove it. */
- SVN_ERR(svn_io_set_file_read_write(rev_path, TRUE, iterpool));
- SVN_ERR(svn_io_remove_file2(rev_path, TRUE, iterpool));
+ SVN_ERR(svn_io_set_file_read_write(path, TRUE, iterpool));
+ SVN_ERR(svn_io_remove_file2(path, TRUE, iterpool));
}
+
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
+/* Remove revisions between START_REV (inclusive) and END_REV (non-inclusive)
+ * from DST_FS. Assume sharding as per MAX_FILES_PER_DIR.
+ * Use SCRATCH_POOL for temporary allocations. */
+static svn_error_t *
+hotcopy_remove_rev_files(svn_fs_t *dst_fs,
+ svn_revnum_t start_rev,
+ svn_revnum_t end_rev,
+ int max_files_per_dir,
+ apr_pool_t *scratch_pool)
+{
+ SVN_ERR_ASSERT(start_rev <= end_rev);
+ SVN_ERR(hotcopy_remove_files(dst_fs,
+ svn_dirent_join(dst_fs->path,
+ PATH_REVS_DIR,
+ scratch_pool),
+ start_rev, end_rev,
+ max_files_per_dir, scratch_pool));
+
+ return SVN_NO_ERROR;
+}
+
+/* Remove revision properties between START_REV (inclusive) and END_REV
+ * (non-inclusive) from DST_FS. Assume sharding as per MAX_FILES_PER_DIR.
+ * Use SCRATCH_POOL for temporary allocations. Revision 0 revprops will
+ * not be deleted. */
+static svn_error_t *
+hotcopy_remove_revprop_files(svn_fs_t *dst_fs,
+ svn_revnum_t start_rev,
+ svn_revnum_t end_rev,
+ int max_files_per_dir,
+ apr_pool_t *scratch_pool)
+{
+ SVN_ERR_ASSERT(start_rev <= end_rev);
+
+ /* don't delete rev 0 props */
+ SVN_ERR(hotcopy_remove_files(dst_fs,
+ svn_dirent_join(dst_fs->path,
+ PATH_REVPROPS_DIR,
+ scratch_pool),
+ start_rev ? start_rev : 1, end_rev,
+ max_files_per_dir, scratch_pool));
+
+ return SVN_NO_ERROR;
+}
+
/* Verify that DST_FS is a suitable destination for an incremental
* hotcopy from SRC_FS. */
static svn_error_t *
@@ -10970,7 +11066,28 @@
return SVN_NO_ERROR;
}
+/* Remove folder PATH. Ignore errors due to the sub-tree not being empty.
+ * CANCEL_FUNC and CANCEL_BATON do the usual thing.
+ * Use POOL for temporary allocations.
+ */
+static svn_error_t *
+remove_folder(const char *path,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool)
+{
+ svn_error_t *err = svn_io_remove_dir2(path, TRUE,
+ cancel_func, cancel_baton, pool);
+ if (err && APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+ {
+ svn_error_clear(err);
+ err = SVN_NO_ERROR;
+ }
+
+ return svn_error_trace(err);
+}
+
/* Baton for hotcopy_body(). */
struct hotcopy_body_baton {
svn_fs_t *src_fs;
@@ -11160,8 +11277,6 @@
/* First, copy packed shards. */
for (rev = 0; rev < src_min_unpacked_rev; rev += max_files_per_dir)
{
- svn_error_t *err;
-
svn_pool_clear(iterpool);
if (cancel_func)
@@ -11181,20 +11296,24 @@
/* Remove revision files which are now packed. */
if (incremental)
- SVN_ERR(hotcopy_remove_rev_files(dst_fs, rev, rev + max_files_per_dir,
- max_files_per_dir, iterpool));
+ {
+ SVN_ERR(hotcopy_remove_rev_files(dst_fs, rev,
+ rev + max_files_per_dir,
+ max_files_per_dir, iterpool));
+ if (dst_ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
+ SVN_ERR(hotcopy_remove_revprop_files(dst_fs, rev,
+ rev + max_files_per_dir,
+ max_files_per_dir,
+ iterpool));
+ }
/* Now that all revisions have moved into the pack, the original
* rev dir can be removed. */
- err = svn_io_remove_dir2(path_rev_shard(dst_fs, rev, iterpool),
- TRUE, cancel_func, cancel_baton, iterpool);
- if (err)
- {
- if (APR_STATUS_IS_ENOTEMPTY(err->apr_err))
- svn_error_clear(err);
- else
- return svn_error_trace(err);
- }
+ SVN_ERR(remove_folder(path_rev_shard(dst_fs, rev, iterpool),
+ cancel_func, cancel_baton, iterpool));
+ if (rev > 0 && dst_ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
+ SVN_ERR(remove_folder(path_revprops_shard(dst_fs, rev, iterpool),
+ cancel_func, cancel_baton, iterpool));
}
if (cancel_func)
Modified: trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,4 +1,4 @@
-/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_fs_fs/token-map.h.
+/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.10/subversion/libsvn_fs_fs/token-map.h.
* Do not edit this file -- edit the source and rerun gen-make.py */
#define STMT_CREATE_SCHEMA 0
Modified: trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -81,8 +81,33 @@
int version;
/* Open (or create) the sqlite database. It will be automatically
- closed when fs->pool is destoyed. */
+ closed when fs->pool is destoyed. */
db_path = path_rep_cache_db(fs->path, pool);
+#ifndef WIN32
+ {
+ /* We want to extend the permissions that apply to the repository
+ as a whole when creating a new rep cache and not simply default
+ to umask. */
+ svn_boolean_t exists;
+
+ SVN_ERR(svn_fs_fs__exists_rep_cache(&exists, fs, pool));
+ if (!exists)
+ {
+ const char *current = svn_fs_fs__path_current(fs, pool);
+ svn_error_t *err = svn_io_file_create(db_path, "", pool);
+
+ if (err && !APR_STATUS_IS_EEXIST(err->apr_err))
+ /* A real error. */
+ return svn_error_trace(err);
+ else if (err)
+ /* Some other thread/process created the file. */
+ svn_error_clear(err);
+ else
+ /* We created the file. */
+ SVN_ERR(svn_io_copy_perms(current, db_path, pool));
+ }
+ }
+#endif
SVN_ERR(svn_sqlite__open(&sdb, db_path,
svn_sqlite__mode_rwcreate, statements,
0, NULL,
Modified: trunk/contrib/subversion/subversion/libsvn_ra/ra_loader.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra/ra_loader.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra/ra_loader.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1436,7 +1436,7 @@
built with SASL. */
line = apr_psprintf(iterpool, "* ra_%s : %s\n",
defn->ra_name,
- vtable->get_description());
+ vtable->get_description(iterpool));
svn_stringbuf_appendcstr(output, line);
for (schemes = vtable->get_schemes(iterpool); *schemes != NULL;
Modified: trunk/contrib/subversion/subversion/libsvn_ra/ra_loader.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra/ra_loader.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra/ra_loader.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -45,7 +45,7 @@
/* Return a short description of the RA implementation, as a localized
* string. */
- const char *(*get_description)(void);
+ const char *(*get_description)(apr_pool_t *pool);
/* Return a list of actual URI schemes supported by this implementation.
* The returned array is NULL-terminated. */
Modified: trunk/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -41,6 +41,7 @@
#include "private/svn_repos_private.h"
#include "private/svn_fspath.h"
#include "private/svn_atomic.h"
+#include "private/svn_subr_private.h"
#define APR_WANT_STRFUNC
#include <apr_want.h>
@@ -502,7 +503,7 @@
N_("Module for accessing a repository on local disk.")
static const char *
-svn_ra_local__get_description(void)
+svn_ra_local__get_description(apr_pool_t *pool)
{
return _(RA_LOCAL_DESCRIPTION);
}
@@ -1745,7 +1746,7 @@
"ra_local"),
loader_version->major);
- SVN_ERR(svn_ver_check_list(ra_local_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(ra_local_version(), checklist, svn_ver_equal));
#ifndef SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL
/* This assumes that POOL was the pool used to load the dso. */
Modified: trunk/contrib/subversion/subversion/libsvn_ra_local/split_url.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_local/split_url.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_local/split_url.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -39,6 +39,7 @@
const char *repos_dirent;
const char *repos_root_dirent;
svn_stringbuf_t *urlbuf;
+ apr_size_t root_end;
SVN_ERR(svn_uri_get_dirent_from_file_url(&repos_dirent, URL, pool));
@@ -65,10 +66,17 @@
"/",
svn_dirent_skip_ancestor(repos_root_dirent, repos_dirent),
(const char *)NULL); */
- *fs_path = &repos_dirent[strlen(repos_root_dirent)];
-
- if (**fs_path == '\0')
+ root_end = strlen(repos_root_dirent);
+ if (! repos_dirent[root_end])
*fs_path = "/";
+ else if (repos_dirent[root_end] == '/')
+ *fs_path = &repos_dirent[root_end];
+ else
+ {
+ /* On Windows "C:/" is the parent directory of "C:/dir" */
+ *fs_path = &repos_dirent[root_end-1];
+ SVN_ERR_ASSERT((*fs_path)[0] == '/');
+ }
/* Remove the path components after the root dirent from the original URL,
to get a URL to the repository root.
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/commit.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/commit.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/commit.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -99,14 +99,11 @@
} proppatch_context_t;
typedef struct delete_context_t {
- const char *path;
+ const char *relpath;
svn_revnum_t revision;
- const char *lock_token;
- apr_hash_t *lock_token_hash;
- svn_boolean_t keep_locks;
-
+ commit_context_t *commit;
} delete_context_t;
/* Represents a directory. */
@@ -149,7 +146,6 @@
/* The checked-out working resource for this directory. May be NULL; if so
call checkout_dir() first. */
const char *working_url;
-
} dir_context_t;
/* Represents a file to be committed. */
@@ -397,10 +393,18 @@
{
if (p_dir->added)
{
+ /* Calculate the working_url by skipping the shared ancestor bewteen
+ * the parent->relpath and dir->relpath. This is safe since an
+ * add is guaranteed to have a parent that is checked out. */
+ dir_context_t *parent = p_dir->parent_dir;
+ const char *relpath = svn_relpath_skip_ancestor(parent->relpath,
+ dir->relpath);
+
/* Implicitly checkout this dir now. */
+ SVN_ERR_ASSERT(parent->working_url);
dir->working_url = svn_path_url_add_component2(
- dir->parent_dir->working_url,
- dir->name, dir->pool);
+ parent->working_url,
+ relpath, dir->pool);
return SVN_NO_ERROR;
}
p_dir = p_dir->parent_dir;
@@ -1070,6 +1074,96 @@
}
static svn_error_t *
+setup_if_header_recursive(svn_boolean_t *added,
+ serf_bucket_t *headers,
+ commit_context_t *commit_ctx,
+ const char *rq_relpath,
+ apr_pool_t *pool)
+{
+ svn_stringbuf_t *sb = NULL;
+ apr_hash_index_t *hi;
+ apr_pool_t *iterpool = NULL;
+
+ if (!commit_ctx->lock_tokens)
+ {
+ *added = FALSE;
+ return SVN_NO_ERROR;
+ }
+
+ /* We try to create a directory, so within the Subversion world that
+ would imply that there is nothing here, but mod_dav_svn still sees
+ locks on the old nodes here as in DAV it is perfectly legal to lock
+ something that is not there...
+
+ Let's make mod_dav, mod_dav_svn and the DAV RFC happy by providing
+ the locks we know of with the request */
+
+ for (hi = apr_hash_first(pool, commit_ctx->lock_tokens);
+ hi;
+ hi = apr_hash_next(hi))
+ {
+ const char *relpath = svn__apr_hash_index_key(hi);
+ apr_uri_t uri;
+
+ if (!svn_relpath_skip_ancestor(rq_relpath, relpath))
+ continue;
+ else if (svn_hash_gets(commit_ctx->deleted_entries, relpath))
+ {
+ /* When a path is already explicit deleted then its lock
+ will be removed by mod_dav. But mod_dav doesn't remove
+ locks on descendants */
+ continue;
+ }
+
+ if (!iterpool)
+ iterpool = svn_pool_create(pool);
+ else
+ svn_pool_clear(iterpool);
+
+ if (sb == NULL)
+ sb = svn_stringbuf_create("", pool);
+ else
+ svn_stringbuf_appendbyte(sb, ' ');
+
+ uri = commit_ctx->session->session_url;
+ uri.path = (char *)svn_path_url_add_component2(uri.path, relpath,
+ iterpool);
+
+ svn_stringbuf_appendbyte(sb, '<');
+ svn_stringbuf_appendcstr(sb, apr_uri_unparse(iterpool, &uri, 0));
+ svn_stringbuf_appendcstr(sb, "> (<");
+ svn_stringbuf_appendcstr(sb, svn__apr_hash_index_val(hi));
+ svn_stringbuf_appendcstr(sb, ">)");
+ }
+
+ if (iterpool)
+ svn_pool_destroy(iterpool);
+
+ if (sb)
+ {
+ serf_bucket_headers_set(headers, "If", sb->data);
+ *added = TRUE;
+ }
+ else
+ *added = FALSE;
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+setup_add_dir_common_headers(serf_bucket_t *headers,
+ void *baton,
+ apr_pool_t *pool)
+{
+ dir_context_t *dir = baton;
+ svn_boolean_t added;
+
+ return svn_error_trace(
+ setup_if_header_recursive(&added, headers, dir->commit, dir->relpath,
+ pool));
+}
+
+static svn_error_t *
setup_copy_dir_headers(serf_bucket_t *headers,
void *baton,
apr_pool_t *pool)
@@ -1101,7 +1195,7 @@
/* Implicitly checkout this dir now. */
dir->working_url = apr_pstrdup(dir->pool, uri.path);
- return SVN_NO_ERROR;
+ return svn_error_trace(setup_add_dir_common_headers(headers, baton, pool));
}
static svn_error_t *
@@ -1109,54 +1203,22 @@
void *baton,
apr_pool_t *pool)
{
- delete_context_t *ctx = baton;
+ delete_context_t *del = baton;
+ svn_boolean_t added;
serf_bucket_headers_set(headers, SVN_DAV_VERSION_NAME_HEADER,
- apr_ltoa(pool, ctx->revision));
+ apr_ltoa(pool, del->revision));
- if (ctx->lock_token_hash)
- {
- ctx->lock_token = svn_hash_gets(ctx->lock_token_hash, ctx->path);
+ SVN_ERR(setup_if_header_recursive(&added, headers, del->commit,
+ del->relpath, pool));
- if (ctx->lock_token)
- {
- const char *token_header;
+ if (added && del->commit->keep_locks)
+ serf_bucket_headers_setn(headers, SVN_DAV_OPTIONS_HEADER,
+ SVN_DAV_OPTION_KEEP_LOCKS);
- token_header = apr_pstrcat(pool, "<", ctx->path, "> (<",
- ctx->lock_token, ">)", (char *)NULL);
-
- serf_bucket_headers_set(headers, "If", token_header);
-
- if (ctx->keep_locks)
- serf_bucket_headers_setn(headers, SVN_DAV_OPTIONS_HEADER,
- SVN_DAV_OPTION_KEEP_LOCKS);
- }
- }
-
return SVN_NO_ERROR;
}
-/* Implements svn_ra_serf__request_body_delegate_t */
-static svn_error_t *
-create_delete_body(serf_bucket_t **body_bkt,
- void *baton,
- serf_bucket_alloc_t *alloc,
- apr_pool_t *pool)
-{
- delete_context_t *ctx = baton;
- serf_bucket_t *body;
-
- body = serf_bucket_aggregate_create(alloc);
-
- svn_ra_serf__add_xml_header_buckets(body, alloc);
-
- svn_ra_serf__merge_lock_token_list(ctx->lock_token_hash, ctx->path,
- body, alloc, pool);
-
- *body_bkt = body;
- return SVN_NO_ERROR;
-}
-
/* Helper function to write the svndiff stream to temporary file. */
static svn_error_t *
svndiff_stream_write(void *file_baton,
@@ -1533,7 +1595,6 @@
delete_context_t *delete_ctx;
svn_ra_serf__handler_t *handler;
const char *delete_target;
- svn_error_t *err;
if (USING_HTTPV2_COMMIT_SUPPORT(dir->commit))
{
@@ -1552,10 +1613,9 @@
/* DELETE our entry */
delete_ctx = apr_pcalloc(pool, sizeof(*delete_ctx));
- delete_ctx->path = apr_pstrdup(pool, path);
+ delete_ctx->relpath = apr_pstrdup(pool, path);
delete_ctx->revision = revision;
- delete_ctx->lock_token_hash = dir->commit->lock_tokens;
- delete_ctx->keep_locks = dir->commit->keep_locks;
+ delete_ctx->commit = dir->commit;
handler = apr_pcalloc(pool, sizeof(*handler));
handler->handler_pool = pool;
@@ -1571,31 +1631,8 @@
handler->method = "DELETE";
handler->path = delete_target;
- err = svn_ra_serf__context_run_one(handler, pool);
+ SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
- if (err &&
- (err->apr_err == SVN_ERR_FS_BAD_LOCK_TOKEN ||
- err->apr_err == SVN_ERR_FS_NO_LOCK_TOKEN ||
- err->apr_err == SVN_ERR_FS_LOCK_OWNER_MISMATCH ||
- err->apr_err == SVN_ERR_FS_PATH_ALREADY_LOCKED))
- {
- svn_error_clear(err);
-
- /* An error has been registered on the connection. Reset the thing
- so that we can use it again. */
- serf_connection_reset(handler->conn->conn);
-
- handler->body_delegate = create_delete_body;
- handler->body_delegate_baton = delete_ctx;
- handler->body_type = "text/xml";
-
- SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
- }
- else if (err)
- {
- return err;
- }
-
/* 204 No Content: item successfully deleted */
if (handler->sline.code != 204)
{
@@ -1630,7 +1667,7 @@
dir->added = TRUE;
dir->base_revision = SVN_INVALID_REVNUM;
dir->copy_revision = copyfrom_revision;
- dir->copy_path = copyfrom_path;
+ dir->copy_path = apr_pstrdup(dir->pool, copyfrom_path);
dir->relpath = apr_pstrdup(dir->pool, path);
dir->name = svn_relpath_basename(dir->relpath, NULL);
dir->changed_props = apr_hash_make(dir->pool);
@@ -1665,6 +1702,9 @@
{
handler->method = "MKCOL";
handler->path = mkcol_target;
+
+ handler->header_delegate = setup_add_dir_common_headers;
+ handler->header_delegate_baton = dir;
}
else
{
@@ -1872,7 +1912,7 @@
new_file->name = svn_relpath_basename(new_file->relpath, NULL);
new_file->added = TRUE;
new_file->base_revision = SVN_INVALID_REVNUM;
- new_file->copy_path = copy_path;
+ new_file->copy_path = apr_pstrdup(new_file->pool, copy_path);
new_file->copy_revision = copy_revision;
new_file->changed_props = apr_hash_make(new_file->pool);
new_file->removed_props = apr_hash_make(new_file->pool);
@@ -1924,7 +1964,18 @@
if (handler->sline.code != 404)
{
- return svn_error_createf(SVN_ERR_RA_DAV_ALREADY_EXISTS, NULL,
+ if (handler->sline.code != 200)
+ {
+ svn_error_t *err;
+
+ err = svn_ra_serf__error_on_status(handler->sline,
+ handler->path,
+ handler->location);
+
+ SVN_ERR(err);
+ }
+
+ return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL,
_("File '%s' already exists"), path);
}
}
@@ -2322,7 +2373,8 @@
ctx->callback = callback;
ctx->callback_baton = callback_baton;
- ctx->lock_tokens = lock_tokens;
+ ctx->lock_tokens = (lock_tokens && apr_hash_count(lock_tokens))
+ ? lock_tokens : NULL;
ctx->keep_locks = keep_locks;
ctx->deleted_entries = apr_hash_make(ctx->pool);
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -116,6 +116,7 @@
if (leaving_state == LOCK)
{
const char *path = svn_hash_gets(attrs, "path");
+ const char *token = svn_hash_gets(attrs, "token");
svn_boolean_t save_lock = FALSE;
/* Filter out unwanted paths. Since Subversion only allows
@@ -128,6 +129,12 @@
c) we've asked for depth=files or depth=immediates, and this
lock is on an immediate child of our query path.
*/
+ if (! token)
+ {
+ /* A lock without a token is not a lock; just an answer that there
+ is no lock on the node. */
+ save_lock = FALSE;
+ }
if (strcmp(lock_ctx->path, path) == 0
|| lock_ctx->requested_depth == svn_depth_infinity)
{
@@ -154,7 +161,7 @@
them may have not been sent, so the value will be NULL. */
lock.path = path;
- lock.token = svn_hash_gets(attrs, "token");
+ lock.token = token;
lock.owner = svn_hash_gets(attrs, "owner");
lock.comment = svn_hash_gets(attrs, "comment");
@@ -234,6 +241,7 @@
svn_ra_serf__handler_t *handler;
svn_ra_serf__xml_context_t *xmlctx;
const char *req_url, *rel_path;
+ svn_error_t *err;
req_url = svn_path_url_add_component2(session->session_url.path, path, pool);
SVN_ERR(svn_ra_serf__get_relative_path(&rel_path, req_url, session,
@@ -260,7 +268,14 @@
handler->body_delegate = create_getlocks_body;
handler->body_delegate_baton = lock_ctx;
- SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
+ err = svn_ra_serf__context_run_one(handler, pool);
+
+ /* Wrap the server generated error for an unsupported report with the
+ documented error for this ra function. */
+ if (svn_error_find_cause(err, SVN_ERR_UNSUPPORTED_FEATURE))
+ err = svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, err, NULL);
+
+ SVN_ERR(err);
/* We get a 404 when a path doesn't exist in HEAD, but it might
have existed earlier (E.g. 'svn ls http://s/svn/trunk/file@1' */
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -41,7 +41,7 @@
/* The current state of our XML parsing. */
typedef enum iprops_state_e {
- NONE = 0,
+ INITIAL = 0,
IPROPS_REPORT,
IPROPS_ITEM,
IPROPS_PATH,
@@ -61,18 +61,12 @@
/* The repository's root URL. */
const char *repos_root_url;
- /* Current CDATA values*/
- svn_stringbuf_t *curr_path;
+ /* Current property name */
svn_stringbuf_t *curr_propname;
- svn_stringbuf_t *curr_propval;
- const char *curr_prop_val_encoding;
/* Current element in IPROPS. */
svn_prop_inherited_item_t *curr_iprop;
- /* Serf context completion flag for svn_ra_serf__context_run_wait() */
- svn_boolean_t done;
-
/* Path we are finding inherited properties for. This is relative to
the RA session passed to svn_ra_serf__get_inherited_props. */
const char *path;
@@ -80,163 +74,122 @@
svn_revnum_t revision;
} iprops_context_t;
+#define S_ SVN_XML_NAMESPACE
+static const svn_ra_serf__xml_transition_t iprops_table[] = {
+ { INITIAL, S_, SVN_DAV__INHERITED_PROPS_REPORT, IPROPS_REPORT,
+ FALSE, { NULL }, FALSE },
+
+ { IPROPS_REPORT, S_, SVN_DAV__IPROP_ITEM, IPROPS_ITEM,
+ FALSE, { NULL }, TRUE },
+
+ { IPROPS_ITEM, S_, SVN_DAV__IPROP_PATH, IPROPS_PATH,
+ TRUE, { NULL }, TRUE },
+
+ { IPROPS_ITEM, S_, SVN_DAV__IPROP_PROPNAME, IPROPS_PROPNAME,
+ TRUE, { NULL }, TRUE },
+
+ { IPROPS_ITEM, S_, SVN_DAV__IPROP_PROPVAL, IPROPS_PROPVAL,
+ TRUE, { "?V:encoding", NULL }, TRUE },
+
+ { 0 }
+};
+
+/* Conforms to svn_ra_serf__xml_opened_t */
static svn_error_t *
-start_element(svn_ra_serf__xml_parser_t *parser,
- svn_ra_serf__dav_props_t name,
- const char **attrs,
+iprops_opened(svn_ra_serf__xml_estate_t *xes,
+ void *baton,
+ int entered_state,
+ const svn_ra_serf__dav_props_t *tag,
apr_pool_t *scratch_pool)
{
- iprops_context_t *iprops_ctx = parser->user_data;
- iprops_state_e state;
+ iprops_context_t *iprops_ctx = baton;
- state = parser->state->current_state;
- if (state == NONE
- && strcmp(name.name, SVN_DAV__INHERITED_PROPS_REPORT) == 0)
+ if (entered_state == IPROPS_ITEM)
{
- svn_ra_serf__xml_push_state(parser, IPROPS_REPORT);
- }
- else if (state == IPROPS_REPORT &&
- strcmp(name.name, SVN_DAV__IPROP_ITEM) == 0)
- {
- svn_stringbuf_setempty(iprops_ctx->curr_path);
svn_stringbuf_setempty(iprops_ctx->curr_propname);
- svn_stringbuf_setempty(iprops_ctx->curr_propval);
- iprops_ctx->curr_prop_val_encoding = NULL;
- iprops_ctx->curr_iprop = NULL;
- svn_ra_serf__xml_push_state(parser, IPROPS_ITEM);
+
+ iprops_ctx->curr_iprop = apr_pcalloc(iprops_ctx->pool,
+ sizeof(*iprops_ctx->curr_iprop));
+
+ iprops_ctx->curr_iprop->prop_hash = apr_hash_make(iprops_ctx->pool);
}
- else if (state == IPROPS_ITEM &&
- strcmp(name.name, SVN_DAV__IPROP_PROPVAL) == 0)
- {
- const char *prop_val_encoding = svn_xml_get_attr_value("encoding",
- attrs);
- iprops_ctx->curr_prop_val_encoding = apr_pstrdup(iprops_ctx->pool,
- prop_val_encoding);
- svn_ra_serf__xml_push_state(parser, IPROPS_PROPVAL);
- }
- else if (state == IPROPS_ITEM &&
- strcmp(name.name, SVN_DAV__IPROP_PATH) == 0)
- {
- svn_ra_serf__xml_push_state(parser, IPROPS_PATH);
- }
- else if (state == IPROPS_ITEM &&
- strcmp(name.name, SVN_DAV__IPROP_PROPNAME) == 0)
- {
- svn_ra_serf__xml_push_state(parser, IPROPS_PROPNAME);
- }
- else if (state == IPROPS_ITEM &&
- strcmp(name.name, SVN_DAV__IPROP_PROPVAL) == 0)
- {
- svn_ra_serf__xml_push_state(parser, IPROPS_PROPVAL);
- }
-
return SVN_NO_ERROR;
}
+/* Conforms to svn_ra_serf__xml_closed_t */
static svn_error_t *
-end_element(svn_ra_serf__xml_parser_t *parser,
- svn_ra_serf__dav_props_t name,
- apr_pool_t *scratch_pool)
+iprops_closed(svn_ra_serf__xml_estate_t *xes,
+ void *baton,
+ int leaving_state,
+ const svn_string_t *cdata,
+ apr_hash_t *attrs,
+ apr_pool_t *scratch_pool)
{
- iprops_context_t *iprops_ctx = parser->user_data;
- iprops_state_e state;
+ iprops_context_t *iprops_ctx = baton;
- state = parser->state->current_state;
+ if (leaving_state == IPROPS_ITEM)
+ {
+ APR_ARRAY_PUSH(iprops_ctx->iprops, svn_prop_inherited_item_t *) =
+ iprops_ctx->curr_iprop;
- if (state == IPROPS_REPORT &&
- strcmp(name.name, SVN_DAV__INHERITED_PROPS_REPORT) == 0)
- {
- svn_ra_serf__xml_pop_state(parser);
+ iprops_ctx->curr_iprop = NULL;
}
- else if (state == IPROPS_PATH
- && strcmp(name.name, SVN_DAV__IPROP_PATH) == 0)
+ else if (leaving_state == IPROPS_PATH)
{
- iprops_ctx->curr_iprop = apr_palloc(
- iprops_ctx->pool, sizeof(svn_prop_inherited_item_t));
+ /* Every <iprop-item> has a single <iprop-path> */
+ if (iprops_ctx->curr_iprop->path_or_url)
+ return svn_error_create(SVN_ERR_XML_MALFORMED, NULL, NULL);
iprops_ctx->curr_iprop->path_or_url =
svn_path_url_add_component2(iprops_ctx->repos_root_url,
- iprops_ctx->curr_path->data,
+ cdata->data,
iprops_ctx->pool);
- iprops_ctx->curr_iprop->prop_hash = apr_hash_make(iprops_ctx->pool);
- svn_ra_serf__xml_pop_state(parser);
}
- else if (state == IPROPS_PROPVAL
- && strcmp(name.name, SVN_DAV__IPROP_PROPVAL) == 0)
+ else if (leaving_state == IPROPS_PROPNAME)
{
- const svn_string_t *prop_val;
+ if (iprops_ctx->curr_propname->len)
+ return svn_error_create(SVN_ERR_XML_MALFORMED, NULL, NULL);
- if (iprops_ctx->curr_prop_val_encoding)
+ /* Store propname for value */
+ svn_stringbuf_set(iprops_ctx->curr_propname, cdata->data);
+ }
+ else if (leaving_state == IPROPS_PROPVAL)
+ {
+ const char *encoding;
+ const svn_string_t *val_str;
+
+ if (! iprops_ctx->curr_propname->len)
+ return svn_error_create(SVN_ERR_XML_MALFORMED, NULL, NULL);
+
+ encoding = svn_hash_gets(attrs, "V:encoding");
+
+ if (encoding)
{
- svn_string_t encoded_prop_val;
+ if (strcmp(encoding, "base64") != 0)
+ return svn_error_createf(SVN_ERR_XML_MALFORMED,
+ NULL,
+ _("Got unrecognized encoding '%s'"),
+ encoding);
- if (strcmp(iprops_ctx->curr_prop_val_encoding, "base64") != 0)
- return svn_error_create(SVN_ERR_XML_MALFORMED, NULL, NULL);
-
- encoded_prop_val.data = iprops_ctx->curr_propval->data;
- encoded_prop_val.len = iprops_ctx->curr_propval->len;
- prop_val = svn_base64_decode_string(&encoded_prop_val,
- iprops_ctx->pool);
+ /* Decode into the right pool. */
+ val_str = svn_base64_decode_string(cdata, iprops_ctx->pool);
}
else
{
- prop_val = svn_string_create_from_buf(iprops_ctx->curr_propval,
- iprops_ctx->pool);
+ /* Copy into the right pool. */
+ val_str = svn_string_dup(cdata, iprops_ctx->pool);
}
svn_hash_sets(iprops_ctx->curr_iprop->prop_hash,
apr_pstrdup(iprops_ctx->pool,
iprops_ctx->curr_propname->data),
- prop_val);
- /* Clear current propname and propval in the event there are
- multiple properties on the current path. */
+ val_str);
+ /* Clear current propname. */
svn_stringbuf_setempty(iprops_ctx->curr_propname);
- svn_stringbuf_setempty(iprops_ctx->curr_propval);
- svn_ra_serf__xml_pop_state(parser);
}
- else if (state == IPROPS_PROPNAME
- && strcmp(name.name, SVN_DAV__IPROP_PROPNAME) == 0)
- {
- svn_ra_serf__xml_pop_state(parser);
- }
- else if (state == IPROPS_ITEM
- && strcmp(name.name, SVN_DAV__IPROP_ITEM) == 0)
- {
- APR_ARRAY_PUSH(iprops_ctx->iprops, svn_prop_inherited_item_t *) =
- iprops_ctx->curr_iprop;
- svn_ra_serf__xml_pop_state(parser);
- }
- return SVN_NO_ERROR;
-}
+ else
+ SVN_ERR_MALFUNCTION(); /* Invalid transition table */
-
-static svn_error_t *
-cdata_handler(svn_ra_serf__xml_parser_t *parser,
- const char *data,
- apr_size_t len,
- apr_pool_t *scratch_pool)
-{
- iprops_context_t *iprops_ctx = parser->user_data;
- iprops_state_e state = parser->state->current_state;
-
- switch (state)
- {
- case IPROPS_PATH:
- svn_stringbuf_appendbytes(iprops_ctx->curr_path, data, len);
- break;
-
- case IPROPS_PROPNAME:
- svn_stringbuf_appendbytes(iprops_ctx->curr_propname, data, len);
- break;
-
- case IPROPS_PROPVAL:
- svn_stringbuf_appendbytes(iprops_ctx->curr_propval, data, len);
- break;
-
- default:
- break;
- }
-
return SVN_NO_ERROR;
}
@@ -281,7 +234,7 @@
iprops_context_t *iprops_ctx;
svn_ra_serf__session_t *session = ra_session->priv;
svn_ra_serf__handler_t *handler;
- svn_ra_serf__xml_parser_t *parser_ctx;
+ svn_ra_serf__xml_context_t *xmlctx;
const char *req_url;
SVN_ERR(svn_ra_serf__get_stable_url(&req_url,
@@ -295,12 +248,9 @@
SVN_ERR_ASSERT(session->repos_root_str);
iprops_ctx = apr_pcalloc(scratch_pool, sizeof(*iprops_ctx));
- iprops_ctx->done = FALSE;
iprops_ctx->repos_root_url = session->repos_root_str;
iprops_ctx->pool = result_pool;
- iprops_ctx->curr_path = svn_stringbuf_create_empty(scratch_pool);
iprops_ctx->curr_propname = svn_stringbuf_create_empty(scratch_pool);
- iprops_ctx->curr_propval = svn_stringbuf_create_empty(scratch_pool);
iprops_ctx->curr_iprop = NULL;
iprops_ctx->iprops = apr_array_make(result_pool, 1,
sizeof(svn_prop_inherited_item_t *));
@@ -307,7 +257,11 @@
iprops_ctx->path = path;
iprops_ctx->revision = revision;
- handler = apr_pcalloc(scratch_pool, sizeof(*handler));
+ xmlctx = svn_ra_serf__xml_context_create(iprops_table,
+ iprops_opened, iprops_closed, NULL,
+ iprops_ctx,
+ scratch_pool);
+ handler = svn_ra_serf__create_expat_handler(xmlctx, scratch_pool);
handler->method = "REPORT";
handler->path = req_url;
@@ -318,18 +272,6 @@
handler->body_type = "text/xml";
handler->handler_pool = scratch_pool;
- parser_ctx = apr_pcalloc(scratch_pool, sizeof(*parser_ctx));
-
- parser_ctx->pool = scratch_pool;
- parser_ctx->user_data = iprops_ctx;
- parser_ctx->start = start_element;
- parser_ctx->end = end_element;
- parser_ctx->cdata = cdata_handler;
- parser_ctx->done = &iprops_ctx->done;
-
- handler->response_handler = svn_ra_serf__handle_xml_parser;
- handler->response_baton = parser_ctx;
-
err = svn_ra_serf__context_run_one(handler, scratch_pool);
SVN_ERR(svn_error_compose_create(
svn_ra_serf__error_on_status(handler->sline,
@@ -337,8 +279,7 @@
handler->location),
err));
- if (iprops_ctx->done)
- *iprops = iprops_ctx->iprops;
+ *iprops = iprops_ctx->iprops;
return SVN_NO_ERROR;
}
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/locks.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/locks.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/locks.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -156,11 +156,20 @@
if (leaving_state == TIMEOUT)
{
- if (strcmp(cdata->data, "Infinite") == 0)
+ if (strcasecmp(cdata->data, "Infinite") == 0)
lock_ctx->lock->expiration_date = 0;
+ else if (strncasecmp(cdata->data, "Second-", 7) == 0)
+ {
+ unsigned n;
+ SVN_ERR(svn_cstring_atoui(&n, cdata->data+7));
+
+ lock_ctx->lock->expiration_date = apr_time_now() +
+ apr_time_from_sec(n);
+ }
else
- SVN_ERR(svn_time_from_cstring(&lock_ctx->lock->creation_date,
- cdata->data, lock_ctx->pool));
+ return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+ _("Invalid LOCK timeout value '%s'"),
+ cdata->data);
}
else if (leaving_state == HREF)
{
@@ -362,29 +371,30 @@
svn_ra_serf__get_lock(svn_ra_session_t *ra_session,
svn_lock_t **lock,
const char *path,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_ra_serf__session_t *session = ra_session->priv;
svn_ra_serf__handler_t *handler;
svn_ra_serf__xml_context_t *xmlctx;
+ apr_pool_t *scratch_pool = svn_pool_create(result_pool);
lock_info_t *lock_ctx;
const char *req_url;
svn_error_t *err;
- req_url = svn_path_url_add_component2(session->session_url.path, path, pool);
+ req_url = svn_path_url_add_component2(session->session_url.path, path,
+ scratch_pool);
- lock_ctx = apr_pcalloc(pool, sizeof(*lock_ctx));
-
- lock_ctx->pool = pool;
+ lock_ctx = apr_pcalloc(scratch_pool, sizeof(*lock_ctx));
+ lock_ctx->pool = result_pool;
lock_ctx->path = req_url;
- lock_ctx->lock = svn_lock_create(pool);
- lock_ctx->lock->path = apr_pstrdup(pool, path); /* be sure */
+ lock_ctx->lock = svn_lock_create(result_pool);
+ lock_ctx->lock->path = apr_pstrdup(result_pool, path);
xmlctx = svn_ra_serf__xml_context_create(locks_ttable,
NULL, locks_closed, NULL,
lock_ctx,
- pool);
- handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
+ scratch_pool);
+ handler = svn_ra_serf__create_expat_handler(xmlctx, scratch_pool);
handler->method = "PROPFIND";
handler->path = req_url;
@@ -405,7 +415,7 @@
lock_ctx->handler = handler;
- err = svn_ra_serf__context_run_one(handler, pool);
+ err = svn_ra_serf__context_run_one(handler, scratch_pool);
err = determine_error(handler, err);
if (handler->sline.code == 404)
@@ -420,8 +430,13 @@
_("Server does not support locking features"));
}
- *lock = lock_ctx->lock;
+ if (lock_ctx->lock && lock_ctx->lock->token)
+ *lock = lock_ctx->lock;
+ else
+ *lock = NULL;
+ svn_pool_destroy(scratch_pool);
+
return SVN_NO_ERROR;
}
@@ -574,7 +589,7 @@
{
SVN_ERR(svn_ra_serf__get_lock(ra_session, &existing_lock, path,
iterpool));
- token = existing_lock->token;
+ token = existing_lock ? existing_lock->token : NULL;
if (!token)
{
err = svn_error_createf(SVN_ERR_RA_NOT_LOCKED, NULL,
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/log.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/log.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/log.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -571,7 +571,7 @@
/* At this point, we may have a deleted file. So, we'll match ra_neon's
* behavior and use the larger of start or end as our 'peg' rev.
*/
- peg_rev = (start > end) ? start : end;
+ peg_rev = (start == SVN_INVALID_REVNUM || start > end) ? start : end;
SVN_ERR(svn_ra_serf__get_stable_url(&req_url, NULL /* latest_revnum */,
session, NULL /* conn */,
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/options.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/options.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/options.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -302,7 +302,7 @@
/* May contain multiple values, separated by commas. */
int i;
apr_array_header_t *vals = svn_cstring_split(val, ",", TRUE,
- opt_ctx->pool);
+ session->pool);
for (i = 0; i < vals->nelts; i++)
{
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -57,13 +57,6 @@
/** Use this to silence compiler warnings about unused parameters. */
#define UNUSED_CTX(x) ((void)(x))
-/** Our User-Agent string. */
-#define USER_AGENT "SVN/" SVN_VER_NUMBER " (" SVN_BUILD_TARGET ")" \
- " serf/" \
- APR_STRINGIFY(SERF_MAJOR_VERSION) "." \
- APR_STRINGIFY(SERF_MINOR_VERSION) "." \
- APR_STRINGIFY(SERF_PATCH_VERSION)
-
/** Wait duration (in microseconds) used in calls to serf_context_run() */
#define SVN_RA_SERF__CONTEXT_RUN_DURATION 500000
@@ -658,11 +651,6 @@
See libsvn_ra_serf/util.c */
struct svn_ra_serf__pending_t *pending;
-
- /* Response restart support */
- const void *headers_baton; /* Last pointer to headers */
- apr_off_t skip_size; /* Number of bytes to skip */
- apr_off_t read_size; /* Number of bytes read from response */
};
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/replay.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/replay.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/replay.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -90,8 +90,6 @@
typedef struct replay_context_t {
apr_pool_t *src_rev_pool;
apr_pool_t *dst_rev_pool;
- /*file_pool is cleared after completion of each file. */
- apr_pool_t *file_pool;
/* Are we done fetching this file? */
svn_boolean_t done;
@@ -147,10 +145,11 @@
state == OPEN_FILE || state == ADD_FILE)
{
replay_info_t *info;
+ apr_pool_t *pool = svn_pool_create(replay_ctx->dst_rev_pool);
- info = apr_palloc(replay_ctx->dst_rev_pool, sizeof(*info));
+ info = apr_palloc(pool, sizeof(*info));
- info->pool = replay_ctx->dst_rev_pool;
+ info->pool = pool;
info->parent = parser->state->private;
info->baton = NULL;
info->stream = NULL;
@@ -160,12 +159,13 @@
else if (state == CHANGE_PROP)
{
prop_info_t *info;
+ apr_pool_t *pool = svn_pool_create(replay_ctx->dst_rev_pool);
- info = apr_pcalloc(replay_ctx->dst_rev_pool, sizeof(*info));
+ info = apr_pcalloc(pool, sizeof(*info));
- info->pool = replay_ctx->dst_rev_pool;
+ info->pool = pool;
info->parent = parser->state->private;
- info->prop_value = svn_stringbuf_create_empty(info->pool);
+ info->prop_value = svn_stringbuf_create_empty(pool);
parser->state->private = info;
}
@@ -194,7 +194,6 @@
/* Create a pool for the commit editor. */
ctx->dst_rev_pool = svn_pool_create(ctx->src_rev_pool);
- ctx->file_pool = svn_pool_create(ctx->dst_rev_pool);
SVN_ERR(svn_ra_serf__select_revprops(&ctx->props,
ctx->revprop_target,
@@ -334,6 +333,8 @@
SVN_ERR(ctx->editor->close_directory(info->baton, scratch_pool));
svn_ra_serf__xml_pop_state(parser);
+
+ svn_pool_destroy(info->pool);
}
else if ((state == OPEN_DIR || state == ADD_DIR) &&
strcmp(name.name, "open-file") == 0)
@@ -341,7 +342,6 @@
const char *file_name, *rev;
replay_info_t *info;
- svn_pool_clear(ctx->file_pool);
file_name = svn_xml_get_attr_value("name", attrs);
if (!file_name)
{
@@ -359,7 +359,7 @@
SVN_ERR(ctx->editor->open_file(file_name, info->parent->baton,
SVN_STR_TO_REV(rev),
- ctx->file_pool, &info->baton));
+ info->pool, &info->baton));
}
else if ((state == OPEN_DIR || state == ADD_DIR) &&
strcmp(name.name, "add-file") == 0)
@@ -368,7 +368,6 @@
svn_revnum_t rev;
replay_info_t *info;
- svn_pool_clear(ctx->file_pool);
file_name = svn_xml_get_attr_value("name", attrs);
if (!file_name)
{
@@ -387,7 +386,7 @@
SVN_ERR(ctx->editor->add_file(file_name, info->parent->baton,
copyfrom, rev,
- ctx->file_pool, &info->baton));
+ info->pool, &info->baton));
}
else if ((state == OPEN_FILE || state == ADD_FILE) &&
strcmp(name.name, "apply-textdelta") == 0)
@@ -407,7 +406,7 @@
}
SVN_ERR(ctx->editor->apply_textdelta(info->baton, checksum,
- ctx->file_pool,
+ info->pool,
&textdelta,
&textdelta_baton));
@@ -426,6 +425,8 @@
SVN_ERR(ctx->editor->close_file(info->baton, checksum, scratch_pool));
svn_ra_serf__xml_pop_state(parser);
+
+ svn_pool_destroy(info->pool);
}
else if (((state == OPEN_FILE || state == ADD_FILE) &&
strcmp(name.name, "change-file-prop") == 0) ||
@@ -451,14 +452,13 @@
else
info->del_prop = FALSE;
+ info->name = apr_pstrdup(info->pool, prop_name);
if (state == OPEN_FILE || state == ADD_FILE)
{
- info->name = apr_pstrdup(ctx->file_pool, prop_name);
info->change = ctx->editor->change_file_prop;
}
else
{
- info->name = apr_pstrdup(ctx->dst_rev_pool, prop_name);
info->change = ctx->editor->change_dir_prop;
}
@@ -538,15 +538,14 @@
info->prop_value = NULL; /* morph killed the stringbuf. */
#endif
- if (strcmp(name.name, "change-file-prop") == 0)
- prop_val = svn_base64_decode_string(morph, ctx->file_pool);
- else
- prop_val = svn_base64_decode_string(morph, ctx->dst_rev_pool);
+ prop_val = svn_base64_decode_string(morph, info->pool);
}
SVN_ERR(info->change(info->parent->baton, info->name, prop_val,
info->parent->pool));
svn_ra_serf__xml_pop_state(parser);
+
+ svn_pool_destroy(info->pool);
}
return SVN_NO_ERROR;
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/serf.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/serf.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/serf.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -61,11 +61,18 @@
#define RA_SERF_DESCRIPTION \
N_("Module for accessing a repository via WebDAV protocol using serf.")
+#define RA_SERF_DESCRIPTION_VER \
+ N_("Module for accessing a repository via WebDAV protocol using serf.\n" \
+ " - using serf %d.%d.%d")
+
/* Implements svn_ra__vtable_t.get_description(). */
static const char *
-ra_serf_get_description(void)
+ra_serf_get_description(apr_pool_t *pool)
{
- return _(RA_SERF_DESCRIPTION);
+ int major, minor, patch;
+
+ serf_lib_version(&major, &minor, &patch);
+ return apr_psprintf(pool, _(RA_SERF_DESCRIPTION_VER), major, minor, patch);
}
/* Implements svn_ra__vtable_t.get_schemes(). */
@@ -413,6 +420,18 @@
}
}
+/** Our User-Agent string. */
+static const char *
+get_user_agent_string(apr_pool_t *pool)
+{
+ int major, minor, patch;
+ serf_lib_version(&major, &minor, &patch);
+
+ return apr_psprintf(pool, "SVN/%s (%s) serf/%d.%d.%d",
+ SVN_VER_NUMBER, SVN_BUILD_TARGET,
+ major, minor, patch);
+}
+
/* Implements svn_ra__vtable_t.open_session(). */
static svn_error_t *
svn_ra_serf__open(svn_ra_session_t *session,
@@ -495,10 +514,10 @@
SVN_ERR(callbacks->get_client_string(callback_baton, &client_string, pool));
if (client_string)
- serf_sess->useragent = apr_pstrcat(pool, USER_AGENT, " ",
+ serf_sess->useragent = apr_pstrcat(pool, get_user_agent_string(pool), " ",
client_string, (char *)NULL);
else
- serf_sess->useragent = USER_AGENT;
+ serf_sess->useragent = get_user_agent_string(pool);
/* go ahead and tell serf about the connection. */
status =
@@ -1260,7 +1279,7 @@
int serf_minor;
int serf_patch;
- SVN_ERR(svn_ver_check_list(ra_serf_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(ra_serf_version(), checklist, svn_ver_equal));
/* Simplified version check to make sure we can safely use the
VTABLE parameter. The RA loader does a more exhaustive check. */
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/update.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/update.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/update.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -329,9 +329,6 @@
files/dirs? */
svn_boolean_t add_props_included;
- /* Path -> lock token mapping. */
- apr_hash_t *lock_path_tokens;
-
/* Path -> const char *repos_relpath mapping */
apr_hash_t *switched_paths;
@@ -2248,8 +2245,6 @@
info->pool);
}
- info->lock_token = svn_hash_gets(ctx->lock_path_tokens, info->name);
-
if (info->lock_token && !info->fetch_props)
info->fetch_props = TRUE;
@@ -2578,13 +2573,6 @@
SVN_ERR(svn_io_file_write_full(report->body_file, buf->data, buf->len,
NULL, pool));
- if (lock_token)
- {
- svn_hash_sets(report->lock_path_tokens,
- apr_pstrdup(report->pool, path),
- apr_pstrdup(report->pool, lock_token));
- }
-
return SVN_NO_ERROR;
}
@@ -2660,12 +2648,6 @@
if (!*path)
report->root_is_switched = TRUE;
- if (lock_token)
- {
- svn_hash_sets(report->lock_path_tokens,
- path, apr_pstrdup(report->pool, lock_token));
- }
-
return APR_SUCCESS;
}
@@ -3193,7 +3175,6 @@
report->ignore_ancestry = ignore_ancestry;
report->send_copyfrom_args = send_copyfrom_args;
report->text_deltas = text_deltas;
- report->lock_path_tokens = apr_hash_make(report->pool);
report->switched_paths = apr_hash_make(report->pool);
report->source = src_path;
Modified: trunk/contrib/subversion/subversion/libsvn_ra_serf/util.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_serf/util.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_serf/util.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -28,7 +28,6 @@
#define APR_WANT_STRFUNC
#include <apr.h>
#include <apr_want.h>
-#include <apr_fnmatch.h>
#include <serf.h>
#include <serf_bucket_types.h>
@@ -48,6 +47,8 @@
#include "private/svn_dep_compat.h"
#include "private/svn_fspath.h"
#include "private/svn_subr_private.h"
+#include "private/svn_auth_private.h"
+#include "private/svn_cert.h"
#include "ra_serf.h"
@@ -191,15 +192,67 @@
static char *
convert_organisation_to_str(apr_hash_t *org, apr_pool_t *pool)
{
- return apr_psprintf(pool, "%s, %s, %s, %s, %s (%s)",
- (char*)svn_hash_gets(org, "OU"),
- (char*)svn_hash_gets(org, "O"),
- (char*)svn_hash_gets(org, "L"),
- (char*)svn_hash_gets(org, "ST"),
- (char*)svn_hash_gets(org, "C"),
- (char*)svn_hash_gets(org, "E"));
+ const char *org_unit = svn_hash_gets(org, "OU");
+ const char *org_name = svn_hash_gets(org, "O");
+ const char *locality = svn_hash_gets(org, "L");
+ const char *state = svn_hash_gets(org, "ST");
+ const char *country = svn_hash_gets(org, "C");
+ const char *email = svn_hash_gets(org, "E");
+ svn_stringbuf_t *buf = svn_stringbuf_create_empty(pool);
+
+ if (org_unit)
+ {
+ svn_stringbuf_appendcstr(buf, org_unit);
+ svn_stringbuf_appendcstr(buf, ", ");
+ }
+
+ if (org_name)
+ {
+ svn_stringbuf_appendcstr(buf, org_name);
+ svn_stringbuf_appendcstr(buf, ", ");
+ }
+
+ if (locality)
+ {
+ svn_stringbuf_appendcstr(buf, locality);
+ svn_stringbuf_appendcstr(buf, ", ");
+ }
+
+ if (state)
+ {
+ svn_stringbuf_appendcstr(buf, state);
+ svn_stringbuf_appendcstr(buf, ", ");
+ }
+
+ if (country)
+ {
+ svn_stringbuf_appendcstr(buf, country);
+ svn_stringbuf_appendcstr(buf, ", ");
+ }
+
+ /* Chop ', ' if any. */
+ svn_stringbuf_chop(buf, 2);
+
+ if (email)
+ {
+ svn_stringbuf_appendcstr(buf, "(");
+ svn_stringbuf_appendcstr(buf, email);
+ svn_stringbuf_appendcstr(buf, ")");
+ }
+
+ return buf->data;
}
+static void append_reason(svn_stringbuf_t *errmsg, const char *reason, int *reasons)
+{
+ if (*reasons < 1)
+ svn_stringbuf_appendcstr(errmsg, _(": "));
+ else
+ svn_stringbuf_appendcstr(errmsg, _(", "));
+ svn_stringbuf_appendcstr(errmsg, reason);
+ (*reasons)++;
+}
+
/* This function is called on receiving a ssl certificate of a server when
opening a https connection. It allows Subversion to override the initial
validation done by serf.
@@ -217,26 +270,87 @@
svn_auth_iterstate_t *state;
const char *realmstring;
apr_uint32_t svn_failures;
- apr_hash_t *issuer, *subject, *serf_cert;
- apr_array_header_t *san;
+ apr_hash_t *issuer;
+ apr_hash_t *subject = NULL;
+ apr_hash_t *serf_cert = NULL;
void *creds;
- int found_matching_hostname = 0;
- /* Implicitly approve any non-server certs. */
- if (serf_ssl_cert_depth(cert) > 0)
+ svn_failures = (ssl_convert_serf_failures(failures)
+ | conn->server_cert_failures);
+
+ if (serf_ssl_cert_depth(cert) == 0)
{
- if (failures)
- conn->server_cert_failures |= ssl_convert_serf_failures(failures);
- return APR_SUCCESS;
+ /* If the depth is 0, the hostname must match the certificate.
+
+ ### This should really be handled by serf, which should pass an error
+ for this case, but that has backwards compatibility issues. */
+ apr_array_header_t *san;
+ svn_boolean_t found_san_entry = FALSE;
+ svn_boolean_t found_matching_hostname = FALSE;
+ svn_string_t *actual_hostname =
+ svn_string_create(conn->session->session_url.hostname, scratch_pool);
+
+ serf_cert = serf_ssl_cert_certificate(cert, scratch_pool);
+
+ san = svn_hash_gets(serf_cert, "subjectAltName");
+ /* Try to find matching server name via subjectAltName first... */
+ if (san)
+ {
+ int i;
+ found_san_entry = san->nelts > 0;
+ for (i = 0; i < san->nelts; i++)
+ {
+ const char *s = APR_ARRAY_IDX(san, i, const char*);
+ svn_string_t *cert_hostname = svn_string_create(s, scratch_pool);
+
+ if (svn_cert__match_dns_identity(cert_hostname, actual_hostname))
+ {
+ found_matching_hostname = TRUE;
+ break;
+ }
+ }
+ }
+
+ /* Match server certificate CN with the hostname of the server iff
+ * we didn't find any subjectAltName fields and try to match them.
+ * Per RFC 2818 they are authoritative if present and CommonName
+ * should be ignored. */
+ if (!found_matching_hostname && !found_san_entry)
+ {
+ const char *hostname = NULL;
+
+ subject = serf_ssl_cert_subject(cert, scratch_pool);
+
+ if (subject)
+ hostname = svn_hash_gets(subject, "CN");
+
+ if (hostname)
+ {
+ svn_string_t *cert_hostname = svn_string_create(hostname,
+ scratch_pool);
+
+ if (svn_cert__match_dns_identity(cert_hostname, actual_hostname))
+ {
+ found_matching_hostname = TRUE;
+ }
+ }
+ }
+
+ if (!found_matching_hostname)
+ svn_failures |= SVN_AUTH_SSL_CNMISMATCH;
}
+ if (!svn_failures)
+ return SVN_NO_ERROR;
+
/* Extract the info from the certificate */
- subject = serf_ssl_cert_subject(cert, scratch_pool);
+ if (! subject)
+ subject = serf_ssl_cert_subject(cert, scratch_pool);
issuer = serf_ssl_cert_issuer(cert, scratch_pool);
- serf_cert = serf_ssl_cert_certificate(cert, scratch_pool);
+ if (! serf_cert)
+ serf_cert = serf_ssl_cert_certificate(cert, scratch_pool);
cert_info.hostname = svn_hash_gets(subject, "CN");
- san = svn_hash_gets(serf_cert, "subjectAltName");
cert_info.fingerprint = svn_hash_gets(serf_cert, "sha1");
if (! cert_info.fingerprint)
cert_info.fingerprint = apr_pstrdup(scratch_pool, "<unknown>");
@@ -249,31 +363,56 @@
cert_info.issuer_dname = convert_organisation_to_str(issuer, scratch_pool);
cert_info.ascii_cert = serf_ssl_cert_export(cert, scratch_pool);
- svn_failures = (ssl_convert_serf_failures(failures)
- | conn->server_cert_failures);
+ /* Handle any non-server certs. */
+ if (serf_ssl_cert_depth(cert) > 0)
+ {
+ svn_error_t *err;
- /* Try to find matching server name via subjectAltName first... */
- if (san) {
- int i;
- for (i = 0; i < san->nelts; i++) {
- char *s = APR_ARRAY_IDX(san, i, char*);
- if (apr_fnmatch(s, conn->session->session_url.hostname,
- APR_FNM_PERIOD) == APR_SUCCESS) {
- found_matching_hostname = 1;
- cert_info.hostname = s;
- break;
- }
- }
- }
+ svn_auth_set_parameter(conn->session->wc_callbacks->auth_baton,
+ SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO,
+ &cert_info);
- /* Match server certificate CN with the hostname of the server */
- if (!found_matching_hostname && cert_info.hostname)
- {
- if (apr_fnmatch(cert_info.hostname, conn->session->session_url.hostname,
- APR_FNM_PERIOD) == APR_FNM_NOMATCH)
+ svn_auth_set_parameter(conn->session->wc_callbacks->auth_baton,
+ SVN_AUTH_PARAM_SSL_SERVER_FAILURES,
+ &svn_failures);
+
+ realmstring = apr_psprintf(scratch_pool, "AUTHORITY:%s",
+ cert_info.fingerprint);
+
+ err = svn_auth_first_credentials(&creds, &state,
+ SVN_AUTH_CRED_SSL_SERVER_AUTHORITY,
+ realmstring,
+ conn->session->wc_callbacks->auth_baton,
+ scratch_pool);
+
+ svn_auth_set_parameter(conn->session->wc_callbacks->auth_baton,
+ SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO, NULL);
+
+ svn_auth_set_parameter(conn->session->wc_callbacks->auth_baton,
+ SVN_AUTH_PARAM_SSL_SERVER_FAILURES, NULL);
+
+ if (err)
{
- svn_failures |= SVN_AUTH_SSL_CNMISMATCH;
+ if (err->apr_err != SVN_ERR_AUTHN_NO_PROVIDER)
+ return svn_error_trace(err);
+
+ /* No provider registered that handles server authorities */
+ svn_error_clear(err);
+ creds = NULL;
}
+
+ if (creds)
+ {
+ server_creds = creds;
+ SVN_ERR(svn_auth_save_credentials(state, scratch_pool));
+
+ svn_failures &= ~server_creds->accepted_failures;
+ }
+
+ if (svn_failures)
+ conn->server_cert_failures |= svn_failures;
+
+ return APR_SUCCESS;
}
svn_auth_set_parameter(conn->session->wc_callbacks->auth_baton,
@@ -294,15 +433,57 @@
if (creds)
{
server_creds = creds;
+ svn_failures &= ~server_creds->accepted_failures;
SVN_ERR(svn_auth_save_credentials(state, scratch_pool));
}
+ while (svn_failures && creds)
+ {
+ SVN_ERR(svn_auth_next_credentials(&creds, state, scratch_pool));
+
+ if (creds)
+ {
+ server_creds = creds;
+ svn_failures &= ~server_creds->accepted_failures;
+ SVN_ERR(svn_auth_save_credentials(state, scratch_pool));
+ }
+ }
+
svn_auth_set_parameter(conn->session->wc_callbacks->auth_baton,
SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO, NULL);
- if (!server_creds)
- return svn_error_create(SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED, NULL, NULL);
+ /* Are there non accepted failures left? */
+ if (svn_failures)
+ {
+ svn_stringbuf_t *errmsg;
+ int reasons = 0;
+ errmsg = svn_stringbuf_create(
+ _("Server SSL certificate verification failed"),
+ scratch_pool);
+
+
+ if (svn_failures & SVN_AUTH_SSL_NOTYETVALID)
+ append_reason(errmsg, _("certificate is not yet valid"), &reasons);
+
+ if (svn_failures & SVN_AUTH_SSL_EXPIRED)
+ append_reason(errmsg, _("certificate has expired"), &reasons);
+
+ if (svn_failures & SVN_AUTH_SSL_CNMISMATCH)
+ append_reason(errmsg,
+ _("certificate issued for a different hostname"),
+ &reasons);
+
+ if (svn_failures & SVN_AUTH_SSL_UNKNOWNCA)
+ append_reason(errmsg, _("issuer is not trusted"), &reasons);
+
+ if (svn_failures & SVN_AUTH_SSL_OTHER)
+ append_reason(errmsg, _("and other reason(s)"), &reasons);
+
+ return svn_error_create(SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED, NULL,
+ errmsg->data);
+ }
+
return SVN_NO_ERROR;
}
@@ -746,8 +927,6 @@
the connection timed out. */
if (APR_STATUS_IS_TIMEUP(status))
{
- svn_error_clear(err);
- err = SVN_NO_ERROR;
status = 0;
if (sess->timeout)
@@ -758,8 +937,11 @@
}
else
{
- return svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
- _("Connection timed out"));
+ return
+ svn_error_compose_create(
+ err,
+ svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
+ _("Connection timed out")));
}
}
}
@@ -805,6 +987,23 @@
/* Wait until the response logic marks its DONE status. */
err = svn_ra_serf__context_run_wait(&handler->done, handler->session,
scratch_pool);
+
+ /* A callback invocation has been canceled. In this simple case of
+ context_run_one, we can keep the ra-session operational by resetting
+ the connection.
+
+ If we don't do this, the next context run will notice that the connection
+ is still in the error state and will just return SVN_ERR_CEASE_INVOCATION
+ (=the last error for the connection) again */
+ if (err && err->apr_err == SVN_ERR_CEASE_INVOCATION)
+ {
+ apr_status_t status = serf_connection_reset(handler->conn->conn);
+
+ if (status)
+ err = svn_error_compose_create(err,
+ svn_ra_serf__wrap_err(status, NULL));
+ }
+
if (handler->server_error)
{
err = svn_error_compose_create(err, handler->server_error->error);
@@ -1388,19 +1587,22 @@
int xml_status;
xml_status = XML_Parse(ctx->xmlp, data, (int) len, 0);
- if (xml_status == XML_STATUS_ERROR && !ctx->ignore_errors)
+
+ if (! ctx->ignore_errors)
{
- if (sl == NULL)
- return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
- _("XML parsing failed"));
+ SVN_ERR(ctx->error);
- return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
- _("XML parsing failed: (%d %s)"),
- sl->code, sl->reason);
- }
+ if (xml_status != XML_STATUS_OK)
+ {
+ if (sl == NULL)
+ return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+ _("XML parsing failed"));
- if (ctx->error && !ctx->ignore_errors)
- return svn_error_trace(ctx->error);
+ return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+ _("XML parsing failed: (%d %s)"),
+ sl->code, sl->reason);
+ }
+ }
return SVN_NO_ERROR;
}
@@ -1481,14 +1683,26 @@
if (pending_empty &&
parser->pending->network_eof)
{
+ int xml_status;
SVN_ERR_ASSERT(parser->xmlp != NULL);
- /* Tell the parser that no more content will be parsed. Ignore the
- return status. We just don't care. */
- (void) XML_Parse(parser->xmlp, NULL, 0, 1);
+ /* Tell the parser that no more content will be parsed. */
+ xml_status = XML_Parse(parser->xmlp, NULL, 0, 1);
apr_pool_cleanup_run(parser->pool, &parser->xmlp, xml_parser_cleanup);
parser->xmlp = NULL;
+
+ if (! parser->ignore_errors)
+ {
+ SVN_ERR(parser->error);
+
+ if (xml_status != XML_STATUS_OK)
+ {
+ return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+ _("XML parsing failed"));
+ }
+ }
+
add_done_item(parser);
}
@@ -1588,22 +1802,6 @@
return svn_error_trace(err);
}
- if (ctx->headers_baton == NULL)
- ctx->headers_baton = serf_bucket_response_get_headers(response);
- else if (ctx->headers_baton != serf_bucket_response_get_headers(response))
- {
- /* We got a new response to an existing parser...
- This tells us the connection has restarted and we should continue
- where we stopped last time.
- */
-
- /* Is this a second attempt?? */
- if (!ctx->skip_size)
- ctx->skip_size = ctx->read_size;
-
- ctx->read_size = 0; /* New request, nothing read */
- }
-
if (!ctx->xmlp)
{
ctx->xmlp = XML_ParserCreate(NULL);
@@ -1623,41 +1821,11 @@
apr_size_t len;
status = serf_bucket_read(response, PARSE_CHUNK_SIZE, &data, &len);
-
if (SERF_BUCKET_READ_ERROR(status))
{
return svn_ra_serf__wrap_err(status, NULL);
}
- ctx->read_size += len;
-
- if (ctx->skip_size)
- {
- /* Handle restarted requests correctly: Skip what we already read */
- apr_size_t skip;
-
- if (ctx->skip_size >= ctx->read_size)
- {
- /* Eek. What did the file shrink or something? */
- if (APR_STATUS_IS_EOF(status))
- {
- SVN_ERR_MALFUNCTION();
- }
-
- /* Skip on to the next iteration of this loop. */
- if (APR_STATUS_IS_EAGAIN(status))
- {
- return svn_ra_serf__wrap_err(status, NULL);
- }
- continue;
- }
-
- skip = (apr_size_t)(len - (ctx->read_size - ctx->skip_size));
- data += skip;
- len -= skip;
- ctx->skip_size = 0;
- }
-
/* Note: once the callbacks invoked by inject_to_parser() sets the
PAUSED flag, then it will not be cleared. write_to_pending() will
only save the content. Logic outside of serf_context_run() will
@@ -1703,12 +1871,25 @@
in the PENDING structures, then we're completely done. */
if (!HAS_PENDING_DATA(ctx->pending))
{
+ int xml_status;
SVN_ERR_ASSERT(ctx->xmlp != NULL);
- /* Ignore the return status. We just don't care. */
- (void) XML_Parse(ctx->xmlp, NULL, 0, 1);
+ xml_status = XML_Parse(ctx->xmlp, NULL, 0, 1);
apr_pool_cleanup_run(ctx->pool, &ctx->xmlp, xml_parser_cleanup);
+
+ if (! ctx->ignore_errors)
+ {
+ SVN_ERR(ctx->error);
+
+ if (xml_status != XML_STATUS_OK)
+ {
+ return svn_error_create(
+ SVN_ERR_XML_MALFORMED, NULL,
+ _("The XML response contains invalid XML"));
+ }
+ }
+
add_done_item(ctx);
}
@@ -1828,12 +2009,26 @@
{
/* Uh-oh. Our connection died. */
if (handler->response_error)
- SVN_ERR(handler->response_error(request, response, 0,
- handler->response_error_baton));
+ {
+ /* Give a handler chance to prevent request requeue. */
+ SVN_ERR(handler->response_error(request, response, 0,
+ handler->response_error_baton));
- /* Requeue another request for this handler.
- ### how do we know if the handler can deal with this?! */
- svn_ra_serf__request_create(handler);
+ svn_ra_serf__request_create(handler);
+ }
+ /* Response error callback is not configured. Requeue another request
+ for this handler only if we didn't started to process body.
+ Return error otherwise. */
+ else if (!handler->reading_body)
+ {
+ svn_ra_serf__request_create(handler);
+ }
+ else
+ {
+ return svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
+ _("%s request on '%s' failed"),
+ handler->method, handler->path);
+ }
return SVN_NO_ERROR;
}
@@ -2417,6 +2612,10 @@
"server or an intermediate proxy does not accept "
"chunked encoding. Try setting 'http-chunked-requests' "
"to 'auto' or 'no' in your client configuration."));
+ case 501:
+ return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+ _("The requested feature is not supported by "
+ "'%s'"), path);
}
if (sline.code >= 300)
Modified: trunk/contrib/subversion/subversion/libsvn_ra_svn/client.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_svn/client.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_svn/client.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -50,6 +50,7 @@
#include "svn_private_config.h"
#include "private/svn_fspath.h"
+#include "private/svn_subr_private.h"
#include "../libsvn_ra/ra_loader.h"
@@ -701,7 +702,7 @@
N_("Module for accessing a repository using the svn network protocol.")
#endif
-static const char *ra_svn_get_description(void)
+static const char *ra_svn_get_description(apr_pool_t *pool)
{
return _(RA_SVN_DESCRIPTION);
}
@@ -2775,7 +2776,7 @@
{ NULL, NULL }
};
- SVN_ERR(svn_ver_check_list(svn_ra_svn_version(), checklist));
+ SVN_ERR(svn_ver_check_list2(svn_ra_svn_version(), checklist, svn_ver_equal));
/* Simplified version check to make sure we can safely use the
VTABLE parameter. The RA loader does a more exhaustive check. */
Modified: trunk/contrib/subversion/subversion/libsvn_ra_svn/protocol
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_ra_svn/protocol 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_ra_svn/protocol 2017-02-20 02:39:09 UTC (rev 9266)
@@ -310,6 +310,7 @@
sends file contents as a series of strings, terminated by the empty
string, followed by a second empty command response to indicate
whether an error occurred during the sending of the file.
+ NOTE: the standard client never sends want-iprops, it uses get-iprops.
get-dir
params: ( path:string [ rev:number ] want-props:bool want-contents:bool
@@ -321,6 +322,7 @@
[ last-author:string ] )
dirent-field: kind | size | has-props | created-rev | time | last-author
| word
+ NOTE: the standard client never sends want-iprops, it uses get-iprops.
check-path
params: ( path:string [ rev:number ] )
Modified: trunk/contrib/subversion/subversion/libsvn_repos/commit.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_repos/commit.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_repos/commit.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -761,6 +761,13 @@
if (SVN_IS_VALID_REVNUM(new_revision))
{
+ /* The actual commit succeeded, i.e. the transaction does no longer
+ exist and we can't use txn_root for conflict resolution etc.
+
+ Since close_edit is supposed to release resources, do it now. */
+ if (eb->txn_root)
+ svn_fs_close_root(eb->txn_root);
+
if (err)
{
/* If the error was in post-commit, then the commit itself
@@ -821,6 +828,10 @@
eb->txn_aborted = TRUE;
+ /* Since abort_edit is supposed to release resources, do it now. */
+ if (eb->txn_root)
+ svn_fs_close_root(eb->txn_root);
+
return svn_error_trace(svn_fs_abort_txn(eb->txn, pool));
}
Modified: trunk/contrib/subversion/subversion/libsvn_repos/dump.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_repos/dump.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_repos/dump.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -217,6 +217,49 @@
}
+/* If the mergeinfo in MERGEINFO_STR refers to any revisions older than
+ * OLDEST_DUMPED_REV, issue a warning and set *FOUND_OLD_MERGEINFO to TRUE,
+ * otherwise leave *FOUND_OLD_MERGEINFO unchanged.
+ */
+static svn_error_t *
+verify_mergeinfo_revisions(svn_boolean_t *found_old_mergeinfo,
+ const char *mergeinfo_str,
+ svn_revnum_t oldest_dumped_rev,
+ svn_repos_notify_func_t notify_func,
+ void *notify_baton,
+ apr_pool_t *pool)
+{
+ svn_mergeinfo_t mergeinfo, old_mergeinfo;
+
+ SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_str, pool));
+ SVN_ERR(svn_mergeinfo__filter_mergeinfo_by_ranges(
+ &old_mergeinfo, mergeinfo,
+ oldest_dumped_rev - 1, 0,
+ TRUE, pool, pool));
+
+ if (apr_hash_count(old_mergeinfo))
+ {
+ svn_repos_notify_t *notify =
+ svn_repos_notify_create(svn_repos_notify_warning, pool);
+
+ notify->warning = svn_repos_notify_warning_found_old_mergeinfo;
+ notify->warning_str = apr_psprintf(
+ pool,
+ _("Mergeinfo referencing revision(s) prior "
+ "to the oldest dumped revision (r%ld). "
+ "Loading this dump may result in invalid "
+ "mergeinfo."),
+ oldest_dumped_rev);
+
+ if (found_old_mergeinfo)
+ *found_old_mergeinfo = TRUE;
+ notify_func(notify_baton, notify, pool);
+ }
+
+ return SVN_NO_ERROR;
+}
+
+
/* This helper is the main "meat" of the editor -- it does all the
work of writing a node record.
@@ -475,32 +518,13 @@
SVN_PROP_MERGEINFO);
if (mergeinfo_str)
{
- svn_mergeinfo_t mergeinfo, old_mergeinfo;
-
- SVN_ERR(svn_mergeinfo_parse(&mergeinfo, mergeinfo_str->data,
- pool));
- SVN_ERR(svn_mergeinfo__filter_mergeinfo_by_ranges(
- &old_mergeinfo, mergeinfo,
- eb->oldest_dumped_rev - 1, 0,
- TRUE, pool, pool));
- if (apr_hash_count(old_mergeinfo))
- {
- svn_repos_notify_t *notify =
- svn_repos_notify_create(svn_repos_notify_warning, pool);
-
- notify->warning = svn_repos_notify_warning_found_old_mergeinfo;
- notify->warning_str = apr_psprintf(
- pool,
- _("Mergeinfo referencing revision(s) prior "
- "to the oldest dumped revision (r%ld). "
- "Loading this dump may result in invalid "
- "mergeinfo."),
- eb->oldest_dumped_rev);
-
- if (eb->found_old_mergeinfo)
- *eb->found_old_mergeinfo = TRUE;
- eb->notify_func(eb->notify_baton, notify, pool);
- }
+ /* An error in verifying the mergeinfo must not prevent dumping
+ the data. Ignore any such error. */
+ svn_error_clear(verify_mergeinfo_revisions(
+ eb->found_old_mergeinfo,
+ mergeinfo_str->data, eb->oldest_dumped_rev,
+ eb->notify_func, eb->notify_baton,
+ pool));
}
}
Modified: trunk/contrib/subversion/subversion/libsvn_repos/fs-wrap.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_repos/fs-wrap.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_repos/fs-wrap.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -117,6 +117,8 @@
const char *txn_name;
svn_string_t *author = svn_hash_gets(revprop_table, SVN_PROP_REVISION_AUTHOR);
apr_hash_t *hooks_env;
+ svn_error_t *err;
+ svn_fs_txn_t *txn;
/* Parse the hooks-env file (if any). */
SVN_ERR(svn_repos__parse_hooks_env(&hooks_env, repos->hooks_env_path,
@@ -124,21 +126,30 @@
/* Begin the transaction, ask for the fs to do on-the-fly lock checks.
We fetch its name, too, so the start-commit hook can use it. */
- SVN_ERR(svn_fs_begin_txn2(txn_p, repos->fs, rev,
+ SVN_ERR(svn_fs_begin_txn2(&txn, repos->fs, rev,
SVN_FS_TXN_CHECK_LOCKS, pool));
- SVN_ERR(svn_fs_txn_name(&txn_name, *txn_p, pool));
+ err = svn_fs_txn_name(&txn_name, txn, pool);
+ if (err)
+ return svn_error_compose_create(err, svn_fs_abort_txn(txn, pool));
/* We pass the revision properties to the filesystem by adding them
as properties on the txn. Later, when we commit the txn, these
properties will be copied into the newly created revision. */
revprops = svn_prop_hash_to_array(revprop_table, pool);
- SVN_ERR(svn_repos_fs_change_txn_props(*txn_p, revprops, pool));
+ err = svn_repos_fs_change_txn_props(txn, revprops, pool);
+ if (err)
+ return svn_error_compose_create(err, svn_fs_abort_txn(txn, pool));
/* Run start-commit hooks. */
- SVN_ERR(svn_repos__hooks_start_commit(repos, hooks_env,
- author ? author->data : NULL,
- repos->client_capabilities, txn_name,
- pool));
+ err = svn_repos__hooks_start_commit(repos, hooks_env,
+ author ? author->data : NULL,
+ repos->client_capabilities, txn_name,
+ pool);
+ if (err)
+ return svn_error_compose_create(err, svn_fs_abort_txn(txn, pool));
+
+ /* We have API promise that *TXN_P is unaffected on faulure. */
+ *txn_p = txn;
return SVN_NO_ERROR;
}
Modified: trunk/contrib/subversion/subversion/libsvn_repos/reporter.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_repos/reporter.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_repos/reporter.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1143,7 +1143,8 @@
svn_fs_root_t *s_root;
apr_hash_t *s_entries = NULL, *t_entries;
apr_hash_index_t *hi;
- apr_pool_t *subpool;
+ apr_pool_t *subpool = svn_pool_create(pool);
+ apr_pool_t *iterpool;
const char *name, *s_fullpath, *t_fullpath, *e_fullpath;
path_info_t *info;
@@ -1152,7 +1153,8 @@
When we support directory locks, we must pass the lock token here. */
SVN_ERR(delta_proplists(b, s_rev, start_empty ? NULL : s_path, t_path,
- NULL, change_dir_prop, dir_baton, pool));
+ NULL, change_dir_prop, dir_baton, subpool));
+ svn_pool_clear(subpool);
if (requested_depth > svn_depth_empty
|| requested_depth == svn_depth_unknown)
@@ -1161,19 +1163,19 @@
if (s_path && !start_empty)
{
SVN_ERR(get_source_root(b, &s_root, s_rev));
- SVN_ERR(svn_fs_dir_entries(&s_entries, s_root, s_path, pool));
+ SVN_ERR(svn_fs_dir_entries(&s_entries, s_root, s_path, subpool));
}
- SVN_ERR(svn_fs_dir_entries(&t_entries, b->t_root, t_path, pool));
+ SVN_ERR(svn_fs_dir_entries(&t_entries, b->t_root, t_path, subpool));
/* Iterate over the report information for this directory. */
- subpool = svn_pool_create(pool);
+ iterpool = svn_pool_create(pool);
while (1)
{
const svn_fs_dirent_t *s_entry, *t_entry;
- svn_pool_clear(subpool);
- SVN_ERR(fetch_path_info(b, &name, &info, e_path, subpool));
+ svn_pool_clear(iterpool);
+ SVN_ERR(fetch_path_info(b, &name, &info, e_path, iterpool));
if (!name)
break;
@@ -1193,10 +1195,10 @@
continue;
}
- e_fullpath = svn_relpath_join(e_path, name, subpool);
- t_fullpath = svn_fspath__join(t_path, name, subpool);
+ e_fullpath = svn_relpath_join(e_path, name, iterpool);
+ t_fullpath = svn_fspath__join(t_path, name, iterpool);
t_entry = svn_hash_gets(t_entries, name);
- s_fullpath = s_path ? svn_fspath__join(s_path, name, subpool) : NULL;
+ s_fullpath = s_path ? svn_fspath__join(s_path, name, iterpool) : NULL;
s_entry = s_entries ?
svn_hash_gets(s_entries, name) : NULL;
@@ -1216,7 +1218,7 @@
t_entry, dir_baton, e_fullpath, info,
info ? info->depth
: DEPTH_BELOW_HERE(wc_depth),
- DEPTH_BELOW_HERE(requested_depth), subpool));
+ DEPTH_BELOW_HERE(requested_depth), iterpool));
/* Don't revisit this name in the target or source entries. */
svn_hash_sets(t_entries, name, NULL);
@@ -1236,13 +1238,13 @@
target, for graceful handling of case-only renames. */
if (s_entries)
{
- for (hi = apr_hash_first(pool, s_entries);
+ for (hi = apr_hash_first(subpool, s_entries);
hi;
hi = apr_hash_next(hi))
{
const svn_fs_dirent_t *s_entry;
- svn_pool_clear(subpool);
+ svn_pool_clear(iterpool);
s_entry = svn__apr_hash_index_val(hi);
if (svn_hash_gets(t_entries, s_entry->name) == NULL)
@@ -1259,27 +1261,29 @@
continue;
/* There is no corresponding target entry, so delete. */
- e_fullpath = svn_relpath_join(e_path, s_entry->name, subpool);
+ e_fullpath = svn_relpath_join(e_path, s_entry->name, iterpool);
SVN_ERR(svn_repos_deleted_rev(svn_fs_root_fs(b->t_root),
svn_fspath__join(t_path,
s_entry->name,
- subpool),
+ iterpool),
s_rev, b->t_rev,
- &deleted_rev, subpool));
+ &deleted_rev, iterpool));
SVN_ERR(b->editor->delete_entry(e_fullpath,
deleted_rev,
- dir_baton, subpool));
+ dir_baton, iterpool));
}
}
}
/* Loop over the dirents in the target. */
- for (hi = apr_hash_first(pool, t_entries); hi; hi = apr_hash_next(hi))
+ for (hi = apr_hash_first(subpool, t_entries);
+ hi;
+ hi = apr_hash_next(hi))
{
const svn_fs_dirent_t *s_entry, *t_entry;
- svn_pool_clear(subpool);
+ svn_pool_clear(iterpool);
t_entry = svn__apr_hash_index_val(hi);
if (is_depth_upgrade(wc_depth, requested_depth, t_entry->kind))
@@ -1307,24 +1311,27 @@
svn_hash_gets(s_entries, t_entry->name)
: NULL;
s_fullpath = s_entry ?
- svn_fspath__join(s_path, t_entry->name, subpool) : NULL;
+ svn_fspath__join(s_path, t_entry->name, iterpool) : NULL;
}
/* Compose the report, editor, and target paths for this entry. */
- e_fullpath = svn_relpath_join(e_path, t_entry->name, subpool);
- t_fullpath = svn_fspath__join(t_path, t_entry->name, subpool);
+ e_fullpath = svn_relpath_join(e_path, t_entry->name, iterpool);
+ t_fullpath = svn_fspath__join(t_path, t_entry->name, iterpool);
SVN_ERR(update_entry(b, s_rev, s_fullpath, s_entry, t_fullpath,
t_entry, dir_baton, e_fullpath, NULL,
DEPTH_BELOW_HERE(wc_depth),
DEPTH_BELOW_HERE(requested_depth),
- subpool));
+ iterpool));
}
/* Destroy iteration subpool. */
- svn_pool_destroy(subpool);
+ svn_pool_destroy(iterpool);
}
+
+ svn_pool_destroy(subpool);
+
return SVN_NO_ERROR;
}
Modified: trunk/contrib/subversion/subversion/libsvn_subr/auth.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/auth.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/auth.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -35,7 +35,9 @@
#include "svn_private_config.h"
#include "svn_dso.h"
#include "svn_version.h"
+#include "private/svn_auth_private.h"
#include "private/svn_dep_compat.h"
+#include "private/svn_subr_private.h"
#include "auth.h"
@@ -478,7 +480,8 @@
check_list[0].version_query = version_function;
check_list[1].label = NULL;
check_list[1].version_query = NULL;
- SVN_ERR(svn_ver_check_list(svn_subr_version(), check_list));
+ SVN_ERR(svn_ver_check_list2(svn_subr_version(), check_list,
+ svn_ver_equal));
}
if (apr_dso_sym(&provider_function_symbol,
dso,
@@ -538,6 +541,11 @@
{
svn_auth_get_windows_ssl_server_trust_provider(provider, pool);
}
+ else if (strcmp(provider_name, "windows") == 0 &&
+ strcmp(provider_type, "ssl_server_authority") == 0)
+ {
+ svn_auth__get_windows_ssl_server_authority_provider(provider, pool);
+ }
#endif
}
Modified: trunk/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -422,7 +422,7 @@
*/
apr_uint64_t current_data;
- /* Total number of data buffer bytes in use. This is for statistics only.
+ /* Total number of data buffer bytes in use.
*/
apr_uint64_t data_used;
@@ -1374,7 +1374,11 @@
* the old spot, just re-use that space. */
if (entry && ALIGN_VALUE(entry->size) >= size && buffer)
{
- cache->data_used += size - entry->size;
+ /* Careful! We need to cast SIZE to the full width of CACHE->DATA_USED
+ * lest we run into trouble with 32 bit underflow *not* treated as a
+ * negative value.
+ */
+ cache->data_used += (apr_uint64_t)size - entry->size;
entry->size = size;
#ifdef SVN_DEBUG_CACHE_MEMBUFFER
Modified: trunk/contrib/subversion/subversion/libsvn_subr/cache-memcache.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/cache-memcache.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/cache-memcache.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -203,9 +203,10 @@
}
else
{
- svn_string_t *value = apr_pcalloc(result_pool, sizeof(*value));
+ svn_stringbuf_t *value = svn_stringbuf_create_empty(result_pool);
value->data = data;
- value->len = data_len;
+ value->blocksize = data_len;
+ value->len = data_len - 1; /* account for trailing NUL */
*value_p = value;
}
}
@@ -263,7 +264,7 @@
{
svn_stringbuf_t *value_str = value;
data = value_str->data;
- data_len = value_str->len;
+ data_len = value_str->len + 1; /* copy trailing NUL */
}
err = memcache_internal_set(cache_void, key, data, data_len, subpool);
Modified: trunk/contrib/subversion/subversion/libsvn_subr/cache_config.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/cache_config.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/cache_config.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -23,6 +23,7 @@
#include <apr_atomic.h>
#include "svn_cache_config.h"
+#include "private/svn_atomic.h"
#include "private/svn_cache.h"
#include "svn_pools.h"
@@ -69,30 +70,27 @@
return &cache_settings;
}
-/* Access the process-global (singleton) membuffer cache. The first call
- * will automatically allocate the cache using the current cache config.
- * NULL will be returned if the desired cache size is 0 or if the cache
- * could not be created for some reason.
+/* Initializer function as required by svn_atomic__init_once. Allocate
+ * the process-global (singleton) membuffer cache and return it in the
+ * svn_membuffer_t * in *BATON. UNUSED_POOL is unused and should be NULL.
*/
-svn_membuffer_t *
-svn_cache__get_global_membuffer_cache(void)
+static svn_error_t *
+initialize_cache(void *baton, apr_pool_t *unused_pool)
{
- static svn_membuffer_t * volatile cache = NULL;
+ svn_membuffer_t **cache_p = baton;
+ svn_membuffer_t *cache = NULL;
apr_uint64_t cache_size = cache_settings.cache_size;
- if (!cache && cache_size)
+ if (cache_size)
{
svn_error_t *err;
- svn_membuffer_t *old_cache = NULL;
- svn_membuffer_t *new_cache = NULL;
-
/* auto-allocate cache */
apr_allocator_t *allocator = NULL;
apr_pool_t *pool = NULL;
if (apr_allocator_create(&allocator))
- return NULL;
+ return SVN_NO_ERROR;
/* Ensure that we free partially allocated data if we run OOM
* before the cache is complete: If the cache cannot be allocated
@@ -112,11 +110,11 @@
*/
apr_pool_create_ex(&pool, NULL, NULL, allocator);
if (pool == NULL)
- return NULL;
+ return SVN_NO_ERROR;
apr_allocator_owner_set(allocator, pool);
err = svn_cache__membuffer_cache_create(
- &new_cache,
+ &cache,
(apr_size_t)cache_size,
(apr_size_t)(cache_size / 10),
0,
@@ -129,35 +127,42 @@
*/
if (err)
{
- /* Memory and error cleanup */
- svn_error_clear(err);
+ /* Memory cleanup */
svn_pool_destroy(pool);
- /* Prevent future attempts to create the cache. However, an
- * existing cache instance (see next comment) remains valid.
- */
+ /* Document that we actually don't have a cache. */
cache_settings.cache_size = 0;
- /* The current caller won't get the cache object.
- * However, a concurrent call might have succeeded in creating
- * the cache object. That call and all following ones will then
- * use the successfully created cache instance.
- */
- return NULL;
+ return svn_error_trace(err);
}
- /* Handle race condition: if we are the first to create a
- * cache object, make it our global singleton. Otherwise,
- * discard the new cache and keep the existing one.
- *
- * Cast is necessary because of APR bug:
- * https://issues.apache.org/bugzilla/show_bug.cgi?id=50731
- */
- old_cache = apr_atomic_casptr((volatile void **)&cache, new_cache, NULL);
- if (old_cache != NULL)
- svn_pool_destroy(pool);
+ /* done */
+ *cache_p = cache;
}
+ return SVN_NO_ERROR;
+}
+
+/* Access the process-global (singleton) membuffer cache. The first call
+ * will automatically allocate the cache using the current cache config.
+ * NULL will be returned if the desired cache size is 0 or if the cache
+ * could not be created for some reason.
+ */
+svn_membuffer_t *
+svn_cache__get_global_membuffer_cache(void)
+{
+ static svn_membuffer_t *cache = NULL;
+ static svn_atomic_t initialized = 0;
+
+ svn_error_t *err
+ = svn_atomic__init_once(&initialized, initialize_cache, &cache, NULL);
+ if (err)
+ {
+ /* no caches today ... */
+ svn_error_clear(err);
+ return NULL;
+ }
+
return cache;
}
Modified: trunk/contrib/subversion/subversion/libsvn_subr/cmdline.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/cmdline.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/cmdline.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -356,7 +356,7 @@
{
/* ### Issue #3014: Return a specific error for broken pipes,
* ### with a single element in the error chain. */
- if (APR_STATUS_IS_EPIPE(apr_get_os_error()))
+ if (SVN__APR_STATUS_IS_EPIPE(apr_get_os_error()))
return svn_error_create(SVN_ERR_IO_PIPE_WRITE_ERROR, NULL, NULL);
else
return svn_error_wrap_apr(apr_get_os_error(), _("Write error"));
@@ -379,7 +379,7 @@
{
/* ### Issue #3014: Return a specific error for broken pipes,
* ### with a single element in the error chain. */
- if (APR_STATUS_IS_EPIPE(apr_get_os_error()))
+ if (SVN__APR_STATUS_IS_EPIPE(apr_get_os_error()))
return svn_error_create(SVN_ERR_IO_PIPE_WRITE_ERROR, NULL, NULL);
else
return svn_error_wrap_apr(apr_get_os_error(), _("Write error"));
@@ -505,7 +505,7 @@
svn_auth_get_username_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
- /* The server-cert, client-cert, and client-cert-password providers. */
+ /* The windows ssl server certificate CRYPTOAPI provider. */
SVN_ERR(svn_auth_get_platform_specific_provider(&provider,
"windows",
"ssl_server_trust",
@@ -514,6 +514,15 @@
if (provider)
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+ /* The windows ssl authority certificate CRYPTOAPI provider. */
+ SVN_ERR(svn_auth_get_platform_specific_provider(&provider,
+ "windows",
+ "ssl_server_authority",
+ pool));
+
+ if (provider)
+ APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
+
svn_auth_get_ssl_server_trust_file_provider(&provider, pool);
APR_ARRAY_PUSH(providers, svn_auth_provider_object_t *) = provider;
svn_auth_get_ssl_client_cert_file_provider(&provider, pool);
Modified: trunk/contrib/subversion/subversion/libsvn_subr/config_auth.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/config_auth.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/config_auth.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -94,6 +94,7 @@
if (kind == svn_node_file)
{
svn_stream_t *stream;
+ svn_string_t *stored_realm;
SVN_ERR_W(svn_stream_open_readonly(&stream, auth_path, pool, pool),
_("Unable to open auth file for reading"));
@@ -104,6 +105,11 @@
apr_psprintf(pool, _("Error parsing '%s'"),
svn_dirent_local_style(auth_path, pool)));
+ stored_realm = svn_hash_gets(*hash, SVN_CONFIG_REALMSTRING_KEY);
+
+ if (!stored_realm || strcmp(stored_realm->data, realmstring) != 0)
+ *hash = NULL; /* Hash collision, or somebody tampering with storage */
+
SVN_ERR(svn_stream_close(stream));
}
@@ -173,12 +179,6 @@
NULL
};
- if (! config_dir)
- {
- /* Can't locate the cache to clear */
- return SVN_NO_ERROR;
- }
-
iterpool = svn_pool_create(scratch_pool);
for (i = 0; cred_kinds[i]; i++)
{
Modified: trunk/contrib/subversion/subversion/libsvn_subr/config_file.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/config_file.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/config_file.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -69,7 +69,7 @@
/* Parser buffer for getc() to avoid call overhead into several libraries
for every character */
- char parser_buffer[SVN_STREAM_CHUNK_SIZE]; /* Larger than most config files */
+ char parser_buffer[SVN__STREAM_CHUNK_SIZE]; /* Larger than most config files */
size_t buffer_pos; /* Current position within parser_buffer */
size_t buffer_size; /* parser_buffer contains this many bytes */
} parse_context_t;
Modified: trunk/contrib/subversion/subversion/libsvn_subr/deprecated.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/deprecated.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/deprecated.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -47,6 +47,7 @@
#include "opt.h"
#include "private/svn_opt_private.h"
#include "private/svn_mergeinfo_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -1301,4 +1302,10 @@
return SVN_NO_ERROR;
}
-
+/*** From version.c ***/
+svn_error_t *
+svn_ver_check_list(const svn_version_t *my_version,
+ const svn_version_checklist_t *checklist)
+{
+ return svn_ver_check_list2(my_version, checklist, svn_ver_compatible);
+}
Modified: trunk/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/dirent_uri.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/dirent_uri.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -38,6 +38,7 @@
#include "dirent_uri.h"
#include "private/svn_fspath.h"
+#include "private/svn_cert.h"
/* The canonical empty path. Can this be changed? Well, change the empty
test below and the path library will work, not so sure about the fs/wc
@@ -1857,6 +1858,9 @@
#endif /* SVN_USE_DOS_PATHS */
/* Now validate the rest of the URI. */
+ seg = ptr;
+ while (*ptr && (*ptr != '/'))
+ ptr++;
while(1)
{
apr_size_t seglen = ptr - seg;
@@ -1875,9 +1879,8 @@
if (*ptr == '/')
ptr++;
+
seg = ptr;
-
-
while (*ptr && (*ptr != '/'))
ptr++;
}
@@ -2595,3 +2598,81 @@
}
return uri;
}
+
+
+/* -------------- The cert API (see private/svn_cert.h) ------------- */
+
+svn_boolean_t
+svn_cert__match_dns_identity(svn_string_t *pattern, svn_string_t *hostname)
+{
+ apr_size_t pattern_pos = 0, hostname_pos = 0;
+
+ /* support leading wildcards that composed of the only character in the
+ * left-most label. */
+ if (pattern->len >= 2 &&
+ pattern->data[pattern_pos] == '*' &&
+ pattern->data[pattern_pos + 1] == '.')
+ {
+ while (hostname_pos < hostname->len &&
+ hostname->data[hostname_pos] != '.')
+ {
+ hostname_pos++;
+ }
+ /* Assume that the wildcard must match something. Rule 2 says
+ * that *.example.com should not match example.com. If the wildcard
+ * ends up not matching anything then it matches .example.com which
+ * seems to be essentially the same as just example.com */
+ if (hostname_pos == 0)
+ return FALSE;
+
+ pattern_pos++;
+ }
+
+ while (pattern_pos < pattern->len && hostname_pos < hostname->len)
+ {
+ char pattern_c = pattern->data[pattern_pos];
+ char hostname_c = hostname->data[hostname_pos];
+
+ /* fold case as described in RFC 4343.
+ * Note: We actually convert to lowercase, since our URI
+ * canonicalization code converts to lowercase and generally
+ * most certs are issued with lowercase DNS names, meaning
+ * this avoids the fold operation in most cases. The RFC
+ * suggests the opposite transformation, but doesn't require
+ * any specific implementation in any case. It is critical
+ * that this folding be locale independent so you can't use
+ * tolower(). */
+ pattern_c = canonicalize_to_lower(pattern_c);
+ hostname_c = canonicalize_to_lower(hostname_c);
+
+ if (pattern_c != hostname_c)
+ {
+ /* doesn't match */
+ return FALSE;
+ }
+ else
+ {
+ /* characters match so skip both */
+ pattern_pos++;
+ hostname_pos++;
+ }
+ }
+
+ /* ignore a trailing period on the hostname since this has no effect on the
+ * security of the matching. See the following for the long explanation as
+ * to why:
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=134402#c28
+ */
+ if (pattern_pos == pattern->len &&
+ hostname_pos == hostname->len - 1 &&
+ hostname->data[hostname_pos] == '.')
+ hostname_pos++;
+
+ if (pattern_pos != pattern->len || hostname_pos != hostname->len)
+ {
+ /* end didn't match */
+ return FALSE;
+ }
+
+ return TRUE;
+}
Index: trunk/contrib/subversion/subversion/libsvn_subr/genctype.py
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/genctype.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/genctype.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/libsvn_subr/genctype.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/libsvn_subr/internal_statements.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/internal_statements.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/internal_statements.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,4 +1,4 @@
-/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_subr/token-map.h.
+/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.10/subversion/libsvn_subr/token-map.h.
* Do not edit this file -- edit the source and rerun gen-make.py */
#define STMT_INTERNAL_SAVEPOINT_SVN 0
Modified: trunk/contrib/subversion/subversion/libsvn_subr/io.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/io.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/io.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1243,32 +1243,44 @@
{
/* Very simplistic but safe approach:
If the filesystem has < sec mtime we can be reasonably sure
- that the filesystem has <= millisecond precision.
+ that the filesystem has some sub-second resolution. On Windows
+ it is likely to be sub-millisecond; on Linux systems it depends
+ on the filesystem, ext4 is typically 1ms, 4ms or 10ms resolution.
## Perhaps find a better algorithm here. This will fail once
- in every 1000 cases on a millisecond precision filesystem.
+ in every 1000 cases on a millisecond precision filesystem
+ if the mtime happens to be an exact second.
But better to fail once in every thousand cases than every
time, like we did before.
- (All tested filesystems I know have at least microsecond precision.)
Note for further research on algorithm:
- FAT32 has < 1 sec precision on ctime, but 2 sec on mtime */
+ FAT32 has < 1 sec precision on ctime, but 2 sec on mtime.
- /* Sleep for at least 1 millisecond.
- (t < 1000 will be round to 0 in apr) */
- apr_sleep(1000);
+ Linux/ext4 with CONFIG_HZ=250 has high resolution
+ apr_time_now and although the filesystem timestamps
+ have similar high precision they are only updated with
+ a coarser 4ms resolution. */
- return;
+ /* 10 milliseconds after now. */
+#ifndef SVN_HI_RES_SLEEP_MS
+#define SVN_HI_RES_SLEEP_MS 10
+#endif
+ then = now + apr_time_from_msec(SVN_HI_RES_SLEEP_MS);
}
- now = apr_time_now(); /* Extract the time used for the path stat */
-
- if (now >= then)
- return; /* Passing negative values may suspend indefinitely (Windows) */
+ /* Remove time taken to do stat() from sleep. */
+ now = apr_time_now();
}
- apr_sleep(then - now);
+ if (now >= then)
+ return; /* Passing negative values may suspend indefinitely (Windows) */
+
+ /* (t < 1000 will be round to 0 in apr) */
+ if (then - now < 1000)
+ apr_sleep(1000);
+ else
+ apr_sleep(then - now);
}
@@ -1533,14 +1545,9 @@
{
if (enable_write) /* Make read-write. */
{
- apr_file_t *fd;
-
- /* Get the perms for the original file so we'll have any other bits
- * that were already set (like the execute bits, for example). */
- SVN_ERR(svn_io_file_open(&fd, path, APR_READ,
- APR_OS_DEFAULT, pool));
- SVN_ERR(merge_default_file_perms(fd, &perms_to_set, pool));
- SVN_ERR(svn_io_file_close(fd, pool));
+ /* Tweak the owner bits only. The group/other bits aren't safe to
+ * touch because we may end up setting them in undesired ways. */
+ perms_to_set |= (APR_UREAD|APR_UWRITE);
}
else
{
@@ -3306,7 +3313,7 @@
/* ### Issue #3014: Return a specific error for broken pipes,
* ### with a single element in the error chain. */
- if (APR_STATUS_IS_EPIPE(status))
+ if (SVN__APR_STATUS_IS_EPIPE(status))
return svn_error_create(SVN_ERR_IO_PIPE_WRITE_ERROR, NULL, NULL);
if (name)
@@ -4289,7 +4296,7 @@
/* As long as a file is not at the end yet, and it is still
* potentially identical to another file, we read the next chunk.*/
- if (!eof1 && (identical_p12 || identical_p13))
+ if (!eof1 && (*identical_p12 || *identical_p13))
{
err = svn_io_file_read_full2(file1_h, buf1,
SVN__STREAM_CHUNK_SIZE, &bytes_read1,
@@ -4299,7 +4306,7 @@
read_1 = TRUE;
}
- if (!eof2 && (identical_p12 || identical_p23))
+ if (!eof2 && (*identical_p12 || *identical_p23))
{
err = svn_io_file_read_full2(file2_h, buf2,
SVN__STREAM_CHUNK_SIZE, &bytes_read2,
@@ -4309,7 +4316,7 @@
read_2 = TRUE;
}
- if (!eof3 && (identical_p13 || identical_p23))
+ if (!eof3 && (*identical_p13 || *identical_p23))
{
err = svn_io_file_read_full2(file3_h, buf3,
SVN__STREAM_CHUNK_SIZE, &bytes_read3,
Modified: trunk/contrib/subversion/subversion/libsvn_subr/opt.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/opt.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/opt.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -417,7 +417,9 @@
_("\"%s\": unknown command.\n\n"), subcommand);
if (err) {
- svn_handle_error2(err, stderr, FALSE, "svn: ");
+ /* Issue #3014: Don't print anything on broken pipes. */
+ if (err->apr_err != SVN_ERR_IO_PIPE_WRITE_ERROR)
+ svn_handle_error2(err, stderr, FALSE, "svn: ");
svn_error_clear(err);
}
}
Modified: trunk/contrib/subversion/subversion/libsvn_subr/prompt.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/prompt.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/prompt.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -177,7 +177,7 @@
and stderr for prompting. */
apr_file_t *tmpfd;
status = apr_file_open(&tmpfd, "/dev/tty",
- APR_FOPEN_READ | APR_FOPEN_WRITE,
+ APR_READ | APR_WRITE,
APR_OS_DEFAULT, pool);
*terminal = apr_palloc(pool, sizeof(terminal_handle_t));
if (!status)
Modified: trunk/contrib/subversion/subversion/libsvn_subr/sqlite.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/sqlite.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/sqlite.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -778,6 +778,21 @@
somebody initialized SQLite before us it is needed anyway. */
flags |= SQLITE_OPEN_NOMUTEX;
+#if !defined(WIN32) && !defined(SVN_SQLITE_INLINE)
+ if (mode == svn_sqlite__mode_rwcreate)
+ {
+ svn_node_kind_t kind;
+
+ /* Create the file before SQLite to avoid any permissions
+ problems with an SQLite build that uses the default
+ SQLITE_DEFAULT_FILE_PERMISSIONS of 644 modified by umask.
+ We simply want umask permissions. */
+ SVN_ERR(svn_io_check_path(path, &kind, scratch_pool));
+ if (kind == svn_node_none)
+ SVN_ERR(svn_io_file_create(path, "", scratch_pool));
+ }
+#endif
+
/* Open the database. Note that a handle is returned, even when an error
occurs (except for out-of-memory); thus, we can safely use it to
extract an error message and construct an svn_error_t. */
@@ -887,6 +902,18 @@
SVN_ERR(internal_open(&(*db)->db3, path, mode, scratch_pool));
+#if SQLITE_VERSION_NUMBER >= 3008000 && SQLITE_VERSION_NUMBER < 3009000
+ /* disable SQLITE_ENABLE_STAT3/4 from 3.8.1 - 3.8.3 (but not 3.8.3.1+)
+ * to prevent using it when it's buggy.
+ * See: https://www.sqlite.org/src/info/4c86b126f2 */
+ if (sqlite3_libversion_number() > 3008000 &&
+ sqlite3_libversion_number() < 3008004 &&
+ strcmp(sqlite3_sourceid(),"2014-02-11")<0)
+ {
+ sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS, (*db)->db3, 0x800);
+ }
+#endif
+
#ifdef SQLITE3_DEBUG
sqlite3_trace((*db)->db3, sqlite_tracer, (*db)->db3);
#endif
@@ -918,7 +945,13 @@
/* Enable recursive triggers so that a user trigger will fire
in the deletion phase of an INSERT OR REPLACE statement.
Requires SQLite >= 3.6.18 */
- "PRAGMA recursive_triggers=ON;"));
+ "PRAGMA recursive_triggers=ON;"
+ /* Enforce current Sqlite default behavior. Some distributions
+ might change the Sqlite defaults without realizing how this
+ affects application(read: Subversion) performance/behavior. */
+ "PRAGMA foreign_keys=OFF;" /* SQLITE_DEFAULT_FOREIGN_KEYS*/
+ "PRAGMA locking_mode = NORMAL;" /* SQLITE_DEFAULT_LOCKING_MODE */
+ ));
#if defined(SVN_DEBUG)
/* When running in debug mode, enable the checking of foreign key
@@ -927,6 +960,14 @@
SVN_ERR(exec_sql(*db, "PRAGMA foreign_keys=ON;"));
#endif
+#ifdef SVN_SQLITE_REVERSE_UNORDERED_SELECTS
+ /* When enabled, this PRAGMA causes SELECT statements without an ORDER BY
+ clause to emit their results in the reverse order of what they normally
+ would. This can help detecting invalid assumptions about the result
+ order.*/
+ SVN_ERR(exec_sql(*db, "PRAGMA reverse_unordered_selects=ON;"));
+#endif
+
/* Store temporary tables in RAM instead of in temporary files, but don't
fail on this if this option is disabled in the sqlite compilation by
setting SQLITE_TEMP_STORE to 0 (always to disk) */
Modified: trunk/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -50,6 +50,7 @@
# undef inline
# endif
# endif
+# define SQLITE_DEFAULT_FILE_PERMISSIONS 0666
# include <sqlite3.c>
# if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))
# pragma GCC diagnostic pop
Modified: trunk/contrib/subversion/subversion/libsvn_subr/subst.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/subst.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/subst.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1702,10 +1702,20 @@
### this only writes the first line!
*/
if (create_using_internal_representation)
- SVN_ERR(svn_io_write_unique(&dst_tmp, svn_dirent_dirname(dst, pool),
- contents->data, contents->len,
- svn_io_file_del_none, pool));
+ {
+ apr_file_t *new_file;
+ SVN_ERR(svn_io_open_unique_file3(&new_file, &dst_tmp,
+ svn_dirent_dirname(dst, pool),
+ svn_io_file_del_none,
+ pool, pool));
+ SVN_ERR(svn_io_file_write_full(new_file,
+ contents->data, contents->len, NULL,
+ pool));
+
+ SVN_ERR(svn_io_file_close(new_file, pool));
+ }
+
/* Do the atomic rename from our temporary location. */
return svn_io_file_rename(dst_tmp, dst, pool);
}
Modified: trunk/contrib/subversion/subversion/libsvn_subr/sysinfo.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/sysinfo.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/sysinfo.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -290,11 +290,21 @@
return NULL;
svn_stringbuf_strip_whitespace(buffer);
+
+ /* Now we split the currently allocated buffer in two parts:
+ - a const char * HEAD
+ - the remaining stringbuf_t. */
+
+ /* Create HEAD as '\0' terminated const char * */
key = buffer->data;
end = strchr(key, delim);
*end = '\0';
- buffer->len = 1 + end - key;
+
+ /* And update the TAIL to be a smaller, but still valid stringbuf */
buffer->data = end + 1;
+ buffer->len -= 1 + end - key;
+ buffer->blocksize -= 1 + end - key;
+
svn_stringbuf_strip_whitespace(buffer);
return key;
@@ -546,7 +556,7 @@
#ifdef WIN32
typedef DWORD (WINAPI *FNGETNATIVESYSTEMINFO)(LPSYSTEM_INFO);
-typedef BOOL (WINAPI *FNENUMPROCESSMODULES) (HANDLE, HMODULE, DWORD, LPDWORD);
+typedef BOOL (WINAPI *FNENUMPROCESSMODULES) (HANDLE, HMODULE*, DWORD, LPDWORD);
/* Get system and version info, and try to tell the difference
between the native system type and the runtime environment of the
@@ -763,16 +773,36 @@
static HMODULE *
enum_loaded_modules(apr_pool_t *pool)
{
+ HMODULE psapi_dll = 0;
HANDLE current = GetCurrentProcess();
HMODULE dummy[1];
HMODULE *handles;
DWORD size;
+ FNENUMPROCESSMODULES EnumProcessModules_;
- if (!EnumProcessModules(current, dummy, sizeof(dummy), &size))
+ psapi_dll = GetModuleHandleA("psapi.dll");
+
+ if (!psapi_dll)
+ {
+ /* Load and never unload, just like static linking */
+ psapi_dll = LoadLibraryA("psapi.dll");
+ }
+
+ if (!psapi_dll)
+ return NULL;
+
+ EnumProcessModules_ = (FNENUMPROCESSMODULES)
+ GetProcAddress(psapi_dll, "EnumProcessModules");
+
+ /* Before Windows XP psapi was an optional module */
+ if (! EnumProcessModules_)
return NULL;
+ if (!EnumProcessModules_(current, dummy, sizeof(dummy), &size))
+ return NULL;
+
handles = apr_palloc(pool, size + sizeof *handles);
- if (!EnumProcessModules(current, handles, size, &size))
+ if (! EnumProcessModules_(current, handles, size, &size))
return NULL;
handles[size / sizeof *handles] = NULL;
return handles;
@@ -992,6 +1022,7 @@
case 6: return "Snow Leopard";
case 7: return "Lion";
case 8: return "Mountain Lion";
+ case 9: return "Mavericks";
}
return NULL;
Modified: trunk/contrib/subversion/subversion/libsvn_subr/utf.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/utf.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/utf.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -212,6 +212,7 @@
{
apr_status_t apr_err;
apr_xlate_t *handle;
+ const char *name;
/* The error handling doesn't support the following cases, since we don't
use them currently. Catch this here. */
@@ -224,8 +225,10 @@
#if defined(WIN32)
apr_err = svn_subr__win32_xlate_open((win32_xlate_t **)&handle, topage,
frompage, pool);
+ name = "win32-xlate: ";
#else
apr_err = apr_xlate_open(&handle, topage, frompage, pool);
+ name = "APR: ";
#endif
if (APR_STATUS_IS_EINVAL(apr_err) || APR_STATUS_IS_ENOTIMPL(apr_err))
@@ -254,9 +257,9 @@
later. APR_STRERR will be in the local encoding, not in UTF-8, though.
*/
svn_strerror(apr_err, apr_strerr, sizeof(apr_strerr));
- return svn_error_create(apr_err,
- svn_error_create(apr_err, NULL, apr_strerr),
- errstr);
+ return svn_error_createf(SVN_ERR_PLUGIN_LOAD_FAILURE,
+ svn_error_create(apr_err, NULL, apr_strerr),
+ "%s%s", name, errstr);
}
/* Allocate and initialize the node. */
Modified: trunk/contrib/subversion/subversion/libsvn_subr/version.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/version.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/version.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -75,8 +75,10 @@
svn_error_t *
-svn_ver_check_list(const svn_version_t *my_version,
- const svn_version_checklist_t *checklist)
+svn_ver__check_list2(const svn_version_t *my_version,
+ const svn_version_checklist_t *checklist,
+ svn_boolean_t (*comparator)(const svn_version_t *,
+ const svn_version_t *))
{
svn_error_t *err = SVN_NO_ERROR;
int i;
@@ -84,12 +86,17 @@
for (i = 0; checklist[i].label != NULL; ++i)
{
const svn_version_t *lib_version = checklist[i].version_query();
- if (!svn_ver_compatible(my_version, lib_version))
+ if (!comparator(my_version, lib_version))
err = svn_error_createf(SVN_ERR_VERSION_MISMATCH, err,
- _("Version mismatch in '%s':"
+ _("Version mismatch in '%s'%s:"
" found %d.%d.%d%s,"
" expected %d.%d.%d%s"),
checklist[i].label,
+ comparator == svn_ver_equal
+ ? _(" (expecting equality)")
+ : comparator == svn_ver_compatible
+ ? _(" (expecting compatibility)")
+ : "",
lib_version->major, lib_version->minor,
lib_version->patch, lib_version->tag,
my_version->major, my_version->minor,
@@ -129,7 +136,7 @@
info->build_time = __TIME__;
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
- (pool, _("Copyright (C) 2013 The Apache Software Foundation.\n"
+ (pool, _("Copyright (C) 2014 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see "
Modified: trunk/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -427,13 +427,15 @@
format_value(value_str, sym_info->ModBase, sym_info->TypeIndex,
(void *)var_data);
- fprintf(log_file, "%s=%s", sym_info->Name, value_str);
+ fprintf(log_file, "%.*s=%s", (int)sym_info->NameLen, sym_info->Name,
+ value_str);
}
if (!log_params && sym_info->Flags & SYMFLAG_LOCAL)
{
format_value(value_str, sym_info->ModBase, sym_info->TypeIndex,
(void *)var_data);
- fprintf(log_file, " %s = %s\n", sym_info->Name, value_str);
+ fprintf(log_file, " %.*s = %s\n", (int)sym_info->NameLen,
+ sym_info->Name, value_str);
}
return TRUE;
@@ -466,8 +468,10 @@
if (SymFromAddr_(proc, stack_frame.AddrPC.Offset, &func_disp, pIHS))
{
fprintf(log_file,
- "#%d 0x%08I64x in %.200s(",
- nr_of_frame, stack_frame.AddrPC.Offset, pIHS->Name);
+ "#%d 0x%08I64x in %.*s(",
+ nr_of_frame, stack_frame.AddrPC.Offset,
+ pIHS->NameLen > 200 ? 200 : (int)pIHS->NameLen,
+ pIHS->Name);
/* restrict symbol enumeration to this frame only */
ih_stack_frame.InstructionOffset = stack_frame.AddrPC.Offset;
Modified: trunk/contrib/subversion/subversion/libsvn_subr/win32_crypto.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_subr/win32_crypto.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_subr/win32_crypto.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -436,8 +436,9 @@
const char *realmstring,
apr_pool_t *pool)
{
- apr_uint32_t *failures = svn_hash_gets(parameters,
- SVN_AUTH_PARAM_SSL_SERVER_FAILURES);
+ apr_uint32_t *failure_ptr = svn_hash_gets(parameters,
+ SVN_AUTH_PARAM_SSL_SERVER_FAILURES);
+ apr_uint32_t failures = *failure_ptr;
const svn_auth_ssl_server_cert_info_t *cert_info =
svn_hash_gets(parameters, SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO);
@@ -445,7 +446,7 @@
*iter_baton = NULL;
/* We can accept only unknown certificate authority. */
- if (*failures & SVN_AUTH_SSL_UNKNOWNCA)
+ if (failures & SVN_AUTH_SSL_UNKNOWNCA)
{
svn_boolean_t ok;
@@ -455,15 +456,16 @@
if (ok)
{
/* Clear failure flag. */
- *failures &= ~SVN_AUTH_SSL_UNKNOWNCA;
+ failures &= ~SVN_AUTH_SSL_UNKNOWNCA;
}
}
/* If all failures are cleared now, we return the creds */
- if (! *failures)
+ if (! failures)
{
svn_auth_cred_ssl_server_trust_t *creds =
apr_pcalloc(pool, sizeof(*creds));
+ creds->accepted_failures = *failure_ptr & ~failures;
creds->may_save = FALSE; /* No need to save it. */
*credentials = creds;
}
@@ -489,4 +491,24 @@
*provider = po;
}
+static const svn_auth_provider_t windows_server_authority_provider = {
+ SVN_AUTH_CRED_SSL_SERVER_AUTHORITY,
+ windows_ssl_server_trust_first_credentials,
+ NULL,
+ NULL,
+};
+
+/* Public API */
+void
+svn_auth__get_windows_ssl_server_authority_provider(
+ svn_auth_provider_object_t **provider,
+ apr_pool_t *pool)
+{
+ svn_auth_provider_object_t *po = apr_pcalloc(pool, sizeof(*po));
+
+ po->vtable = &windows_server_authority_provider;
+ *provider = po;
+}
+
+
#endif /* WIN32 */
Modified: trunk/contrib/subversion/subversion/libsvn_wc/conflicts.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/conflicts.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/conflicts.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -401,8 +401,10 @@
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Call the interactive conflict resolver RESOLVER_FUNC with RESOLVER_BATON to
- allow resolving the conflicts on LOCAL_ABSPATH.
+/* Call the conflict resolver RESOLVER_FUNC with RESOLVER_BATON for each
+ of the conflicts on LOCAL_ABSPATH. Depending on the results that
+ the callback returns, perhaps resolve the conflicts, and perhaps mark
+ them as resolved in the WC DB.
Call RESOLVER_FUNC once for each property conflict, and again for any
text conflict, and again for any tree conflict on the node.
@@ -409,6 +411,8 @@
CONFLICT_SKEL contains the details of the conflicts on LOCAL_ABSPATH.
+ Use MERGE_OPTIONS when the resolver requests a merge.
+
Resolver actions are directly applied to the in-db state of LOCAL_ABSPATH,
so the conflict and the state in CONFLICT_SKEL must already be installed in
wc.db. */
Modified: trunk/contrib/subversion/subversion/libsvn_wc/diff.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/diff.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/diff.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -38,7 +38,9 @@
extern "C" {
#endif /* __cplusplus */
-/* Reports the file LOCAL_ABSPATH as ADDED file with relpath RELPATH to
+/* A function to diff locally added and locally copied files.
+
+ Reports the file LOCAL_ABSPATH as ADDED file with relpath RELPATH to
PROCESSOR with as parent baton PROCESSOR_PARENT_BATON.
The node is expected to have status svn_wc__db_status_normal, or
@@ -61,7 +63,9 @@
void *cancel_baton,
apr_pool_t *scratch_pool);
-/* Reports the directory LOCAL_ABSPATH and everything below it (limited by
+/* A function to diff locally added and locally copied directories.
+
+ Reports the directory LOCAL_ABSPATH and everything below it (limited by
DEPTH) as added with relpath RELPATH to PROCESSOR with as parent baton
PROCESSOR_PARENT_BATON.
Modified: trunk/contrib/subversion/subversion/libsvn_wc/diff_editor.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/diff_editor.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/diff_editor.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -474,14 +474,18 @@
{
const svn_io_dirent2_t *dirent;
+ /* Verify truename to mimic status for iota/IOTA difference on Windows */
SVN_ERR(svn_io_stat_dirent2(&dirent, local_abspath,
- FALSE /* verify truename */,
+ TRUE /* verify truename */,
TRUE /* ingore_enoent */,
scratch_pool, scratch_pool));
- if (dirent->kind == svn_node_file
- && dirent->filesize == recorded_size
- && dirent->mtime == recorded_time)
+ /* If a file does not exist on disk (missing/obstructed) then we
+ can't provide a text diff */
+ if (dirent->kind != svn_node_file
+ || (dirent->kind == svn_node_file
+ && dirent->filesize == recorded_size
+ && dirent->mtime == recorded_time))
{
files_same = TRUE;
}
Modified: trunk/contrib/subversion/subversion/libsvn_wc/diff_local.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/diff_local.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/diff_local.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -116,13 +116,20 @@
apr_pool_t *ns_pool;
if (!eb->cur)
{
- if (!svn_dirent_is_ancestor(eb->anchor_abspath, local_abspath))
+ const char *relpath;
+
+ relpath = svn_dirent_skip_ancestor(eb->anchor_abspath, local_abspath);
+ if (! relpath)
return SVN_NO_ERROR;
- SVN_ERR(ensure_state(eb,
- svn_dirent_dirname(local_abspath,scratch_pool),
- FALSE,
- scratch_pool));
+ /* Don't recurse on the anchor, as that might loop infinately because
+ svn_dirent_dirname("/",...) -> "/"
+ svn_dirent_dirname("C:/",...) -> "C:/" (Windows) */
+ if (*relpath)
+ SVN_ERR(ensure_state(eb,
+ svn_dirent_dirname(local_abspath,scratch_pool),
+ FALSE,
+ scratch_pool));
}
else if (svn_dirent_is_child(eb->cur->local_abspath, local_abspath, NULL))
SVN_ERR(ensure_state(eb, svn_dirent_dirname(local_abspath,scratch_pool),
@@ -195,23 +202,15 @@
struct diff_baton *eb = baton;
svn_wc__db_t *db = eb->db;
- switch (status->node_status)
+ if (! status->versioned)
+ return SVN_NO_ERROR; /* unversioned (includes dir externals) */
+
+ if (status->node_status == svn_wc_status_conflicted
+ && status->text_status == svn_wc_status_none
+ && status->prop_status == svn_wc_status_none)
{
- case svn_wc_status_unversioned:
- case svn_wc_status_ignored:
- return SVN_NO_ERROR; /* No diff */
-
- case svn_wc_status_conflicted:
- if (status->text_status == svn_wc_status_none
- && status->prop_status == svn_wc_status_none)
- {
- /* Node is an actual only node describing a tree conflict */
- return SVN_NO_ERROR;
- }
- break;
-
- default:
- break; /* Go check other conditions */
+ /* Node is an actual only node describing a tree conflict */
+ return SVN_NO_ERROR;
}
/* Not text/prop modified, not copied. Easy out */
@@ -399,7 +398,7 @@
}
}
- if (local_only)
+ if (local_only && (db_status != svn_wc__db_status_deleted))
{
if (db_kind == svn_node_file)
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
Modified: trunk/contrib/subversion/subversion/libsvn_wc/info.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/info.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/info.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -548,7 +548,7 @@
&repos_uuid,
wc_ctx->db,
svn_dirent_dirname(
- local_abspath,
+ this_abspath,
iterpool),
scratch_pool,
iterpool));
Modified: trunk/contrib/subversion/subversion/libsvn_wc/old-and-busted.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/old-and-busted.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/old-and-busted.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -811,11 +811,15 @@
### not used by loggy; no need to set MODIFY_FLAGS */
entry->url = extract_string(atts, ENTRIES_ATTR_URL, pool);
+ if (entry->url)
+ entry->url = svn_uri_canonicalize(entry->url, pool);
/* Set up repository root. Make sure it is a prefix of url.
### not used by loggy; no need to set MODIFY_FLAGS */
entry->repos = extract_string(atts, ENTRIES_ATTR_REPOS, pool);
+ if (entry->repos)
+ entry->repos = svn_uri_canonicalize(entry->repos, pool);
if (entry->url && entry->repos
&& !svn_uri__is_ancestor(entry->repos, entry->url))
Modified: trunk/contrib/subversion/subversion/libsvn_wc/status.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/status.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/status.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -242,145 +242,8 @@
/** Code **/
-/* Fill in *INFO with the information it would contain if it were
- obtained from svn_wc__db_read_children_info. */
-static svn_error_t *
-read_info(const struct svn_wc__db_info_t **info,
- const char *local_abspath,
- svn_wc__db_t *db,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- struct svn_wc__db_info_t *mtb = apr_pcalloc(result_pool, sizeof(*mtb));
- const svn_checksum_t *checksum;
- const char *original_repos_relpath;
- SVN_ERR(svn_wc__db_read_info(&mtb->status, &mtb->kind,
- &mtb->revnum, &mtb->repos_relpath,
- &mtb->repos_root_url, &mtb->repos_uuid,
- &mtb->changed_rev, &mtb->changed_date,
- &mtb->changed_author, &mtb->depth,
- &checksum, NULL, &original_repos_relpath, NULL,
- NULL, NULL, &mtb->lock, &mtb->recorded_size,
- &mtb->recorded_time, &mtb->changelist,
- &mtb->conflicted, &mtb->op_root,
- &mtb->had_props, &mtb->props_mod,
- &mtb->have_base, &mtb->have_more_work, NULL,
- db, local_abspath,
- result_pool, scratch_pool));
- SVN_ERR(svn_wc__db_wclocked(&mtb->locked, db, local_abspath, scratch_pool));
-
- /* Maybe we have to get some shadowed lock from BASE to make our test suite
- happy... (It might be completely unrelated, but...) */
- if (mtb->have_base
- && (mtb->status == svn_wc__db_status_added
- || mtb->status == svn_wc__db_status_deleted
- || mtb->kind == svn_node_file))
- {
- svn_boolean_t update_root;
- svn_wc__db_lock_t **lock_arg = NULL;
-
- if (mtb->status == svn_wc__db_status_added
- || mtb->status == svn_wc__db_status_deleted)
- lock_arg = &mtb->lock;
-
- SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- lock_arg, NULL, NULL, &update_root,
- db, local_abspath,
- result_pool, scratch_pool));
-
- mtb->file_external = (update_root && mtb->kind == svn_node_file);
-
- if (mtb->status == svn_wc__db_status_deleted)
- {
- const char *moved_to_abspath;
- const char *moved_to_op_root_abspath;
-
- /* NOTE: we can't use op-root-ness as a condition here since a base
- * node can be the root of a move and still not be an explicit
- * op-root (having a working node with op_depth == pathelements).
- *
- * Both these (almost identical) situations showcase this:
- * svn mv a/b bb
- * svn del a
- * and
- * svn mv a aa
- * svn mv aa/b bb
- * In both, 'bb' is moved from 'a/b', but 'a/b' has no op_depth>0
- * node at all, as its parent 'a' is locally deleted. */
-
- SVN_ERR(svn_wc__db_scan_deletion(NULL,
- &moved_to_abspath,
- NULL,
- &moved_to_op_root_abspath,
- db, local_abspath,
- scratch_pool, scratch_pool));
- if (moved_to_abspath != NULL
- && moved_to_op_root_abspath != NULL
- && strcmp(moved_to_abspath, moved_to_op_root_abspath) == 0)
- {
- mtb->moved_to_abspath = apr_pstrdup(result_pool,
- moved_to_abspath);
- }
- /* ### ^^^ THIS SUCKS. For at least two reasons:
- * 1) We scan the node deletion and that's technically not necessary.
- * We'd be fine to know if this is an actual root of a move.
- * 2) From the elaborately calculated results, we backwards-guess
- * whether this is a root.
- * It works ok, and this code only gets called when a node is an
- * explicit target of a 'status'. But it would be better to do this
- * differently.
- * We could return moved-to via svn_wc__db_base_get_info() (called
- * just above), but as moved-to is only intended to be returned for
- * roots of a move, that doesn't fit too well. */
- }
- }
-
- /* ### svn_wc__db_read_info() could easily return the moved-here flag. But
- * for now... (The per-dir query for recursive status is far more optimal.)
- * Note that this actually scans around to get the full path, for a bool.
- * This bool then gets returned, later is evaluated, and if true leads to
- * the same paths being scanned again. We'd want to obtain this bool here as
- * cheaply as svn_wc__db_read_children_info() does. */
- if (mtb->status == svn_wc__db_status_added)
- {
- svn_wc__db_status_t status;
-
- SVN_ERR(svn_wc__db_scan_addition(&status, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL,
- db, local_abspath,
- result_pool, scratch_pool));
-
- mtb->moved_here = (status == svn_wc__db_status_moved_here);
- mtb->incomplete = (status == svn_wc__db_status_incomplete);
- }
-
- mtb->has_checksum = (checksum != NULL);
- mtb->copied = (original_repos_relpath != NULL);
-
-#ifdef HAVE_SYMLINK
- if (mtb->kind == svn_node_file
- && (mtb->had_props || mtb->props_mod))
- {
- apr_hash_t *properties;
-
- if (mtb->props_mod)
- SVN_ERR(svn_wc__db_read_props(&properties, db, local_abspath,
- scratch_pool, scratch_pool));
- else
- SVN_ERR(svn_wc__db_read_pristine_props(&properties, db, local_abspath,
- scratch_pool, scratch_pool));
-
- mtb->special = (NULL != svn_hash_gets(properties, SVN_PROP_SPECIAL));
- }
-#endif
- *info = mtb;
-
- return SVN_NO_ERROR;
-}
-
/* Return *REPOS_RELPATH and *REPOS_ROOT_URL for LOCAL_ABSPATH using
information in INFO if available, falling back on
PARENT_REPOS_RELPATH and PARENT_REPOS_ROOT_URL if available, and
@@ -421,7 +284,9 @@
db, local_abspath,
result_pool, scratch_pool));
}
- else if (info->have_base)
+ else if (info->status == svn_wc__db_status_deleted
+ && !info->have_more_work
+ && info->have_base)
{
SVN_ERR(svn_wc__db_scan_base_repos(repos_relpath, repos_root_url,
repos_uuid,
@@ -428,6 +293,33 @@
db, local_abspath,
result_pool, scratch_pool));
}
+ else if (info->status == svn_wc__db_status_deleted)
+ {
+ const char *work_del_abspath;
+ const char *add_abspath;
+
+ /* Handles working DELETE and the special case where there is just
+ svn_wc__db_status_not_present in WORKING */
+
+ SVN_ERR(svn_wc__db_scan_deletion(NULL, NULL, &work_del_abspath, NULL,
+ db, local_abspath,
+ scratch_pool, scratch_pool));
+
+ /* The parent of what has been deleted must be added */
+ add_abspath = svn_dirent_dirname(work_del_abspath, scratch_pool);
+
+ SVN_ERR(svn_wc__db_scan_addition(NULL, NULL, repos_relpath,
+ repos_root_url, repos_uuid, NULL,
+ NULL, NULL, NULL,
+ db, add_abspath,
+ result_pool, scratch_pool));
+
+ *repos_relpath = svn_relpath_join(*repos_relpath,
+ svn_dirent_skip_ancestor(
+ add_abspath,
+ local_abspath),
+ result_pool);
+ }
else
{
*repos_relpath = NULL;
@@ -493,7 +385,8 @@
if (!info)
- SVN_ERR(read_info(&info, local_abspath, db, result_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_read_single_info(&info, db, local_abspath,
+ result_pool, scratch_pool));
if (!info->repos_relpath || !parent_repos_relpath)
switched_p = FALSE;
@@ -799,9 +692,12 @@
stat->changelist = apr_pstrdup(result_pool, info->changelist);
stat->moved_from_abspath = moved_from_abspath;
- if (info->moved_to_abspath)
- stat->moved_to_abspath = apr_pstrdup(result_pool, info->moved_to_abspath);
+ /* ### TODO: Handle multiple moved_to values properly */
+ if (info->moved_to)
+ stat->moved_to_abspath = apr_pstrdup(result_pool,
+ info->moved_to->moved_to_abspath);
+
stat->file_external = info->file_external;
*status = stat;
@@ -1345,8 +1241,8 @@
SVN_ERR(err);
if (!dir_info)
- SVN_ERR(read_info(&dir_info, local_abspath, wb->db,
- scratch_pool, iterpool));
+ SVN_ERR(svn_wc__db_read_single_info(&dir_info, wb->db, local_abspath,
+ scratch_pool, iterpool));
SVN_ERR(get_repos_root_url_relpath(&dir_repos_relpath, &dir_repos_root_url,
&dir_repos_uuid, dir_info,
@@ -1506,8 +1402,9 @@
if (dirent->kind == svn_node_none)
dirent = NULL;
- SVN_ERR(read_info(&dir_info, parent_abspath, wb->db,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_read_single_info(&dir_info,
+ wb->db, parent_abspath,
+ scratch_pool, scratch_pool));
SVN_ERR(get_repos_root_url_relpath(&dir_repos_relpath, &dir_repos_root_url,
&dir_repos_uuid, dir_info,
@@ -2710,7 +2607,8 @@
ignore_patterns = ignores;
}
- err = read_info(&info, local_abspath, db, scratch_pool, scratch_pool);
+ err = svn_wc__db_read_single_info(&info, db, local_abspath,
+ scratch_pool, scratch_pool);
if (err)
{
Modified: trunk/contrib/subversion/subversion/libsvn_wc/update_editor.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/update_editor.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/update_editor.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1012,9 +1012,13 @@
if (err)
{
- /* We failed to apply the delta; clean up the temporary file. */
- svn_error_clear(svn_io_remove_file2(hb->new_text_base_tmp_abspath, TRUE,
- hb->pool));
+ /* We failed to apply the delta; clean up the temporary file if it
+ already created by lazy_open_target(). */
+ if (hb->new_text_base_tmp_abspath)
+ {
+ svn_error_clear(svn_io_remove_file2(hb->new_text_base_tmp_abspath,
+ TRUE, hb->pool));
+ }
}
else
{
@@ -3009,18 +3013,55 @@
kind = svn_node_unknown;
}
- if (status == svn_wc__db_status_normal
- && kind == svn_node_dir)
+ if (status == svn_wc__db_status_normal)
{
- /* We found an obstructing working copy!
+ svn_boolean_t wcroot;
+ /* We found an obstructing working copy or a file external! */
- We can do two things now:
- 1) notify the user, record a skip, etc.
- 2) Just record the absent node in BASE in the parent
- working copy.
+ SVN_ERR(svn_wc__db_is_wcroot(&wcroot, eb->db, local_abspath,
+ scratch_pool));
- As option 2 happens to be exactly what we do anyway, lets do that.
- */
+ if (wcroot)
+ {
+ /*
+ We have an obstructing working copy; possibly a directory external
+
+ We can do two things now:
+ 1) notify the user, record a skip, etc.
+ 2) Just record the absent node in BASE in the parent
+ working copy.
+
+ As option 2 happens to be exactly what we do anyway, fall through.
+ */
+ }
+ else
+ {
+ /* The server asks us to replace a file external
+ (Existing BASE node; not reported by the working copy crawler or
+ there would have been a delete_entry() call.
+
+ There is no way we can store this state in the working copy as
+ the BASE layer is already filled.
+
+ We could error out, but that is not helping anybody; the user is not
+ even seeing with what the file external would be replaced, so let's
+ report a skip and continue the update.
+ */
+
+ if (eb->notify_func)
+ {
+ svn_wc_notify_t *notify;
+ notify = svn_wc_create_notify(
+ local_abspath,
+ svn_wc_notify_update_skip_obstruction,
+ scratch_pool);
+
+ eb->notify_func(eb->notify_baton, notify, scratch_pool);
+ }
+
+ svn_pool_destroy(scratch_pool);
+ return SVN_NO_ERROR;
+ }
}
else if (status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_server_excluded
Modified: trunk/contrib/subversion/subversion/libsvn_wc/upgrade.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/upgrade.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/upgrade.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1958,6 +1958,10 @@
case SVN_WC__VERSION:
/* already upgraded */
*result_format = SVN_WC__VERSION;
+
+ SVN_SQLITE__WITH_LOCK(
+ svn_wc__db_install_schema_statistics(sdb, scratch_pool),
+ sdb);
}
#ifdef SVN_DEBUG
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc-checks.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc-checks.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc-checks.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,4 +1,4 @@
-/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.10/subversion/libsvn_wc/token-map.h.
* Do not edit this file -- edit the source and rerun gen-make.py */
#define STMT_VERIFICATION_TRIGGERS 0
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,4 +1,4 @@
-/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.10/subversion/libsvn_wc/token-map.h.
* Do not edit this file -- edit the source and rerun gen-make.py */
#define STMT_CREATE_SCHEMA 0
@@ -159,9 +159,32 @@
" local_relpath); " \
""
-#define STMT_UPGRADE_TO_20 4
-#define STMT_4_INFO {"STMT_UPGRADE_TO_20", NULL}
+#define STMT_INSTALL_SCHEMA_STATISTICS 4
+#define STMT_4_INFO {"STMT_INSTALL_SCHEMA_STATISTICS", NULL}
#define STMT_4 \
+ "ANALYZE sqlite_master; " \
+ "DELETE FROM sqlite_stat1 " \
+ "WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('NODES', 'sqlite_autoindex_NODES_1', '8000 8000 2 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('NODES', 'I_NODES_PARENT', '8000 8000 10 2 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('NODES', 'I_NODES_MOVED', '8000 8000 1 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('ACTUAL_NODE', 'sqlite_autoindex_ACTUAL_NODE_1', '8000 8000 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('ACTUAL_NODE', 'I_ACTUAL_PARENT', '8000 8000 10 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('LOCK', 'sqlite_autoindex_LOCK_1', '100 100 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1'); " \
+ "ANALYZE sqlite_master; " \
+ ""
+
+#define STMT_UPGRADE_TO_20 5
+#define STMT_5_INFO {"STMT_UPGRADE_TO_20", NULL}
+#define STMT_5 \
"UPDATE BASE_NODE SET checksum = (SELECT checksum FROM pristine " \
" WHERE md5_checksum = BASE_NODE.checksum) " \
"WHERE EXISTS (SELECT 1 FROM pristine WHERE md5_checksum = BASE_NODE.checksum); " \
@@ -202,50 +225,50 @@
"PRAGMA user_version = 20; " \
""
-#define STMT_UPGRADE_TO_21 5
-#define STMT_5_INFO {"STMT_UPGRADE_TO_21", NULL}
-#define STMT_5 \
+#define STMT_UPGRADE_TO_21 6
+#define STMT_6_INFO {"STMT_UPGRADE_TO_21", NULL}
+#define STMT_6 \
"PRAGMA user_version = 21; " \
""
-#define STMT_UPGRADE_21_SELECT_OLD_TREE_CONFLICT 6
-#define STMT_6_INFO {"STMT_UPGRADE_21_SELECT_OLD_TREE_CONFLICT", NULL}
-#define STMT_6 \
+#define STMT_UPGRADE_21_SELECT_OLD_TREE_CONFLICT 7
+#define STMT_7_INFO {"STMT_UPGRADE_21_SELECT_OLD_TREE_CONFLICT", NULL}
+#define STMT_7 \
"SELECT wc_id, local_relpath, tree_conflict_data " \
"FROM actual_node " \
"WHERE tree_conflict_data IS NOT NULL " \
""
-#define STMT_UPGRADE_21_ERASE_OLD_CONFLICTS 7
-#define STMT_7_INFO {"STMT_UPGRADE_21_ERASE_OLD_CONFLICTS", NULL}
-#define STMT_7 \
+#define STMT_UPGRADE_21_ERASE_OLD_CONFLICTS 8
+#define STMT_8_INFO {"STMT_UPGRADE_21_ERASE_OLD_CONFLICTS", NULL}
+#define STMT_8 \
"UPDATE actual_node SET tree_conflict_data = NULL " \
""
-#define STMT_UPGRADE_TO_22 8
-#define STMT_8_INFO {"STMT_UPGRADE_TO_22", NULL}
-#define STMT_8 \
+#define STMT_UPGRADE_TO_22 9
+#define STMT_9_INFO {"STMT_UPGRADE_TO_22", NULL}
+#define STMT_9 \
"UPDATE actual_node SET tree_conflict_data = conflict_data; " \
"UPDATE actual_node SET conflict_data = NULL; " \
"PRAGMA user_version = 22; " \
""
-#define STMT_UPGRADE_TO_23 9
-#define STMT_9_INFO {"STMT_UPGRADE_TO_23", NULL}
-#define STMT_9 \
+#define STMT_UPGRADE_TO_23 10
+#define STMT_10_INFO {"STMT_UPGRADE_TO_23", NULL}
+#define STMT_10 \
"PRAGMA user_version = 23; " \
""
-#define STMT_UPGRADE_23_HAS_WORKING_NODES 10
-#define STMT_10_INFO {"STMT_UPGRADE_23_HAS_WORKING_NODES", NULL}
-#define STMT_10 \
+#define STMT_UPGRADE_23_HAS_WORKING_NODES 11
+#define STMT_11_INFO {"STMT_UPGRADE_23_HAS_WORKING_NODES", NULL}
+#define STMT_11 \
"SELECT 1 FROM nodes WHERE op_depth > 0 " \
"LIMIT 1 " \
""
-#define STMT_UPGRADE_TO_24 11
-#define STMT_11_INFO {"STMT_UPGRADE_TO_24", NULL}
-#define STMT_11 \
+#define STMT_UPGRADE_TO_24 12
+#define STMT_12_INFO {"STMT_UPGRADE_TO_24", NULL}
+#define STMT_12 \
"UPDATE pristine SET refcount = " \
" (SELECT COUNT(*) FROM nodes " \
" WHERE checksum = pristine.checksum ); " \
@@ -252,9 +275,9 @@
"PRAGMA user_version = 24; " \
""
-#define STMT_UPGRADE_TO_25 12
-#define STMT_12_INFO {"STMT_UPGRADE_TO_25", NULL}
-#define STMT_12 \
+#define STMT_UPGRADE_TO_25 13
+#define STMT_13_INFO {"STMT_UPGRADE_TO_25", NULL}
+#define STMT_13 \
"DROP VIEW IF EXISTS NODES_CURRENT; " \
"CREATE VIEW NODES_CURRENT AS " \
" SELECT * FROM nodes " \
@@ -266,9 +289,9 @@
"PRAGMA user_version = 25; " \
""
-#define STMT_UPGRADE_TO_26 13
-#define STMT_13_INFO {"STMT_UPGRADE_TO_26", NULL}
-#define STMT_13 \
+#define STMT_UPGRADE_TO_26 14
+#define STMT_14_INFO {"STMT_UPGRADE_TO_26", NULL}
+#define STMT_14 \
"DROP VIEW IF EXISTS NODES_BASE; " \
"CREATE VIEW NODES_BASE AS " \
" SELECT * FROM nodes " \
@@ -276,15 +299,15 @@
"PRAGMA user_version = 26; " \
""
-#define STMT_UPGRADE_TO_27 14
-#define STMT_14_INFO {"STMT_UPGRADE_TO_27", NULL}
-#define STMT_14 \
+#define STMT_UPGRADE_TO_27 15
+#define STMT_15_INFO {"STMT_UPGRADE_TO_27", NULL}
+#define STMT_15 \
"PRAGMA user_version = 27; " \
""
-#define STMT_UPGRADE_27_HAS_ACTUAL_NODES_CONFLICTS 15
-#define STMT_15_INFO {"STMT_UPGRADE_27_HAS_ACTUAL_NODES_CONFLICTS", NULL}
-#define STMT_15 \
+#define STMT_UPGRADE_27_HAS_ACTUAL_NODES_CONFLICTS 16
+#define STMT_16_INFO {"STMT_UPGRADE_27_HAS_ACTUAL_NODES_CONFLICTS", NULL}
+#define STMT_16 \
"SELECT 1 FROM actual_node " \
"WHERE NOT ((prop_reject IS NULL) AND (conflict_old IS NULL) " \
" AND (conflict_new IS NULL) AND (conflict_working IS NULL) " \
@@ -292,9 +315,9 @@
"LIMIT 1 " \
""
-#define STMT_UPGRADE_TO_28 16
-#define STMT_16_INFO {"STMT_UPGRADE_TO_28", NULL}
-#define STMT_16 \
+#define STMT_UPGRADE_TO_28 17
+#define STMT_17_INFO {"STMT_UPGRADE_TO_28", NULL}
+#define STMT_17 \
"UPDATE NODES SET checksum = (SELECT checksum FROM pristine " \
" WHERE md5_checksum = nodes.checksum) " \
"WHERE EXISTS (SELECT 1 FROM pristine WHERE md5_checksum = nodes.checksum); " \
@@ -301,9 +324,9 @@
"PRAGMA user_version = 28; " \
""
-#define STMT_UPGRADE_TO_29 17
-#define STMT_17_INFO {"STMT_UPGRADE_TO_29", NULL}
-#define STMT_17 \
+#define STMT_UPGRADE_TO_29 18
+#define STMT_18_INFO {"STMT_UPGRADE_TO_29", NULL}
+#define STMT_18 \
"DROP TRIGGER IF EXISTS nodes_update_checksum_trigger; " \
"DROP TRIGGER IF EXISTS nodes_insert_trigger; " \
"DROP TRIGGER IF EXISTS nodes_delete_trigger; " \
@@ -333,9 +356,9 @@
"PRAGMA user_version = 29; " \
""
-#define STMT_UPGRADE_TO_30 18
-#define STMT_18_INFO {"STMT_UPGRADE_TO_30", NULL}
-#define STMT_18 \
+#define STMT_UPGRADE_TO_30 19
+#define STMT_19_INFO {"STMT_UPGRADE_TO_30", NULL}
+#define STMT_19 \
"CREATE UNIQUE INDEX IF NOT EXISTS I_NODES_MOVED " \
"ON NODES (wc_id, moved_to, op_depth); " \
"CREATE INDEX IF NOT EXISTS I_PRISTINE_MD5 ON PRISTINE (md5_checksum); " \
@@ -343,9 +366,9 @@
"UPDATE nodes SET file_external=1 WHERE file_external IS NOT NULL; " \
""
-#define STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE 19
-#define STMT_19_INFO {"STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE", NULL}
-#define STMT_19 \
+#define STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE 20
+#define STMT_20_INFO {"STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE", NULL}
+#define STMT_20 \
"SELECT wc_id, local_relpath, " \
" conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data " \
"FROM actual_node " \
@@ -357,9 +380,9 @@
"ORDER by wc_id, local_relpath " \
""
-#define STMT_UPGRADE_30_SET_CONFLICT 20
-#define STMT_20_INFO {"STMT_UPGRADE_30_SET_CONFLICT", NULL}
-#define STMT_20 \
+#define STMT_UPGRADE_30_SET_CONFLICT 21
+#define STMT_21_INFO {"STMT_UPGRADE_30_SET_CONFLICT", NULL}
+#define STMT_21 \
"UPDATE actual_node SET conflict_data = ?3, conflict_old = NULL, " \
" conflict_working = NULL, conflict_new = NULL, prop_reject = NULL, " \
" tree_conflict_data = NULL " \
@@ -366,15 +389,15 @@
"WHERE wc_id = ?1 and local_relpath = ?2 " \
""
-#define STMT_UPGRADE_TO_31_ALTER_TABLE 21
-#define STMT_21_INFO {"STMT_UPGRADE_TO_31_ALTER_TABLE", NULL}
-#define STMT_21 \
+#define STMT_UPGRADE_TO_31_ALTER_TABLE 22
+#define STMT_22_INFO {"STMT_UPGRADE_TO_31_ALTER_TABLE", NULL}
+#define STMT_22 \
"ALTER TABLE NODES ADD COLUMN inherited_props BLOB; " \
""
-#define STMT_UPGRADE_TO_31_FINALIZE 22
-#define STMT_22_INFO {"STMT_UPGRADE_TO_31_FINALIZE", NULL}
-#define STMT_22 \
+#define STMT_UPGRADE_TO_31_FINALIZE 23
+#define STMT_23_INFO {"STMT_UPGRADE_TO_31_FINALIZE", NULL}
+#define STMT_23 \
"DROP INDEX IF EXISTS I_ACTUAL_CHANGELIST; " \
"DROP INDEX IF EXISTS I_EXTERNALS_PARENT; " \
"DROP INDEX I_NODES_PARENT; " \
@@ -386,9 +409,9 @@
"PRAGMA user_version = 31; " \
""
-#define STMT_UPGRADE_31_SELECT_WCROOT_NODES 23
-#define STMT_23_INFO {"STMT_UPGRADE_31_SELECT_WCROOT_NODES", NULL}
-#define STMT_23 \
+#define STMT_UPGRADE_31_SELECT_WCROOT_NODES 24
+#define STMT_24_INFO {"STMT_UPGRADE_31_SELECT_WCROOT_NODES", NULL}
+#define STMT_24 \
"SELECT l.wc_id, l.local_relpath FROM nodes as l " \
"LEFT OUTER JOIN nodes as r " \
"ON l.wc_id = r.wc_id " \
@@ -400,9 +423,9 @@
" OR (l.repos_path IS NOT (CASE WHEN (r.local_relpath) = '' THEN (CASE WHEN (r.repos_path) = '' THEN (l.local_relpath) WHEN (l.local_relpath) = '' THEN (r.repos_path) ELSE (r.repos_path) || '/' || (l.local_relpath) END) WHEN (r.repos_path) = '' THEN (CASE WHEN (r.local_relpath) = '' THEN (l.local_relpath) WHEN SUBSTR((l.local_relpath), 1, LENGTH(r.local_relpath)) = (r.local_relpath) THEN CASE WHEN LENGTH(r.local_relpath) = LENGTH(l.local_relpath) THEN '' WHEN SUBSTR((l.local_relpath), LENGTH(r.local_relpath)+1, 1) = '/' THEN SUBSTR((l.local_relpath), LENGTH(r.local_relpath)+2) END END) WHEN SUBSTR((l.local_relpath), 1, LENGTH(r.local_relpath)) = (r.local_relpath) THEN CASE WHEN LENGTH(r.local_relpath) = LENGTH(l.local_relpath) THEN (r.repos_path) WHEN SUBSTR((l.local_relpath), LENGTH(r.local_relpath)+1, 1) = '/' THEN (r.repos_path) || SUBSTR((l.local_relpath), LENGTH(r.local_relpath)+1) END END))) " \
""
-#define STMT_UPGRADE_TO_32 24
-#define STMT_24_INFO {"STMT_UPGRADE_TO_32", NULL}
-#define STMT_24 \
+#define STMT_UPGRADE_TO_32 25
+#define STMT_25_INFO {"STMT_UPGRADE_TO_32", NULL}
+#define STMT_25 \
"DROP INDEX IF EXISTS I_ACTUAL_CHANGELIST; " \
"DROP INDEX IF EXISTS I_EXTERNALS_PARENT; " \
"CREATE INDEX I_EXTERNALS_PARENT ON EXTERNALS (wc_id, parent_relpath); " \
@@ -482,6 +505,7 @@
STMT_22, \
STMT_23, \
STMT_24, \
+ STMT_25, \
NULL \
}
@@ -512,5 +536,6 @@
STMT_22_INFO, \
STMT_23_INFO, \
STMT_24_INFO, \
+ STMT_25_INFO, \
{NULL, NULL} \
}
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql 2017-02-20 02:39:09 UTC (rev 9266)
@@ -573,7 +573,58 @@
local_relpath);
/* ------------------------------------------------------------------------- */
+/* This statement provides SQLite with the necessary information about our
+ indexes to make better decisions in the query planner.
+ For every interesting index this contains a number of rows where the
+ statistics ar calculated for and then for every column in the index the
+ average number of rows with the same value in all columns left of this
+ column including the column itself.
+
+ See http://www.sqlite.org/fileformat2.html#stat1tab for more details.
+
+ The important thing here is that this tells Sqlite that the wc_id column
+ of the NODES and ACTUAL_NODE table is usually a single value, so queries
+ should use more than one column for index usage.
+
+ The current hints describe NODES+ACTUAL_NODE as a working copy with
+ 8000 nodes in 1 a single working copy(=wc_id), 10 nodes per directory
+ and an average of 2 op-depth layers per node.
+
+ The number of integers must be number of index columns + 1, which is
+ verified via the test_schema_statistics() test.
+ */
+-- STMT_INSTALL_SCHEMA_STATISTICS
+ANALYZE sqlite_master; /* Creates empty sqlite_stat1 if necessary */
+
+DELETE FROM sqlite_stat1
+WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK');
+
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'sqlite_autoindex_NODES_1', '8000 8000 2 1');
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'I_NODES_PARENT', '8000 8000 10 2 1');
+/* Tell a lie: We ignore that 99.9% of all moved_to values are NULL */
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('NODES', 'I_NODES_MOVED', '8000 8000 1 1');
+
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('ACTUAL_NODE', 'sqlite_autoindex_ACTUAL_NODE_1', '8000 8000 1');
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('ACTUAL_NODE', 'I_ACTUAL_PARENT', '8000 8000 10 1');
+
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('LOCK', 'sqlite_autoindex_LOCK_1', '100 100 1');
+
+INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES
+ ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1');
+
+/* sqlite_autoindex_WORK_QUEUE_1 doesn't exist because WORK_QUEUE is
+ a INTEGER PRIMARY KEY AUTOINCREMENT table */
+
+ANALYZE sqlite_master; /* Loads sqlite_stat1 data for query optimizer */
+/* ------------------------------------------------------------------------- */
+
/* Format 20 introduces NODES and removes BASE_NODE and WORKING_NODE */
-- STMT_UPGRADE_TO_20
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,4 +1,4 @@
-/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.10/subversion/libsvn_wc/token-map.h.
* Do not edit this file -- edit the source and rerun gen-make.py */
#define STMT_SELECT_NODE_INFO 0
@@ -221,7 +221,7 @@
#define STMT_21 \
"DELETE " \
"FROM NODES " \
- "WHERE wc_id = ?1 AND local_relpath = ?2 " \
+ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \
""
#define STMT_DELETE_ACTUAL_FOR_BASE_RECURSIVE 22
@@ -516,9 +516,18 @@
"LIMIT 1 " \
""
-#define STMT_SELECT_OP_DEPTH_MOVED_TO 50
-#define STMT_50_INFO {"STMT_SELECT_OP_DEPTH_MOVED_TO", NULL}
+#define STMT_SELECT_MOVED_TO_NODE 50
+#define STMT_50_INFO {"STMT_SELECT_MOVED_TO_NODE", NULL}
#define STMT_50 \
+ "SELECT op_depth, moved_to " \
+ "FROM nodes " \
+ "WHERE wc_id = ?1 AND local_relpath = ?2 AND moved_to IS NOT NULL " \
+ "ORDER BY op_depth DESC " \
+ ""
+
+#define STMT_SELECT_OP_DEPTH_MOVED_TO 51
+#define STMT_51_INFO {"STMT_SELECT_OP_DEPTH_MOVED_TO", NULL}
+#define STMT_51 \
"SELECT op_depth, moved_to, repos_path, revision " \
"FROM nodes " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
@@ -527,17 +536,17 @@
"ORDER BY op_depth DESC " \
""
-#define STMT_SELECT_MOVED_TO 51
-#define STMT_51_INFO {"STMT_SELECT_MOVED_TO", NULL}
-#define STMT_51 \
+#define STMT_SELECT_MOVED_TO 52
+#define STMT_52_INFO {"STMT_SELECT_MOVED_TO", NULL}
+#define STMT_52 \
"SELECT moved_to " \
"FROM nodes " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \
""
-#define STMT_SELECT_MOVED_HERE 52
-#define STMT_52_INFO {"STMT_SELECT_MOVED_HERE", NULL}
-#define STMT_52 \
+#define STMT_SELECT_MOVED_HERE 53
+#define STMT_53_INFO {"STMT_SELECT_MOVED_HERE", NULL}
+#define STMT_53 \
"SELECT moved_here, presence, repos_path, revision " \
"FROM nodes " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth >= ?3 " \
@@ -544,9 +553,9 @@
"ORDER BY op_depth " \
""
-#define STMT_SELECT_MOVED_BACK 53
-#define STMT_53_INFO {"STMT_SELECT_MOVED_BACK", NULL}
-#define STMT_53 \
+#define STMT_SELECT_MOVED_BACK 54
+#define STMT_54_INFO {"STMT_SELECT_MOVED_BACK", NULL}
+#define STMT_54 \
"SELECT u.local_relpath, " \
" u.presence, u.repos_id, u.repos_path, u.revision, " \
" l.presence, l.repos_id, l.repos_path, l.revision, " \
@@ -572,9 +581,9 @@
" AND u.op_depth = ?4 " \
""
-#define STMT_DELETE_MOVED_BACK 54
-#define STMT_54_INFO {"STMT_DELETE_MOVED_BACK", NULL}
-#define STMT_54 \
+#define STMT_DELETE_MOVED_BACK 55
+#define STMT_55_INFO {"STMT_DELETE_MOVED_BACK", NULL}
+#define STMT_55 \
"DELETE FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 " \
@@ -582,23 +591,23 @@
" AND op_depth = ?3 " \
""
-#define STMT_DELETE_LOCK 55
-#define STMT_55_INFO {"STMT_DELETE_LOCK", NULL}
-#define STMT_55 \
+#define STMT_DELETE_LOCK 56
+#define STMT_56_INFO {"STMT_DELETE_LOCK", NULL}
+#define STMT_56 \
"DELETE FROM lock " \
"WHERE repos_id = ?1 AND repos_relpath = ?2 " \
""
-#define STMT_DELETE_LOCK_RECURSIVELY 56
-#define STMT_56_INFO {"STMT_DELETE_LOCK_RECURSIVELY", NULL}
-#define STMT_56 \
+#define STMT_DELETE_LOCK_RECURSIVELY 57
+#define STMT_57_INFO {"STMT_DELETE_LOCK_RECURSIVELY", NULL}
+#define STMT_57 \
"DELETE FROM lock " \
"WHERE repos_id = ?1 AND (repos_relpath = ?2 OR (((repos_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((repos_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
""
-#define STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE 57
-#define STMT_57_INFO {"STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE", NULL}
-#define STMT_57 \
+#define STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE 58
+#define STMT_58_INFO {"STMT_CLEAR_BASE_NODE_RECURSIVE_DAV_CACHE", NULL}
+#define STMT_58 \
"UPDATE nodes SET dav_cache = NULL " \
"WHERE dav_cache IS NOT NULL AND wc_id = ?1 AND op_depth = 0 " \
" AND (local_relpath = ?2 " \
@@ -605,9 +614,9 @@
" OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
""
-#define STMT_RECURSIVE_UPDATE_NODE_REPO 58
-#define STMT_58_INFO {"STMT_RECURSIVE_UPDATE_NODE_REPO", NULL}
-#define STMT_58 \
+#define STMT_RECURSIVE_UPDATE_NODE_REPO 59
+#define STMT_59_INFO {"STMT_RECURSIVE_UPDATE_NODE_REPO", NULL}
+#define STMT_59 \
"UPDATE nodes SET repos_id = ?4, dav_cache = NULL " \
"WHERE (wc_id = ?1 AND local_relpath = ?2 AND repos_id = ?3) " \
" OR (wc_id = ?1 AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -614,16 +623,16 @@
" AND repos_id = ?3) " \
""
-#define STMT_UPDATE_LOCK_REPOS_ID 59
-#define STMT_59_INFO {"STMT_UPDATE_LOCK_REPOS_ID", NULL}
-#define STMT_59 \
+#define STMT_UPDATE_LOCK_REPOS_ID 60
+#define STMT_60_INFO {"STMT_UPDATE_LOCK_REPOS_ID", NULL}
+#define STMT_60 \
"UPDATE lock SET repos_id = ?2 " \
"WHERE repos_id = ?1 " \
""
-#define STMT_UPDATE_NODE_FILEINFO 60
-#define STMT_60_INFO {"STMT_UPDATE_NODE_FILEINFO", NULL}
-#define STMT_60 \
+#define STMT_UPDATE_NODE_FILEINFO 61
+#define STMT_61_INFO {"STMT_UPDATE_NODE_FILEINFO", NULL}
+#define STMT_61 \
"UPDATE nodes SET translated_size = ?3, last_mod_time = ?4 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
" AND op_depth = (SELECT MAX(op_depth) FROM nodes " \
@@ -630,23 +639,23 @@
" WHERE wc_id = ?1 AND local_relpath = ?2) " \
""
-#define STMT_INSERT_ACTUAL_CONFLICT 61
-#define STMT_61_INFO {"STMT_INSERT_ACTUAL_CONFLICT", NULL}
-#define STMT_61 \
+#define STMT_INSERT_ACTUAL_CONFLICT 62
+#define STMT_62_INFO {"STMT_INSERT_ACTUAL_CONFLICT", NULL}
+#define STMT_62 \
"INSERT INTO actual_node (wc_id, local_relpath, conflict_data, parent_relpath) " \
"VALUES (?1, ?2, ?3, ?4) " \
""
-#define STMT_UPDATE_ACTUAL_CONFLICT 62
-#define STMT_62_INFO {"STMT_UPDATE_ACTUAL_CONFLICT", NULL}
-#define STMT_62 \
+#define STMT_UPDATE_ACTUAL_CONFLICT 63
+#define STMT_63_INFO {"STMT_UPDATE_ACTUAL_CONFLICT", NULL}
+#define STMT_63 \
"UPDATE actual_node SET conflict_data = ?3 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
""
-#define STMT_UPDATE_ACTUAL_CHANGELISTS 63
-#define STMT_63_INFO {"STMT_UPDATE_ACTUAL_CHANGELISTS", NULL}
-#define STMT_63 \
+#define STMT_UPDATE_ACTUAL_CHANGELISTS 64
+#define STMT_64_INFO {"STMT_UPDATE_ACTUAL_CHANGELISTS", NULL}
+#define STMT_64 \
"UPDATE actual_node SET changelist = ?3 " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
@@ -656,16 +665,16 @@
" AND kind = 'file') " \
""
-#define STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST 64
-#define STMT_64_INFO {"STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST", NULL}
-#define STMT_64 \
+#define STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST 65
+#define STMT_65_INFO {"STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST", NULL}
+#define STMT_65 \
"UPDATE actual_node SET changelist = NULL " \
" WHERE wc_id = ?1 AND local_relpath = ?2 " \
""
-#define STMT_MARK_SKIPPED_CHANGELIST_DIRS 65
-#define STMT_65_INFO {"STMT_MARK_SKIPPED_CHANGELIST_DIRS", NULL}
-#define STMT_65 \
+#define STMT_MARK_SKIPPED_CHANGELIST_DIRS 66
+#define STMT_66_INFO {"STMT_MARK_SKIPPED_CHANGELIST_DIRS", NULL}
+#define STMT_66 \
"INSERT INTO changelist_list (wc_id, local_relpath, notify, changelist) " \
"SELECT wc_id, local_relpath, 7, ?3 " \
"FROM targets_list " \
@@ -674,17 +683,17 @@
" AND kind = 'dir' " \
""
-#define STMT_RESET_ACTUAL_WITH_CHANGELIST 66
-#define STMT_66_INFO {"STMT_RESET_ACTUAL_WITH_CHANGELIST", NULL}
-#define STMT_66 \
+#define STMT_RESET_ACTUAL_WITH_CHANGELIST 67
+#define STMT_67_INFO {"STMT_RESET_ACTUAL_WITH_CHANGELIST", NULL}
+#define STMT_67 \
"REPLACE INTO actual_node ( " \
" wc_id, local_relpath, parent_relpath, changelist) " \
"VALUES (?1, ?2, ?3, ?4) " \
""
-#define STMT_CREATE_CHANGELIST_LIST 67
-#define STMT_67_INFO {"STMT_CREATE_CHANGELIST_LIST", NULL}
-#define STMT_67 \
+#define STMT_CREATE_CHANGELIST_LIST 68
+#define STMT_68_INFO {"STMT_CREATE_CHANGELIST_LIST", NULL}
+#define STMT_68 \
"DROP TABLE IF EXISTS changelist_list; " \
"CREATE TEMPORARY TABLE changelist_list ( " \
" wc_id INTEGER NOT NULL, " \
@@ -695,9 +704,9 @@
") " \
""
-#define STMT_CREATE_CHANGELIST_TRIGGER 68
-#define STMT_68_INFO {"STMT_CREATE_CHANGELIST_TRIGGER", NULL}
-#define STMT_68 \
+#define STMT_CREATE_CHANGELIST_TRIGGER 69
+#define STMT_69_INFO {"STMT_CREATE_CHANGELIST_TRIGGER", NULL}
+#define STMT_69 \
"DROP TRIGGER IF EXISTS trigger_changelist_list_change; " \
"CREATE TEMPORARY TRIGGER trigger_changelist_list_change " \
"BEFORE UPDATE ON actual_node " \
@@ -712,25 +721,25 @@
"END " \
""
-#define STMT_FINALIZE_CHANGELIST 69
-#define STMT_69_INFO {"STMT_FINALIZE_CHANGELIST", NULL}
-#define STMT_69 \
+#define STMT_FINALIZE_CHANGELIST 70
+#define STMT_70_INFO {"STMT_FINALIZE_CHANGELIST", NULL}
+#define STMT_70 \
"DROP TRIGGER trigger_changelist_list_change; " \
"DROP TABLE changelist_list; " \
"DROP TABLE targets_list " \
""
-#define STMT_SELECT_CHANGELIST_LIST 70
-#define STMT_70_INFO {"STMT_SELECT_CHANGELIST_LIST", NULL}
-#define STMT_70 \
+#define STMT_SELECT_CHANGELIST_LIST 71
+#define STMT_71_INFO {"STMT_SELECT_CHANGELIST_LIST", NULL}
+#define STMT_71 \
"SELECT wc_id, local_relpath, notify, changelist " \
"FROM changelist_list " \
"ORDER BY wc_id, local_relpath ASC, notify DESC " \
""
-#define STMT_CREATE_TARGETS_LIST 71
-#define STMT_71_INFO {"STMT_CREATE_TARGETS_LIST", NULL}
-#define STMT_71 \
+#define STMT_CREATE_TARGETS_LIST 72
+#define STMT_72_INFO {"STMT_CREATE_TARGETS_LIST", NULL}
+#define STMT_72 \
"DROP TABLE IF EXISTS targets_list; " \
"CREATE TEMPORARY TABLE targets_list ( " \
" wc_id INTEGER NOT NULL, " \
@@ -741,15 +750,15 @@
" ); " \
""
-#define STMT_DROP_TARGETS_LIST 72
-#define STMT_72_INFO {"STMT_DROP_TARGETS_LIST", NULL}
-#define STMT_72 \
+#define STMT_DROP_TARGETS_LIST 73
+#define STMT_73_INFO {"STMT_DROP_TARGETS_LIST", NULL}
+#define STMT_73 \
"DROP TABLE targets_list " \
""
-#define STMT_INSERT_TARGET 73
-#define STMT_73_INFO {"STMT_INSERT_TARGET", NULL}
-#define STMT_73 \
+#define STMT_INSERT_TARGET 74
+#define STMT_74_INFO {"STMT_INSERT_TARGET", NULL}
+#define STMT_74 \
"INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \
"SELECT wc_id, local_relpath, parent_relpath, kind " \
"FROM nodes_current " \
@@ -757,9 +766,9 @@
" AND local_relpath = ?2 " \
""
-#define STMT_INSERT_TARGET_DEPTH_FILES 74
-#define STMT_74_INFO {"STMT_INSERT_TARGET_DEPTH_FILES", NULL}
-#define STMT_74 \
+#define STMT_INSERT_TARGET_DEPTH_FILES 75
+#define STMT_75_INFO {"STMT_INSERT_TARGET_DEPTH_FILES", NULL}
+#define STMT_75 \
"INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \
"SELECT wc_id, local_relpath, parent_relpath, kind " \
"FROM nodes_current " \
@@ -768,9 +777,9 @@
" AND kind = 'file' " \
""
-#define STMT_INSERT_TARGET_DEPTH_IMMEDIATES 75
-#define STMT_75_INFO {"STMT_INSERT_TARGET_DEPTH_IMMEDIATES", NULL}
-#define STMT_75 \
+#define STMT_INSERT_TARGET_DEPTH_IMMEDIATES 76
+#define STMT_76_INFO {"STMT_INSERT_TARGET_DEPTH_IMMEDIATES", NULL}
+#define STMT_76 \
"INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \
"SELECT wc_id, local_relpath, parent_relpath, kind " \
"FROM nodes_current " \
@@ -778,9 +787,9 @@
" AND parent_relpath = ?2 " \
""
-#define STMT_INSERT_TARGET_DEPTH_INFINITY 76
-#define STMT_76_INFO {"STMT_INSERT_TARGET_DEPTH_INFINITY", NULL}
-#define STMT_76 \
+#define STMT_INSERT_TARGET_DEPTH_INFINITY 77
+#define STMT_77_INFO {"STMT_INSERT_TARGET_DEPTH_INFINITY", NULL}
+#define STMT_77 \
"INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \
"SELECT wc_id, local_relpath, parent_relpath, kind " \
"FROM nodes_current " \
@@ -788,9 +797,9 @@
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
""
-#define STMT_INSERT_TARGET_WITH_CHANGELIST 77
-#define STMT_77_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST", NULL}
-#define STMT_77 \
+#define STMT_INSERT_TARGET_WITH_CHANGELIST 78
+#define STMT_78_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST", NULL}
+#define STMT_78 \
"INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \
"SELECT N.wc_id, N.local_relpath, N.parent_relpath, N.kind " \
" FROM actual_node AS A JOIN nodes_current AS N " \
@@ -800,9 +809,9 @@
" AND A.changelist = ?3 " \
""
-#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_FILES 78
-#define STMT_78_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_FILES", NULL}
-#define STMT_78 \
+#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_FILES 79
+#define STMT_79_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_FILES", NULL}
+#define STMT_79 \
"INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \
"SELECT N.wc_id, N.local_relpath, N.parent_relpath, N.kind " \
" FROM actual_node AS A JOIN nodes_current AS N " \
@@ -813,9 +822,9 @@
" AND A.changelist = ?3 " \
""
-#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_IMMEDIATES 79
-#define STMT_79_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_IMMEDIATES", NULL}
-#define STMT_79 \
+#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_IMMEDIATES 80
+#define STMT_80_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_IMMEDIATES", NULL}
+#define STMT_80 \
"INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \
"SELECT N.wc_id, N.local_relpath, N.parent_relpath, N.kind " \
" FROM actual_node AS A JOIN nodes_current AS N " \
@@ -825,9 +834,9 @@
" AND A.changelist = ?3 " \
""
-#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_INFINITY 80
-#define STMT_80_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_INFINITY", NULL}
-#define STMT_80 \
+#define STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_INFINITY 81
+#define STMT_81_INFO {"STMT_INSERT_TARGET_WITH_CHANGELIST_DEPTH_INFINITY", NULL}
+#define STMT_81 \
"INSERT INTO targets_list(wc_id, local_relpath, parent_relpath, kind) " \
"SELECT N.wc_id, N.local_relpath, N.parent_relpath, N.kind " \
" FROM actual_node AS A JOIN nodes_current AS N " \
@@ -837,9 +846,9 @@
" AND A.changelist = ?3 " \
""
-#define STMT_INSERT_ACTUAL_EMPTIES 81
-#define STMT_81_INFO {"STMT_INSERT_ACTUAL_EMPTIES", NULL}
-#define STMT_81 \
+#define STMT_INSERT_ACTUAL_EMPTIES 82
+#define STMT_82_INFO {"STMT_INSERT_ACTUAL_EMPTIES", NULL}
+#define STMT_82 \
"INSERT OR IGNORE INTO actual_node ( " \
" wc_id, local_relpath, parent_relpath) " \
"SELECT wc_id, local_relpath, parent_relpath " \
@@ -846,9 +855,9 @@
"FROM targets_list " \
""
-#define STMT_DELETE_ACTUAL_EMPTY 82
-#define STMT_82_INFO {"STMT_DELETE_ACTUAL_EMPTY", NULL}
-#define STMT_82 \
+#define STMT_DELETE_ACTUAL_EMPTY 83
+#define STMT_83_INFO {"STMT_DELETE_ACTUAL_EMPTY", NULL}
+#define STMT_83 \
"DELETE FROM actual_node " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
" AND properties IS NULL " \
@@ -860,9 +869,9 @@
" AND left_checksum IS NULL " \
""
-#define STMT_DELETE_ACTUAL_EMPTIES 83
-#define STMT_83_INFO {"STMT_DELETE_ACTUAL_EMPTIES", NULL}
-#define STMT_83 \
+#define STMT_DELETE_ACTUAL_EMPTIES 84
+#define STMT_84_INFO {"STMT_DELETE_ACTUAL_EMPTIES", NULL}
+#define STMT_84 \
"DELETE FROM actual_node " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -875,16 +884,16 @@
" AND left_checksum IS NULL " \
""
-#define STMT_DELETE_BASE_NODE 84
-#define STMT_84_INFO {"STMT_DELETE_BASE_NODE", NULL}
-#define STMT_84 \
+#define STMT_DELETE_BASE_NODE 85
+#define STMT_85_INFO {"STMT_DELETE_BASE_NODE", NULL}
+#define STMT_85 \
"DELETE FROM nodes " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \
""
-#define STMT_DELETE_WORKING_NODE 85
-#define STMT_85_INFO {"STMT_DELETE_WORKING_NODE", NULL}
-#define STMT_85 \
+#define STMT_DELETE_WORKING_NODE 86
+#define STMT_86_INFO {"STMT_DELETE_WORKING_NODE", NULL}
+#define STMT_86 \
"DELETE FROM nodes " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
" AND op_depth = (SELECT MAX(op_depth) FROM nodes " \
@@ -891,9 +900,9 @@
" WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > 0) " \
""
-#define STMT_DELETE_LOWEST_WORKING_NODE 86
-#define STMT_86_INFO {"STMT_DELETE_LOWEST_WORKING_NODE", NULL}
-#define STMT_86 \
+#define STMT_DELETE_LOWEST_WORKING_NODE 87
+#define STMT_87_INFO {"STMT_DELETE_LOWEST_WORKING_NODE", NULL}
+#define STMT_87 \
"DELETE FROM nodes " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
" AND op_depth = (SELECT MIN(op_depth) FROM nodes " \
@@ -901,16 +910,16 @@
" AND presence = 'base-deleted' " \
""
-#define STMT_DELETE_ALL_LAYERS 87
-#define STMT_87_INFO {"STMT_DELETE_ALL_LAYERS", NULL}
-#define STMT_87 \
+#define STMT_DELETE_NODE_ALL_LAYERS 88
+#define STMT_88_INFO {"STMT_DELETE_NODE_ALL_LAYERS", NULL}
+#define STMT_88 \
"DELETE FROM nodes " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
""
-#define STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE 88
-#define STMT_88_INFO {"STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE", NULL}
-#define STMT_88 \
+#define STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE 89
+#define STMT_89_INFO {"STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE", NULL}
+#define STMT_89 \
"DELETE FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 " \
@@ -918,16 +927,16 @@
" AND op_depth >= ?3 " \
""
-#define STMT_DELETE_ACTUAL_NODE 89
-#define STMT_89_INFO {"STMT_DELETE_ACTUAL_NODE", NULL}
-#define STMT_89 \
+#define STMT_DELETE_ACTUAL_NODE 90
+#define STMT_90_INFO {"STMT_DELETE_ACTUAL_NODE", NULL}
+#define STMT_90 \
"DELETE FROM actual_node " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
""
-#define STMT_DELETE_ACTUAL_NODE_RECURSIVE 90
-#define STMT_90_INFO {"STMT_DELETE_ACTUAL_NODE_RECURSIVE", NULL}
-#define STMT_90 \
+#define STMT_DELETE_ACTUAL_NODE_RECURSIVE 91
+#define STMT_91_INFO {"STMT_DELETE_ACTUAL_NODE_RECURSIVE", NULL}
+#define STMT_91 \
"DELETE FROM actual_node " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 " \
@@ -934,9 +943,9 @@
" OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
""
-#define STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST 91
-#define STMT_91_INFO {"STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST", NULL}
-#define STMT_91 \
+#define STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST 92
+#define STMT_92_INFO {"STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST", NULL}
+#define STMT_92 \
"DELETE FROM actual_node " \
"WHERE wc_id = ?1 " \
" AND local_relpath = ?2 " \
@@ -946,9 +955,9 @@
" AND c.kind = 'file')) " \
""
-#define STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE 92
-#define STMT_92_INFO {"STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE", NULL}
-#define STMT_92 \
+#define STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE 93
+#define STMT_93_INFO {"STMT_DELETE_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE", NULL}
+#define STMT_93 \
"DELETE FROM actual_node " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 " \
@@ -960,9 +969,9 @@
" AND c.kind = 'file')) " \
""
-#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST 93
-#define STMT_93_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST", NULL}
-#define STMT_93 \
+#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST 94
+#define STMT_94_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST", NULL}
+#define STMT_94 \
"UPDATE actual_node " \
"SET properties = NULL, " \
" text_mod = NULL, " \
@@ -974,9 +983,9 @@
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
""
-#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE 94
-#define STMT_94_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE", NULL}
-#define STMT_94 \
+#define STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE 95
+#define STMT_95_INFO {"STMT_CLEAR_ACTUAL_NODE_LEAVING_CHANGELIST_RECURSIVE", NULL}
+#define STMT_95 \
"UPDATE actual_node " \
"SET properties = NULL, " \
" text_mod = NULL, " \
@@ -990,108 +999,108 @@
" OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
""
-#define STMT_UPDATE_NODE_BASE_DEPTH 95
-#define STMT_95_INFO {"STMT_UPDATE_NODE_BASE_DEPTH", NULL}
-#define STMT_95 \
+#define STMT_UPDATE_NODE_BASE_DEPTH 96
+#define STMT_96_INFO {"STMT_UPDATE_NODE_BASE_DEPTH", NULL}
+#define STMT_96 \
"UPDATE nodes SET depth = ?3 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \
" AND kind='dir' " \
""
-#define STMT_UPDATE_NODE_BASE_PRESENCE 96
-#define STMT_96_INFO {"STMT_UPDATE_NODE_BASE_PRESENCE", NULL}
-#define STMT_96 \
+#define STMT_UPDATE_NODE_BASE_PRESENCE 97
+#define STMT_97_INFO {"STMT_UPDATE_NODE_BASE_PRESENCE", NULL}
+#define STMT_97 \
"UPDATE nodes SET presence = ?3 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \
""
-#define STMT_UPDATE_BASE_NODE_PRESENCE_REVNUM_AND_REPOS_PATH 97
-#define STMT_97_INFO {"STMT_UPDATE_BASE_NODE_PRESENCE_REVNUM_AND_REPOS_PATH", NULL}
-#define STMT_97 \
+#define STMT_UPDATE_BASE_NODE_PRESENCE_REVNUM_AND_REPOS_PATH 98
+#define STMT_98_INFO {"STMT_UPDATE_BASE_NODE_PRESENCE_REVNUM_AND_REPOS_PATH", NULL}
+#define STMT_98 \
"UPDATE nodes SET presence = ?3, revision = ?4, repos_path = ?5 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \
""
-#define STMT_LOOK_FOR_WORK 98
-#define STMT_98_INFO {"STMT_LOOK_FOR_WORK", NULL}
-#define STMT_98 \
+#define STMT_LOOK_FOR_WORK 99
+#define STMT_99_INFO {"STMT_LOOK_FOR_WORK", NULL}
+#define STMT_99 \
"SELECT id FROM work_queue LIMIT 1 " \
""
-#define STMT_INSERT_WORK_ITEM 99
-#define STMT_99_INFO {"STMT_INSERT_WORK_ITEM", NULL}
-#define STMT_99 \
+#define STMT_INSERT_WORK_ITEM 100
+#define STMT_100_INFO {"STMT_INSERT_WORK_ITEM", NULL}
+#define STMT_100 \
"INSERT INTO work_queue (work) VALUES (?1) " \
""
-#define STMT_SELECT_WORK_ITEM 100
-#define STMT_100_INFO {"STMT_SELECT_WORK_ITEM", NULL}
-#define STMT_100 \
+#define STMT_SELECT_WORK_ITEM 101
+#define STMT_101_INFO {"STMT_SELECT_WORK_ITEM", NULL}
+#define STMT_101 \
"SELECT id, work FROM work_queue ORDER BY id LIMIT 1 " \
""
-#define STMT_DELETE_WORK_ITEM 101
-#define STMT_101_INFO {"STMT_DELETE_WORK_ITEM", NULL}
-#define STMT_101 \
+#define STMT_DELETE_WORK_ITEM 102
+#define STMT_102_INFO {"STMT_DELETE_WORK_ITEM", NULL}
+#define STMT_102 \
"DELETE FROM work_queue WHERE id = ?1 " \
""
-#define STMT_INSERT_OR_IGNORE_PRISTINE 102
-#define STMT_102_INFO {"STMT_INSERT_OR_IGNORE_PRISTINE", NULL}
-#define STMT_102 \
+#define STMT_INSERT_OR_IGNORE_PRISTINE 103
+#define STMT_103_INFO {"STMT_INSERT_OR_IGNORE_PRISTINE", NULL}
+#define STMT_103 \
"INSERT OR IGNORE INTO pristine (checksum, md5_checksum, size, refcount) " \
"VALUES (?1, ?2, ?3, 0) " \
""
-#define STMT_INSERT_PRISTINE 103
-#define STMT_103_INFO {"STMT_INSERT_PRISTINE", NULL}
-#define STMT_103 \
+#define STMT_INSERT_PRISTINE 104
+#define STMT_104_INFO {"STMT_INSERT_PRISTINE", NULL}
+#define STMT_104 \
"INSERT INTO pristine (checksum, md5_checksum, size, refcount) " \
"VALUES (?1, ?2, ?3, 0) " \
""
-#define STMT_SELECT_PRISTINE 104
-#define STMT_104_INFO {"STMT_SELECT_PRISTINE", NULL}
-#define STMT_104 \
+#define STMT_SELECT_PRISTINE 105
+#define STMT_105_INFO {"STMT_SELECT_PRISTINE", NULL}
+#define STMT_105 \
"SELECT md5_checksum " \
"FROM pristine " \
"WHERE checksum = ?1 " \
""
-#define STMT_SELECT_PRISTINE_SIZE 105
-#define STMT_105_INFO {"STMT_SELECT_PRISTINE_SIZE", NULL}
-#define STMT_105 \
+#define STMT_SELECT_PRISTINE_SIZE 106
+#define STMT_106_INFO {"STMT_SELECT_PRISTINE_SIZE", NULL}
+#define STMT_106 \
"SELECT size " \
"FROM pristine " \
"WHERE checksum = ?1 LIMIT 1 " \
""
-#define STMT_SELECT_PRISTINE_BY_MD5 106
-#define STMT_106_INFO {"STMT_SELECT_PRISTINE_BY_MD5", NULL}
-#define STMT_106 \
+#define STMT_SELECT_PRISTINE_BY_MD5 107
+#define STMT_107_INFO {"STMT_SELECT_PRISTINE_BY_MD5", NULL}
+#define STMT_107 \
"SELECT checksum " \
"FROM pristine " \
"WHERE md5_checksum = ?1 " \
""
-#define STMT_SELECT_UNREFERENCED_PRISTINES 107
-#define STMT_107_INFO {"STMT_SELECT_UNREFERENCED_PRISTINES", NULL}
-#define STMT_107 \
+#define STMT_SELECT_UNREFERENCED_PRISTINES 108
+#define STMT_108_INFO {"STMT_SELECT_UNREFERENCED_PRISTINES", NULL}
+#define STMT_108 \
"SELECT checksum " \
"FROM pristine " \
"WHERE refcount = 0 " \
""
-#define STMT_DELETE_PRISTINE_IF_UNREFERENCED 108
-#define STMT_108_INFO {"STMT_DELETE_PRISTINE_IF_UNREFERENCED", NULL}
-#define STMT_108 \
+#define STMT_DELETE_PRISTINE_IF_UNREFERENCED 109
+#define STMT_109_INFO {"STMT_DELETE_PRISTINE_IF_UNREFERENCED", NULL}
+#define STMT_109 \
"DELETE FROM pristine " \
"WHERE checksum = ?1 AND refcount = 0 " \
""
-#define STMT_SELECT_COPY_PRISTINES 109
-#define STMT_109_INFO {"STMT_SELECT_COPY_PRISTINES", NULL}
-#define STMT_109 \
+#define STMT_SELECT_COPY_PRISTINES 110
+#define STMT_110_INFO {"STMT_SELECT_COPY_PRISTINES", NULL}
+#define STMT_110 \
"SELECT n.checksum, md5_checksum, size " \
"FROM nodes_current n " \
"LEFT JOIN pristine p ON n.checksum = p.checksum " \
@@ -1109,15 +1118,15 @@
" AND n.checksum IS NOT NULL " \
""
-#define STMT_VACUUM 110
-#define STMT_110_INFO {"STMT_VACUUM", NULL}
-#define STMT_110 \
+#define STMT_VACUUM 111
+#define STMT_111_INFO {"STMT_VACUUM", NULL}
+#define STMT_111 \
"VACUUM " \
""
-#define STMT_SELECT_CONFLICT_VICTIMS 111
-#define STMT_111_INFO {"STMT_SELECT_CONFLICT_VICTIMS", NULL}
-#define STMT_111 \
+#define STMT_SELECT_CONFLICT_VICTIMS 112
+#define STMT_112_INFO {"STMT_SELECT_CONFLICT_VICTIMS", NULL}
+#define STMT_112 \
"SELECT local_relpath, conflict_data " \
"FROM actual_node " \
"WHERE wc_id = ?1 AND parent_relpath = ?2 AND " \
@@ -1124,23 +1133,23 @@
" NOT (conflict_data IS NULL) " \
""
-#define STMT_INSERT_WC_LOCK 112
-#define STMT_112_INFO {"STMT_INSERT_WC_LOCK", NULL}
-#define STMT_112 \
+#define STMT_INSERT_WC_LOCK 113
+#define STMT_113_INFO {"STMT_INSERT_WC_LOCK", NULL}
+#define STMT_113 \
"INSERT INTO wc_lock (wc_id, local_dir_relpath, locked_levels) " \
"VALUES (?1, ?2, ?3) " \
""
-#define STMT_SELECT_WC_LOCK 113
-#define STMT_113_INFO {"STMT_SELECT_WC_LOCK", NULL}
-#define STMT_113 \
+#define STMT_SELECT_WC_LOCK 114
+#define STMT_114_INFO {"STMT_SELECT_WC_LOCK", NULL}
+#define STMT_114 \
"SELECT locked_levels FROM wc_lock " \
"WHERE wc_id = ?1 AND local_dir_relpath = ?2 " \
""
-#define STMT_SELECT_ANCESTOR_WCLOCKS 114
-#define STMT_114_INFO {"STMT_SELECT_ANCESTOR_WCLOCKS", NULL}
-#define STMT_114 \
+#define STMT_SELECT_ANCESTOR_WCLOCKS 115
+#define STMT_115_INFO {"STMT_SELECT_ANCESTOR_WCLOCKS", NULL}
+#define STMT_115 \
"SELECT local_dir_relpath, locked_levels FROM wc_lock " \
"WHERE wc_id = ?1 " \
" AND ((local_dir_relpath >= ?3 AND local_dir_relpath <= ?2) " \
@@ -1147,24 +1156,24 @@
" OR local_dir_relpath = '') " \
""
-#define STMT_DELETE_WC_LOCK 115
-#define STMT_115_INFO {"STMT_DELETE_WC_LOCK", NULL}
-#define STMT_115 \
+#define STMT_DELETE_WC_LOCK 116
+#define STMT_116_INFO {"STMT_DELETE_WC_LOCK", NULL}
+#define STMT_116 \
"DELETE FROM wc_lock " \
"WHERE wc_id = ?1 AND local_dir_relpath = ?2 " \
""
-#define STMT_FIND_WC_LOCK 116
-#define STMT_116_INFO {"STMT_FIND_WC_LOCK", NULL}
-#define STMT_116 \
+#define STMT_FIND_WC_LOCK 117
+#define STMT_117_INFO {"STMT_FIND_WC_LOCK", NULL}
+#define STMT_117 \
"SELECT local_dir_relpath FROM wc_lock " \
"WHERE wc_id = ?1 " \
" AND (((local_dir_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_dir_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
""
-#define STMT_DELETE_WC_LOCK_ORPHAN 117
-#define STMT_117_INFO {"STMT_DELETE_WC_LOCK_ORPHAN", NULL}
-#define STMT_117 \
+#define STMT_DELETE_WC_LOCK_ORPHAN 118
+#define STMT_118_INFO {"STMT_DELETE_WC_LOCK_ORPHAN", NULL}
+#define STMT_118 \
"DELETE FROM wc_lock " \
"WHERE wc_id = ?1 AND local_dir_relpath = ?2 " \
"AND NOT EXISTS (SELECT 1 FROM nodes " \
@@ -1172,9 +1181,9 @@
" AND nodes.local_relpath = wc_lock.local_dir_relpath) " \
""
-#define STMT_DELETE_WC_LOCK_ORPHAN_RECURSIVE 118
-#define STMT_118_INFO {"STMT_DELETE_WC_LOCK_ORPHAN_RECURSIVE", NULL}
-#define STMT_118 \
+#define STMT_DELETE_WC_LOCK_ORPHAN_RECURSIVE 119
+#define STMT_119_INFO {"STMT_DELETE_WC_LOCK_ORPHAN_RECURSIVE", NULL}
+#define STMT_119 \
"DELETE FROM wc_lock " \
"WHERE wc_id = ?1 " \
" AND (local_dir_relpath = ?2 " \
@@ -1184,9 +1193,9 @@
" AND nodes.local_relpath = wc_lock.local_dir_relpath) " \
""
-#define STMT_APPLY_CHANGES_TO_BASE_NODE 119
-#define STMT_119_INFO {"STMT_APPLY_CHANGES_TO_BASE_NODE", NULL}
-#define STMT_119 \
+#define STMT_APPLY_CHANGES_TO_BASE_NODE 120
+#define STMT_120_INFO {"STMT_APPLY_CHANGES_TO_BASE_NODE", NULL}
+#define STMT_120 \
"INSERT OR REPLACE INTO nodes ( " \
" wc_id, local_relpath, op_depth, parent_relpath, repos_id, repos_path, " \
" revision, presence, depth, kind, changed_revision, changed_date, " \
@@ -1200,9 +1209,9 @@
" AND op_depth = 0)) " \
""
-#define STMT_INSTALL_WORKING_NODE_FOR_DELETE 120
-#define STMT_120_INFO {"STMT_INSTALL_WORKING_NODE_FOR_DELETE", NULL}
-#define STMT_120 \
+#define STMT_INSTALL_WORKING_NODE_FOR_DELETE 121
+#define STMT_121_INFO {"STMT_INSTALL_WORKING_NODE_FOR_DELETE", NULL}
+#define STMT_121 \
"INSERT OR REPLACE INTO nodes ( " \
" wc_id, local_relpath, op_depth, " \
" parent_relpath, presence, kind) " \
@@ -1209,9 +1218,9 @@
"VALUES(?1, ?2, ?3, ?4, 'base-deleted', ?5) " \
""
-#define STMT_DELETE_NO_LOWER_LAYER 121
-#define STMT_121_INFO {"STMT_DELETE_NO_LOWER_LAYER", NULL}
-#define STMT_121 \
+#define STMT_DELETE_NO_LOWER_LAYER 122
+#define STMT_122_INFO {"STMT_DELETE_NO_LOWER_LAYER", NULL}
+#define STMT_122 \
"DELETE FROM nodes " \
" WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
@@ -1223,9 +1232,9 @@
" AND n.presence IN ('normal', 'incomplete')) " \
""
-#define STMT_REPLACE_WITH_BASE_DELETED 122
-#define STMT_122_INFO {"STMT_REPLACE_WITH_BASE_DELETED", NULL}
-#define STMT_122 \
+#define STMT_REPLACE_WITH_BASE_DELETED 123
+#define STMT_123_INFO {"STMT_REPLACE_WITH_BASE_DELETED", NULL}
+#define STMT_123 \
"INSERT OR REPLACE INTO nodes (wc_id, local_relpath, op_depth, parent_relpath, " \
" kind, moved_to, presence) " \
"SELECT wc_id, local_relpath, op_depth, parent_relpath, " \
@@ -1236,9 +1245,9 @@
" AND op_depth = ?3 " \
""
-#define STMT_INSERT_DELETE_FROM_NODE_RECURSIVE 123
-#define STMT_123_INFO {"STMT_INSERT_DELETE_FROM_NODE_RECURSIVE", NULL}
-#define STMT_123 \
+#define STMT_INSERT_DELETE_FROM_NODE_RECURSIVE 124
+#define STMT_124_INFO {"STMT_INSERT_DELETE_FROM_NODE_RECURSIVE", NULL}
+#define STMT_124 \
"INSERT INTO nodes ( " \
" wc_id, local_relpath, op_depth, parent_relpath, presence, kind) " \
"SELECT wc_id, local_relpath, ?4 , parent_relpath, 'base-deleted', " \
@@ -1252,9 +1261,9 @@
" AND file_external IS NULL " \
""
-#define STMT_INSERT_WORKING_NODE_FROM_BASE_COPY 124
-#define STMT_124_INFO {"STMT_INSERT_WORKING_NODE_FROM_BASE_COPY", NULL}
-#define STMT_124 \
+#define STMT_INSERT_WORKING_NODE_FROM_BASE_COPY 125
+#define STMT_125_INFO {"STMT_INSERT_WORKING_NODE_FROM_BASE_COPY", NULL}
+#define STMT_125 \
"INSERT INTO nodes ( " \
" wc_id, local_relpath, op_depth, parent_relpath, repos_id, repos_path, " \
" revision, presence, depth, kind, changed_revision, changed_date, " \
@@ -1268,9 +1277,9 @@
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \
""
-#define STMT_INSERT_DELETE_FROM_BASE 125
-#define STMT_125_INFO {"STMT_INSERT_DELETE_FROM_BASE", NULL}
-#define STMT_125 \
+#define STMT_INSERT_DELETE_FROM_BASE 126
+#define STMT_126_INFO {"STMT_INSERT_DELETE_FROM_BASE", NULL}
+#define STMT_126 \
"INSERT INTO nodes ( " \
" wc_id, local_relpath, op_depth, parent_relpath, presence, kind) " \
"SELECT wc_id, local_relpath, ?3 , parent_relpath, " \
@@ -1279,9 +1288,9 @@
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \
""
-#define STMT_UPDATE_OP_DEPTH_INCREASE_RECURSIVE 126
-#define STMT_126_INFO {"STMT_UPDATE_OP_DEPTH_INCREASE_RECURSIVE", NULL}
-#define STMT_126 \
+#define STMT_UPDATE_OP_DEPTH_INCREASE_RECURSIVE 127
+#define STMT_127_INFO {"STMT_UPDATE_OP_DEPTH_INCREASE_RECURSIVE", NULL}
+#define STMT_127 \
"UPDATE nodes SET op_depth = ?3 + 1 " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -1288,9 +1297,9 @@
" AND op_depth = ?3 " \
""
-#define STMT_UPDATE_OP_DEPTH_RECURSIVE 127
-#define STMT_127_INFO {"STMT_UPDATE_OP_DEPTH_RECURSIVE", NULL}
-#define STMT_127 \
+#define STMT_UPDATE_OP_DEPTH_RECURSIVE 128
+#define STMT_128_INFO {"STMT_UPDATE_OP_DEPTH_RECURSIVE", NULL}
+#define STMT_128 \
"UPDATE nodes SET op_depth = ?4, moved_here = NULL " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
@@ -1297,16 +1306,16 @@
" AND op_depth = ?3 " \
""
-#define STMT_DOES_NODE_EXIST 128
-#define STMT_128_INFO {"STMT_DOES_NODE_EXIST", NULL}
-#define STMT_128 \
+#define STMT_DOES_NODE_EXIST 129
+#define STMT_129_INFO {"STMT_DOES_NODE_EXIST", NULL}
+#define STMT_129 \
"SELECT 1 FROM nodes WHERE wc_id = ?1 AND local_relpath = ?2 " \
"LIMIT 1 " \
""
-#define STMT_HAS_SERVER_EXCLUDED_DESCENDANTS 129
-#define STMT_129_INFO {"STMT_HAS_SERVER_EXCLUDED_DESCENDANTS", NULL}
-#define STMT_129 \
+#define STMT_HAS_SERVER_EXCLUDED_DESCENDANTS 130
+#define STMT_130_INFO {"STMT_HAS_SERVER_EXCLUDED_DESCENDANTS", NULL}
+#define STMT_130 \
"SELECT local_relpath FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -1314,9 +1323,9 @@
"LIMIT 1 " \
""
-#define STMT_SELECT_ALL_EXCLUDED_DESCENDANTS 130
-#define STMT_130_INFO {"STMT_SELECT_ALL_EXCLUDED_DESCENDANTS", NULL}
-#define STMT_130 \
+#define STMT_SELECT_ALL_EXCLUDED_DESCENDANTS 131
+#define STMT_131_INFO {"STMT_SELECT_ALL_EXCLUDED_DESCENDANTS", NULL}
+#define STMT_131 \
"SELECT local_relpath FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -1324,9 +1333,9 @@
" AND (presence = 'server-excluded' OR presence = 'excluded') " \
""
-#define STMT_INSERT_WORKING_NODE_COPY_FROM 131
-#define STMT_131_INFO {"STMT_INSERT_WORKING_NODE_COPY_FROM", NULL}
-#define STMT_131 \
+#define STMT_INSERT_WORKING_NODE_COPY_FROM 132
+#define STMT_132_INFO {"STMT_INSERT_WORKING_NODE_COPY_FROM", NULL}
+#define STMT_132 \
"INSERT OR REPLACE INTO nodes ( " \
" wc_id, local_relpath, op_depth, parent_relpath, repos_id, " \
" repos_path, revision, presence, depth, moved_here, kind, changed_revision, " \
@@ -1345,9 +1354,9 @@
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
""
-#define STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH 132
-#define STMT_132_INFO {"STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH", NULL}
-#define STMT_132 \
+#define STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH 133
+#define STMT_133_INFO {"STMT_INSERT_WORKING_NODE_COPY_FROM_DEPTH", NULL}
+#define STMT_133 \
"INSERT OR REPLACE INTO nodes ( " \
" wc_id, local_relpath, op_depth, parent_relpath, repos_id, " \
" repos_path, revision, presence, depth, moved_here, kind, changed_revision, " \
@@ -1366,31 +1375,31 @@
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?7 " \
""
-#define STMT_UPDATE_BASE_REVISION 133
-#define STMT_133_INFO {"STMT_UPDATE_BASE_REVISION", NULL}
-#define STMT_133 \
+#define STMT_UPDATE_BASE_REVISION 134
+#define STMT_134_INFO {"STMT_UPDATE_BASE_REVISION", NULL}
+#define STMT_134 \
"UPDATE nodes SET revision = ?3 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \
""
-#define STMT_UPDATE_BASE_REPOS 134
-#define STMT_134_INFO {"STMT_UPDATE_BASE_REPOS", NULL}
-#define STMT_134 \
+#define STMT_UPDATE_BASE_REPOS 135
+#define STMT_135_INFO {"STMT_UPDATE_BASE_REPOS", NULL}
+#define STMT_135 \
"UPDATE nodes SET repos_id = ?3, repos_path = ?4 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0 " \
""
-#define STMT_ACTUAL_HAS_CHILDREN 135
-#define STMT_135_INFO {"STMT_ACTUAL_HAS_CHILDREN", NULL}
-#define STMT_135 \
+#define STMT_ACTUAL_HAS_CHILDREN 136
+#define STMT_136_INFO {"STMT_ACTUAL_HAS_CHILDREN", NULL}
+#define STMT_136 \
"SELECT 1 FROM actual_node " \
"WHERE wc_id = ?1 AND parent_relpath = ?2 " \
"LIMIT 1 " \
""
-#define STMT_INSERT_EXTERNAL 136
-#define STMT_136_INFO {"STMT_INSERT_EXTERNAL", NULL}
-#define STMT_136 \
+#define STMT_INSERT_EXTERNAL 137
+#define STMT_137_INFO {"STMT_INSERT_EXTERNAL", NULL}
+#define STMT_137 \
"INSERT OR REPLACE INTO externals ( " \
" wc_id, local_relpath, parent_relpath, presence, kind, def_local_relpath, " \
" repos_id, def_repos_relpath, def_operational_revision, def_revision) " \
@@ -1397,9 +1406,9 @@
"VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10) " \
""
-#define STMT_SELECT_EXTERNAL_INFO 137
-#define STMT_137_INFO {"STMT_SELECT_EXTERNAL_INFO", NULL}
-#define STMT_137 \
+#define STMT_SELECT_EXTERNAL_INFO 138
+#define STMT_138_INFO {"STMT_SELECT_EXTERNAL_INFO", NULL}
+#define STMT_138 \
"SELECT presence, kind, def_local_relpath, repos_id, " \
" def_repos_relpath, def_operational_revision, def_revision " \
"FROM externals WHERE wc_id = ?1 AND local_relpath = ?2 " \
@@ -1406,9 +1415,9 @@
"LIMIT 1 " \
""
-#define STMT_DELETE_FILE_EXTERNALS 138
-#define STMT_138_INFO {"STMT_DELETE_FILE_EXTERNALS", NULL}
-#define STMT_138 \
+#define STMT_DELETE_FILE_EXTERNALS 139
+#define STMT_139_INFO {"STMT_DELETE_FILE_EXTERNALS", NULL}
+#define STMT_139 \
"DELETE FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -1416,9 +1425,9 @@
" AND file_external IS NOT NULL " \
""
-#define STMT_DELETE_FILE_EXTERNAL_REGISTATIONS 139
-#define STMT_139_INFO {"STMT_DELETE_FILE_EXTERNAL_REGISTATIONS", NULL}
-#define STMT_139 \
+#define STMT_DELETE_FILE_EXTERNAL_REGISTATIONS 140
+#define STMT_140_INFO {"STMT_DELETE_FILE_EXTERNAL_REGISTATIONS", NULL}
+#define STMT_140 \
"DELETE FROM externals " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -1425,17 +1434,17 @@
" AND kind != 'dir' " \
""
-#define STMT_DELETE_EXTERNAL_REGISTATIONS 140
-#define STMT_140_INFO {"STMT_DELETE_EXTERNAL_REGISTATIONS", NULL}
-#define STMT_140 \
+#define STMT_DELETE_EXTERNAL_REGISTATIONS 141
+#define STMT_141_INFO {"STMT_DELETE_EXTERNAL_REGISTATIONS", NULL}
+#define STMT_141 \
"DELETE FROM externals " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
""
-#define STMT_SELECT_COMMITTABLE_EXTERNALS_BELOW 141
-#define STMT_141_INFO {"STMT_SELECT_COMMITTABLE_EXTERNALS_BELOW", NULL}
-#define STMT_141 \
+#define STMT_SELECT_COMMITTABLE_EXTERNALS_BELOW 142
+#define STMT_142_INFO {"STMT_SELECT_COMMITTABLE_EXTERNALS_BELOW", NULL}
+#define STMT_142 \
"SELECT local_relpath, kind, def_repos_relpath, " \
" (SELECT root FROM repository AS r WHERE r.id = e.repos_id) " \
"FROM externals e " \
@@ -1453,9 +1462,9 @@
" AND nodes.local_relpath = e.parent_relpath)) " \
""
-#define STMT_SELECT_COMMITTABLE_EXTERNALS_IMMEDIATELY_BELOW 142
-#define STMT_142_INFO {"STMT_SELECT_COMMITTABLE_EXTERNALS_IMMEDIATELY_BELOW", NULL}
-#define STMT_142 \
+#define STMT_SELECT_COMMITTABLE_EXTERNALS_IMMEDIATELY_BELOW 143
+#define STMT_143_INFO {"STMT_SELECT_COMMITTABLE_EXTERNALS_IMMEDIATELY_BELOW", NULL}
+#define STMT_143 \
"SELECT local_relpath, kind, def_repos_relpath, " \
" (SELECT root FROM repository AS r WHERE r.id = e.repos_id) " \
"FROM externals e " \
@@ -1474,9 +1483,9 @@
" AND nodes.local_relpath = e.parent_relpath)) " \
""
-#define STMT_SELECT_EXTERNALS_DEFINED 143
-#define STMT_143_INFO {"STMT_SELECT_EXTERNALS_DEFINED", NULL}
-#define STMT_143 \
+#define STMT_SELECT_EXTERNALS_DEFINED 144
+#define STMT_144_INFO {"STMT_SELECT_EXTERNALS_DEFINED", NULL}
+#define STMT_144 \
"SELECT local_relpath, def_local_relpath " \
"FROM externals " \
"WHERE (wc_id = ?1 AND def_local_relpath = ?2) " \
@@ -1483,16 +1492,16 @@
" OR (wc_id = ?1 AND (((def_local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((def_local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
""
-#define STMT_DELETE_EXTERNAL 144
-#define STMT_144_INFO {"STMT_DELETE_EXTERNAL", NULL}
-#define STMT_144 \
+#define STMT_DELETE_EXTERNAL 145
+#define STMT_145_INFO {"STMT_DELETE_EXTERNAL", NULL}
+#define STMT_145 \
"DELETE FROM externals " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
""
-#define STMT_SELECT_EXTERNAL_PROPERTIES 145
-#define STMT_145_INFO {"STMT_SELECT_EXTERNAL_PROPERTIES", NULL}
-#define STMT_145 \
+#define STMT_SELECT_EXTERNAL_PROPERTIES 146
+#define STMT_146_INFO {"STMT_SELECT_EXTERNAL_PROPERTIES", NULL}
+#define STMT_146 \
"SELECT IFNULL((SELECT properties FROM actual_node a " \
" WHERE a.wc_id = ?1 AND A.local_relpath = n.local_relpath), " \
" properties), " \
@@ -1510,9 +1519,9 @@
" AND kind = 'dir' AND presence IN ('normal', 'incomplete') " \
""
-#define STMT_SELECT_CURRENT_PROPS_RECURSIVE 146
-#define STMT_146_INFO {"STMT_SELECT_CURRENT_PROPS_RECURSIVE", NULL}
-#define STMT_146 \
+#define STMT_SELECT_CURRENT_PROPS_RECURSIVE 147
+#define STMT_147_INFO {"STMT_SELECT_CURRENT_PROPS_RECURSIVE", NULL}
+#define STMT_147 \
"SELECT IFNULL((SELECT properties FROM actual_node a " \
" WHERE a.wc_id = ?1 AND A.local_relpath = n.local_relpath), " \
" properties), " \
@@ -1522,57 +1531,57 @@
" OR (wc_id = ?1 AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
""
-#define STMT_PRAGMA_LOCKING_MODE 147
-#define STMT_147_INFO {"STMT_PRAGMA_LOCKING_MODE", NULL}
-#define STMT_147 \
+#define STMT_PRAGMA_LOCKING_MODE 148
+#define STMT_148_INFO {"STMT_PRAGMA_LOCKING_MODE", NULL}
+#define STMT_148 \
"PRAGMA locking_mode = exclusive " \
""
-#define STMT_INSERT_ACTUAL_NODE 148
-#define STMT_148_INFO {"STMT_INSERT_ACTUAL_NODE", NULL}
-#define STMT_148 \
+#define STMT_INSERT_ACTUAL_NODE 149
+#define STMT_149_INFO {"STMT_INSERT_ACTUAL_NODE", NULL}
+#define STMT_149 \
"INSERT OR REPLACE INTO actual_node ( " \
" wc_id, local_relpath, parent_relpath, properties, changelist, conflict_data) " \
"VALUES (?1, ?2, ?3, ?4, ?5, ?6) " \
""
-#define STMT_UPDATE_ACTUAL_CONFLICT_DATA 149
-#define STMT_149_INFO {"STMT_UPDATE_ACTUAL_CONFLICT_DATA", NULL}
-#define STMT_149 \
+#define STMT_UPDATE_ACTUAL_CONFLICT_DATA 150
+#define STMT_150_INFO {"STMT_UPDATE_ACTUAL_CONFLICT_DATA", NULL}
+#define STMT_150 \
"UPDATE actual_node SET conflict_data = ?3 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 " \
""
-#define STMT_INSERT_ACTUAL_CONFLICT_DATA 150
-#define STMT_150_INFO {"STMT_INSERT_ACTUAL_CONFLICT_DATA", NULL}
-#define STMT_150 \
+#define STMT_INSERT_ACTUAL_CONFLICT_DATA 151
+#define STMT_151_INFO {"STMT_INSERT_ACTUAL_CONFLICT_DATA", NULL}
+#define STMT_151 \
"INSERT INTO actual_node (wc_id, local_relpath, conflict_data, parent_relpath) " \
"VALUES (?1, ?2, ?3, ?4) " \
""
-#define STMT_SELECT_ALL_FILES 151
-#define STMT_151_INFO {"STMT_SELECT_ALL_FILES", NULL}
-#define STMT_151 \
+#define STMT_SELECT_ALL_FILES 152
+#define STMT_152_INFO {"STMT_SELECT_ALL_FILES", NULL}
+#define STMT_152 \
"SELECT local_relpath FROM nodes_current " \
"WHERE wc_id = ?1 AND parent_relpath = ?2 AND kind = 'file' " \
""
-#define STMT_UPDATE_NODE_PROPS 152
-#define STMT_152_INFO {"STMT_UPDATE_NODE_PROPS", NULL}
-#define STMT_152 \
+#define STMT_UPDATE_NODE_PROPS 153
+#define STMT_153_INFO {"STMT_UPDATE_NODE_PROPS", NULL}
+#define STMT_153 \
"UPDATE nodes SET properties = ?4 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \
""
-#define STMT_PRAGMA_TABLE_INFO_NODES 153
-#define STMT_153_INFO {"STMT_PRAGMA_TABLE_INFO_NODES", NULL}
-#define STMT_153 \
+#define STMT_PRAGMA_TABLE_INFO_NODES 154
+#define STMT_154_INFO {"STMT_PRAGMA_TABLE_INFO_NODES", NULL}
+#define STMT_154 \
"PRAGMA table_info(\"NODES\") " \
""
-#define STMT_CREATE_TARGET_PROP_CACHE 154
-#define STMT_154_INFO {"STMT_CREATE_TARGET_PROP_CACHE", NULL}
-#define STMT_154 \
+#define STMT_CREATE_TARGET_PROP_CACHE 155
+#define STMT_155_INFO {"STMT_CREATE_TARGET_PROP_CACHE", NULL}
+#define STMT_155 \
"DROP TABLE IF EXISTS target_prop_cache; " \
"CREATE TEMPORARY TABLE target_prop_cache ( " \
" local_relpath TEXT NOT NULL PRIMARY KEY, " \
@@ -1581,9 +1590,9 @@
"); " \
""
-#define STMT_CACHE_TARGET_PROPS 155
-#define STMT_155_INFO {"STMT_CACHE_TARGET_PROPS", NULL}
-#define STMT_155 \
+#define STMT_CACHE_TARGET_PROPS 156
+#define STMT_156_INFO {"STMT_CACHE_TARGET_PROPS", NULL}
+#define STMT_156 \
"INSERT INTO target_prop_cache(local_relpath, kind, properties) " \
" SELECT n.local_relpath, n.kind, " \
" IFNULL((SELECT properties FROM actual_node AS a " \
@@ -1602,9 +1611,9 @@
" ORDER BY t.local_relpath " \
""
-#define STMT_CACHE_TARGET_PRISTINE_PROPS 156
-#define STMT_156_INFO {"STMT_CACHE_TARGET_PRISTINE_PROPS", NULL}
-#define STMT_156 \
+#define STMT_CACHE_TARGET_PRISTINE_PROPS 157
+#define STMT_157_INFO {"STMT_CACHE_TARGET_PRISTINE_PROPS", NULL}
+#define STMT_157 \
"INSERT INTO target_prop_cache(local_relpath, kind, properties) " \
" SELECT n.local_relpath, n.kind, " \
" CASE n.presence " \
@@ -1629,22 +1638,22 @@
" ORDER BY t.local_relpath " \
""
-#define STMT_SELECT_ALL_TARGET_PROP_CACHE 157
-#define STMT_157_INFO {"STMT_SELECT_ALL_TARGET_PROP_CACHE", NULL}
-#define STMT_157 \
+#define STMT_SELECT_ALL_TARGET_PROP_CACHE 158
+#define STMT_158_INFO {"STMT_SELECT_ALL_TARGET_PROP_CACHE", NULL}
+#define STMT_158 \
"SELECT local_relpath, properties FROM target_prop_cache " \
"ORDER BY local_relpath " \
""
-#define STMT_DROP_TARGET_PROP_CACHE 158
-#define STMT_158_INFO {"STMT_DROP_TARGET_PROP_CACHE", NULL}
-#define STMT_158 \
+#define STMT_DROP_TARGET_PROP_CACHE 159
+#define STMT_159_INFO {"STMT_DROP_TARGET_PROP_CACHE", NULL}
+#define STMT_159 \
"DROP TABLE target_prop_cache; " \
""
-#define STMT_CREATE_REVERT_LIST 159
-#define STMT_159_INFO {"STMT_CREATE_REVERT_LIST", NULL}
-#define STMT_159 \
+#define STMT_CREATE_REVERT_LIST 160
+#define STMT_160_INFO {"STMT_CREATE_REVERT_LIST", NULL}
+#define STMT_160 \
"DROP TABLE IF EXISTS revert_list; " \
"CREATE TEMPORARY TABLE revert_list ( " \
" local_relpath TEXT NOT NULL, " \
@@ -1700,17 +1709,17 @@
"END " \
""
-#define STMT_DROP_REVERT_LIST_TRIGGERS 160
-#define STMT_160_INFO {"STMT_DROP_REVERT_LIST_TRIGGERS", NULL}
-#define STMT_160 \
+#define STMT_DROP_REVERT_LIST_TRIGGERS 161
+#define STMT_161_INFO {"STMT_DROP_REVERT_LIST_TRIGGERS", NULL}
+#define STMT_161 \
"DROP TRIGGER trigger_revert_list_nodes; " \
"DROP TRIGGER trigger_revert_list_actual_delete; " \
"DROP TRIGGER trigger_revert_list_actual_update " \
""
-#define STMT_SELECT_REVERT_LIST 161
-#define STMT_161_INFO {"STMT_SELECT_REVERT_LIST", NULL}
-#define STMT_161 \
+#define STMT_SELECT_REVERT_LIST 162
+#define STMT_162_INFO {"STMT_SELECT_REVERT_LIST", NULL}
+#define STMT_162 \
"SELECT actual, notify, kind, op_depth, repos_id, conflict_data " \
"FROM revert_list " \
"WHERE local_relpath = ?1 " \
@@ -1717,9 +1726,9 @@
"ORDER BY actual DESC " \
""
-#define STMT_SELECT_REVERT_LIST_COPIED_CHILDREN 162
-#define STMT_162_INFO {"STMT_SELECT_REVERT_LIST_COPIED_CHILDREN", NULL}
-#define STMT_162 \
+#define STMT_SELECT_REVERT_LIST_COPIED_CHILDREN 163
+#define STMT_163_INFO {"STMT_SELECT_REVERT_LIST_COPIED_CHILDREN", NULL}
+#define STMT_163 \
"SELECT local_relpath, kind " \
"FROM revert_list " \
"WHERE (((local_relpath) > (CASE (?1) WHEN '' THEN '' ELSE (?1) || '/' END)) AND ((local_relpath) < CASE (?1) WHEN '' THEN X'FFFF' ELSE (?1) || '0' END)) " \
@@ -1728,15 +1737,15 @@
"ORDER BY local_relpath " \
""
-#define STMT_DELETE_REVERT_LIST 163
-#define STMT_163_INFO {"STMT_DELETE_REVERT_LIST", NULL}
-#define STMT_163 \
+#define STMT_DELETE_REVERT_LIST 164
+#define STMT_164_INFO {"STMT_DELETE_REVERT_LIST", NULL}
+#define STMT_164 \
"DELETE FROM revert_list WHERE local_relpath = ?1 " \
""
-#define STMT_SELECT_REVERT_LIST_RECURSIVE 164
-#define STMT_164_INFO {"STMT_SELECT_REVERT_LIST_RECURSIVE", NULL}
-#define STMT_164 \
+#define STMT_SELECT_REVERT_LIST_RECURSIVE 165
+#define STMT_165_INFO {"STMT_SELECT_REVERT_LIST_RECURSIVE", NULL}
+#define STMT_165 \
"SELECT DISTINCT local_relpath " \
"FROM revert_list " \
"WHERE (local_relpath = ?1 " \
@@ -1745,23 +1754,23 @@
"ORDER BY local_relpath " \
""
-#define STMT_DELETE_REVERT_LIST_RECURSIVE 165
-#define STMT_165_INFO {"STMT_DELETE_REVERT_LIST_RECURSIVE", NULL}
-#define STMT_165 \
+#define STMT_DELETE_REVERT_LIST_RECURSIVE 166
+#define STMT_166_INFO {"STMT_DELETE_REVERT_LIST_RECURSIVE", NULL}
+#define STMT_166 \
"DELETE FROM revert_list " \
"WHERE (local_relpath = ?1 " \
" OR (((local_relpath) > (CASE (?1) WHEN '' THEN '' ELSE (?1) || '/' END)) AND ((local_relpath) < CASE (?1) WHEN '' THEN X'FFFF' ELSE (?1) || '0' END))) " \
""
-#define STMT_DROP_REVERT_LIST 166
-#define STMT_166_INFO {"STMT_DROP_REVERT_LIST", NULL}
-#define STMT_166 \
+#define STMT_DROP_REVERT_LIST 167
+#define STMT_167_INFO {"STMT_DROP_REVERT_LIST", NULL}
+#define STMT_167 \
"DROP TABLE IF EXISTS revert_list " \
""
-#define STMT_CREATE_DELETE_LIST 167
-#define STMT_167_INFO {"STMT_CREATE_DELETE_LIST", NULL}
-#define STMT_167 \
+#define STMT_CREATE_DELETE_LIST 168
+#define STMT_168_INFO {"STMT_CREATE_DELETE_LIST", NULL}
+#define STMT_168 \
"DROP TABLE IF EXISTS delete_list; " \
"CREATE TEMPORARY TABLE delete_list ( " \
" local_relpath TEXT PRIMARY KEY NOT NULL UNIQUE " \
@@ -1768,9 +1777,9 @@
" ) " \
""
-#define STMT_INSERT_DELETE_LIST 168
-#define STMT_168_INFO {"STMT_INSERT_DELETE_LIST", NULL}
-#define STMT_168 \
+#define STMT_INSERT_DELETE_LIST 169
+#define STMT_169_INFO {"STMT_INSERT_DELETE_LIST", NULL}
+#define STMT_169 \
"INSERT INTO delete_list(local_relpath) " \
"SELECT local_relpath FROM nodes AS n " \
"WHERE wc_id = ?1 " \
@@ -1784,22 +1793,22 @@
" AND file_external IS NULL " \
""
-#define STMT_SELECT_DELETE_LIST 169
-#define STMT_169_INFO {"STMT_SELECT_DELETE_LIST", NULL}
-#define STMT_169 \
+#define STMT_SELECT_DELETE_LIST 170
+#define STMT_170_INFO {"STMT_SELECT_DELETE_LIST", NULL}
+#define STMT_170 \
"SELECT local_relpath FROM delete_list " \
"ORDER BY local_relpath " \
""
-#define STMT_FINALIZE_DELETE 170
-#define STMT_170_INFO {"STMT_FINALIZE_DELETE", NULL}
-#define STMT_170 \
+#define STMT_FINALIZE_DELETE 171
+#define STMT_171_INFO {"STMT_FINALIZE_DELETE", NULL}
+#define STMT_171 \
"DROP TABLE IF EXISTS delete_list " \
""
-#define STMT_CREATE_UPDATE_MOVE_LIST 171
-#define STMT_171_INFO {"STMT_CREATE_UPDATE_MOVE_LIST", NULL}
-#define STMT_171 \
+#define STMT_CREATE_UPDATE_MOVE_LIST 172
+#define STMT_172_INFO {"STMT_CREATE_UPDATE_MOVE_LIST", NULL}
+#define STMT_172 \
"DROP TABLE IF EXISTS update_move_list; " \
"CREATE TEMPORARY TABLE update_move_list ( " \
" local_relpath TEXT PRIMARY KEY NOT NULL UNIQUE, " \
@@ -1810,31 +1819,31 @@
" ) " \
""
-#define STMT_INSERT_UPDATE_MOVE_LIST 172
-#define STMT_172_INFO {"STMT_INSERT_UPDATE_MOVE_LIST", NULL}
-#define STMT_172 \
+#define STMT_INSERT_UPDATE_MOVE_LIST 173
+#define STMT_173_INFO {"STMT_INSERT_UPDATE_MOVE_LIST", NULL}
+#define STMT_173 \
"INSERT INTO update_move_list(local_relpath, action, kind, content_state, " \
" prop_state) " \
"VALUES (?1, ?2, ?3, ?4, ?5) " \
""
-#define STMT_SELECT_UPDATE_MOVE_LIST 173
-#define STMT_173_INFO {"STMT_SELECT_UPDATE_MOVE_LIST", NULL}
-#define STMT_173 \
+#define STMT_SELECT_UPDATE_MOVE_LIST 174
+#define STMT_174_INFO {"STMT_SELECT_UPDATE_MOVE_LIST", NULL}
+#define STMT_174 \
"SELECT local_relpath, action, kind, content_state, prop_state " \
"FROM update_move_list " \
"ORDER BY local_relpath " \
""
-#define STMT_FINALIZE_UPDATE_MOVE 174
-#define STMT_174_INFO {"STMT_FINALIZE_UPDATE_MOVE", NULL}
-#define STMT_174 \
+#define STMT_FINALIZE_UPDATE_MOVE 175
+#define STMT_175_INFO {"STMT_FINALIZE_UPDATE_MOVE", NULL}
+#define STMT_175 \
"DROP TABLE IF EXISTS update_move_list " \
""
-#define STMT_SELECT_MIN_MAX_REVISIONS 175
-#define STMT_175_INFO {"STMT_SELECT_MIN_MAX_REVISIONS", NULL}
-#define STMT_175 \
+#define STMT_SELECT_MIN_MAX_REVISIONS 176
+#define STMT_176_INFO {"STMT_SELECT_MIN_MAX_REVISIONS", NULL}
+#define STMT_176 \
"SELECT MIN(revision), MAX(revision), " \
" MIN(changed_revision), MAX(changed_revision) FROM nodes " \
" WHERE wc_id = ?1 " \
@@ -1845,9 +1854,9 @@
" AND op_depth = 0 " \
""
-#define STMT_HAS_SPARSE_NODES 176
-#define STMT_176_INFO {"STMT_HAS_SPARSE_NODES", NULL}
-#define STMT_176 \
+#define STMT_HAS_SPARSE_NODES 177
+#define STMT_177_INFO {"STMT_HAS_SPARSE_NODES", NULL}
+#define STMT_177 \
"SELECT 1 FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 " \
@@ -1859,9 +1868,9 @@
"LIMIT 1 " \
""
-#define STMT_SUBTREE_HAS_TREE_MODIFICATIONS 177
-#define STMT_177_INFO {"STMT_SUBTREE_HAS_TREE_MODIFICATIONS", NULL}
-#define STMT_177 \
+#define STMT_SUBTREE_HAS_TREE_MODIFICATIONS 178
+#define STMT_178_INFO {"STMT_SUBTREE_HAS_TREE_MODIFICATIONS", NULL}
+#define STMT_178 \
"SELECT 1 FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 " \
@@ -1870,9 +1879,9 @@
"LIMIT 1 " \
""
-#define STMT_SUBTREE_HAS_PROP_MODIFICATIONS 178
-#define STMT_178_INFO {"STMT_SUBTREE_HAS_PROP_MODIFICATIONS", NULL}
-#define STMT_178 \
+#define STMT_SUBTREE_HAS_PROP_MODIFICATIONS 179
+#define STMT_179_INFO {"STMT_SUBTREE_HAS_PROP_MODIFICATIONS", NULL}
+#define STMT_179 \
"SELECT 1 FROM actual_node " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 " \
@@ -1881,9 +1890,9 @@
"LIMIT 1 " \
""
-#define STMT_HAS_SWITCHED 179
-#define STMT_179_INFO {"STMT_HAS_SWITCHED", NULL}
-#define STMT_179 \
+#define STMT_HAS_SWITCHED 180
+#define STMT_180_INFO {"STMT_HAS_SWITCHED", NULL}
+#define STMT_180 \
"SELECT 1 " \
"FROM nodes " \
"WHERE wc_id = ?1 " \
@@ -1895,9 +1904,9 @@
"LIMIT 1 " \
""
-#define STMT_SELECT_BASE_FILES_RECURSIVE 180
-#define STMT_180_INFO {"STMT_SELECT_BASE_FILES_RECURSIVE", NULL}
-#define STMT_180 \
+#define STMT_SELECT_BASE_FILES_RECURSIVE 181
+#define STMT_181_INFO {"STMT_SELECT_BASE_FILES_RECURSIVE", NULL}
+#define STMT_181 \
"SELECT local_relpath, translated_size, last_mod_time FROM nodes AS n " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 " \
@@ -1908,30 +1917,30 @@
" AND file_external IS NULL " \
""
-#define STMT_SELECT_MOVED_FROM_RELPATH 181
-#define STMT_181_INFO {"STMT_SELECT_MOVED_FROM_RELPATH", NULL}
-#define STMT_181 \
+#define STMT_SELECT_MOVED_FROM_RELPATH 182
+#define STMT_182_INFO {"STMT_SELECT_MOVED_FROM_RELPATH", NULL}
+#define STMT_182 \
"SELECT local_relpath, op_depth FROM nodes " \
"WHERE wc_id = ?1 AND moved_to = ?2 AND op_depth > 0 " \
""
-#define STMT_UPDATE_MOVED_TO_RELPATH 182
-#define STMT_182_INFO {"STMT_UPDATE_MOVED_TO_RELPATH", NULL}
-#define STMT_182 \
+#define STMT_UPDATE_MOVED_TO_RELPATH 183
+#define STMT_183_INFO {"STMT_UPDATE_MOVED_TO_RELPATH", NULL}
+#define STMT_183 \
"UPDATE nodes SET moved_to = ?4 " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \
""
-#define STMT_CLEAR_MOVED_TO_RELPATH 183
-#define STMT_183_INFO {"STMT_CLEAR_MOVED_TO_RELPATH", NULL}
-#define STMT_183 \
+#define STMT_CLEAR_MOVED_TO_RELPATH 184
+#define STMT_184_INFO {"STMT_CLEAR_MOVED_TO_RELPATH", NULL}
+#define STMT_184 \
"UPDATE nodes SET moved_to = NULL " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3 " \
""
-#define STMT_CLEAR_MOVED_HERE_RECURSIVE 184
-#define STMT_184_INFO {"STMT_CLEAR_MOVED_HERE_RECURSIVE", NULL}
-#define STMT_184 \
+#define STMT_CLEAR_MOVED_HERE_RECURSIVE 185
+#define STMT_185_INFO {"STMT_CLEAR_MOVED_HERE_RECURSIVE", NULL}
+#define STMT_185 \
"UPDATE nodes SET moved_here = NULL " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
@@ -1938,45 +1947,62 @@
" AND op_depth = ?3 " \
""
-#define STMT_SELECT_MOVED_HERE_CHILDREN 185
-#define STMT_185_INFO {"STMT_SELECT_MOVED_HERE_CHILDREN", NULL}
-#define STMT_185 \
+#define STMT_SELECT_MOVED_HERE_CHILDREN 186
+#define STMT_186_INFO {"STMT_SELECT_MOVED_HERE_CHILDREN", NULL}
+#define STMT_186 \
"SELECT moved_to, local_relpath FROM nodes " \
"WHERE wc_id = ?1 AND op_depth > 0 " \
" AND (((moved_to) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((moved_to) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
""
-#define STMT_SELECT_MOVED_FOR_DELETE 186
-#define STMT_186_INFO {"STMT_SELECT_MOVED_FOR_DELETE", NULL}
-#define STMT_186 \
- "SELECT local_relpath, moved_to, op_depth FROM nodes " \
+#define STMT_SELECT_MOVED_FOR_DELETE 187
+#define STMT_187_INFO {"STMT_SELECT_MOVED_FOR_DELETE", NULL}
+#define STMT_187 \
+ "SELECT local_relpath, moved_to, op_depth, " \
+ " (SELECT CASE WHEN r.moved_here THEN r.op_depth END FROM nodes r " \
+ " WHERE r.wc_id = ?1 " \
+ " AND r.local_relpath = n.local_relpath " \
+ " AND r.op_depth < n.op_depth " \
+ " ORDER BY r.op_depth DESC LIMIT 1) AS moved_here_op_depth " \
+ " FROM nodes n " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
" AND moved_to IS NOT NULL " \
- " AND op_depth >= (SELECT MAX(op_depth) FROM nodes o " \
- " WHERE o.wc_id = ?1 " \
- " AND o.local_relpath = ?2) " \
+ " AND op_depth >= ?3 " \
""
-#define STMT_UPDATE_MOVED_TO_DESCENDANTS 187
-#define STMT_187_INFO {"STMT_UPDATE_MOVED_TO_DESCENDANTS", NULL}
-#define STMT_187 \
+#define STMT_SELECT_MOVED_FROM_FOR_DELETE 188
+#define STMT_188_INFO {"STMT_SELECT_MOVED_FROM_FOR_DELETE", NULL}
+#define STMT_188 \
+ "SELECT local_relpath, op_depth, " \
+ " (SELECT CASE WHEN r.moved_here THEN r.op_depth END FROM nodes r " \
+ " WHERE r.wc_id = ?1 " \
+ " AND r.local_relpath = n.local_relpath " \
+ " AND r.op_depth < n.op_depth " \
+ " ORDER BY r.op_depth DESC LIMIT 1) AS moved_here_op_depth " \
+ " FROM nodes n " \
+ "WHERE wc_id = ?1 AND moved_to = ?2 AND op_depth > 0 " \
+ ""
+
+#define STMT_UPDATE_MOVED_TO_DESCENDANTS 189
+#define STMT_189_INFO {"STMT_UPDATE_MOVED_TO_DESCENDANTS", NULL}
+#define STMT_189 \
"UPDATE nodes SET moved_to = (CASE WHEN (?2) = '' THEN (CASE WHEN (?3) = '' THEN (moved_to) WHEN (moved_to) = '' THEN (?3) ELSE (?3) || '/' || (moved_to) END) WHEN (?3) = '' THEN (CASE WHEN (?2) = '' THEN (moved_to) WHEN SUBSTR((moved_to), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(moved_to) THEN '' WHEN SUBSTR((moved_to), LENGTH(?2)+1, 1) = '/' THEN SUBSTR((moved_to), LENGTH(?2)+2) END END) WHEN SUBSTR((moved_to), 1, LENGTH(?2)) = (?2) THEN CASE WHEN LENGTH(?2) = LENGTH(moved_to) THEN (?3) WHEN SUBSTR((moved_to), LENGTH(?2)+1, 1) = '/' THEN (?3) || SUBSTR((moved_to), LENGTH(?2)+1) END END) " \
" WHERE wc_id = ?1 " \
" AND (((moved_to) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((moved_to) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
""
-#define STMT_CLEAR_MOVED_TO_DESCENDANTS 188
-#define STMT_188_INFO {"STMT_CLEAR_MOVED_TO_DESCENDANTS", NULL}
-#define STMT_188 \
+#define STMT_CLEAR_MOVED_TO_DESCENDANTS 190
+#define STMT_190_INFO {"STMT_CLEAR_MOVED_TO_DESCENDANTS", NULL}
+#define STMT_190 \
"UPDATE nodes SET moved_to = NULL " \
" WHERE wc_id = ?1 " \
" AND (((moved_to) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((moved_to) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
""
-#define STMT_SELECT_MOVED_PAIR2 189
-#define STMT_189_INFO {"STMT_SELECT_MOVED_PAIR2", NULL}
-#define STMT_189 \
+#define STMT_SELECT_MOVED_PAIR2 191
+#define STMT_191_INFO {"STMT_SELECT_MOVED_PAIR2", NULL}
+#define STMT_191 \
"SELECT local_relpath, moved_to, op_depth FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
@@ -1987,20 +2013,25 @@
" AND o.local_relpath = ?2) " \
""
-#define STMT_SELECT_MOVED_PAIR3 190
-#define STMT_190_INFO {"STMT_SELECT_MOVED_PAIR3", NULL}
-#define STMT_190 \
+#define STMT_SELECT_MOVED_PAIR3 192
+#define STMT_192_INFO {"STMT_SELECT_MOVED_PAIR3", NULL}
+#define STMT_192 \
"SELECT local_relpath, moved_to, op_depth, kind FROM nodes " \
+ "WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > ?3 " \
+ " AND moved_to IS NOT NULL " \
+ "UNION ALL " \
+ "SELECT local_relpath, moved_to, op_depth, kind FROM nodes " \
"WHERE wc_id = ?1 " \
- " AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
+ " AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
" AND op_depth > ?3 " \
" AND moved_to IS NOT NULL " \
+ "ORDER BY local_relpath, op_depth " \
""
-#define STMT_SELECT_MOVED_OUTSIDE 191
-#define STMT_191_INFO {"STMT_SELECT_MOVED_OUTSIDE", NULL}
-#define STMT_191 \
- "SELECT local_relpath, moved_to FROM nodes " \
+#define STMT_SELECT_MOVED_OUTSIDE 193
+#define STMT_193_INFO {"STMT_SELECT_MOVED_OUTSIDE", NULL}
+#define STMT_193 \
+ "SELECT local_relpath, moved_to, op_depth FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
" AND op_depth >= ?3 " \
@@ -2008,9 +2039,9 @@
" AND NOT (((moved_to) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((moved_to) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
""
-#define STMT_SELECT_OP_DEPTH_MOVED_PAIR 192
-#define STMT_192_INFO {"STMT_SELECT_OP_DEPTH_MOVED_PAIR", NULL}
-#define STMT_192 \
+#define STMT_SELECT_OP_DEPTH_MOVED_PAIR 194
+#define STMT_194_INFO {"STMT_SELECT_OP_DEPTH_MOVED_PAIR", NULL}
+#define STMT_194 \
"SELECT n.local_relpath, n.moved_to, " \
" (SELECT o.repos_path FROM nodes AS o " \
" WHERE o.wc_id = n.wc_id " \
@@ -2023,9 +2054,9 @@
" AND n.moved_to IS NOT NULL " \
""
-#define STMT_SELECT_MOVED_DESCENDANTS 193
-#define STMT_193_INFO {"STMT_SELECT_MOVED_DESCENDANTS", NULL}
-#define STMT_193 \
+#define STMT_SELECT_MOVED_DESCENDANTS 195
+#define STMT_195_INFO {"STMT_SELECT_MOVED_DESCENDANTS", NULL}
+#define STMT_195 \
"SELECT n.local_relpath, h.moved_to " \
"FROM nodes n, nodes h " \
"WHERE n.wc_id = ?1 " \
@@ -2041,9 +2072,9 @@
" AND h.moved_to IS NOT NULL " \
""
-#define STMT_COMMIT_UPDATE_ORIGIN 194
-#define STMT_194_INFO {"STMT_COMMIT_UPDATE_ORIGIN", NULL}
-#define STMT_194 \
+#define STMT_COMMIT_UPDATE_ORIGIN 196
+#define STMT_196_INFO {"STMT_COMMIT_UPDATE_ORIGIN", NULL}
+#define STMT_196 \
"UPDATE nodes SET repos_id = ?4, " \
" repos_path = ?5 || SUBSTR(local_relpath, LENGTH(?2)+1), " \
" revision = ?6 " \
@@ -2053,16 +2084,16 @@
" AND op_depth = ?3 " \
""
-#define STMT_HAS_LAYER_BETWEEN 195
-#define STMT_195_INFO {"STMT_HAS_LAYER_BETWEEN", NULL}
-#define STMT_195 \
+#define STMT_HAS_LAYER_BETWEEN 197
+#define STMT_197_INFO {"STMT_HAS_LAYER_BETWEEN", NULL}
+#define STMT_197 \
"SELECT 1 FROM NODES " \
"WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > ?3 AND op_depth < ?4 " \
""
-#define STMT_SELECT_REPOS_PATH_REVISION 196
-#define STMT_196_INFO {"STMT_SELECT_REPOS_PATH_REVISION", NULL}
-#define STMT_196 \
+#define STMT_SELECT_REPOS_PATH_REVISION 198
+#define STMT_198_INFO {"STMT_SELECT_REPOS_PATH_REVISION", NULL}
+#define STMT_198 \
"SELECT local_relpath, repos_path, revision FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -2070,16 +2101,16 @@
"ORDER BY local_relpath " \
""
-#define STMT_SELECT_HAS_NON_FILE_CHILDREN 197
-#define STMT_197_INFO {"STMT_SELECT_HAS_NON_FILE_CHILDREN", NULL}
-#define STMT_197 \
+#define STMT_SELECT_HAS_NON_FILE_CHILDREN 199
+#define STMT_199_INFO {"STMT_SELECT_HAS_NON_FILE_CHILDREN", NULL}
+#define STMT_199 \
"SELECT 1 FROM nodes " \
"WHERE wc_id = ?1 AND parent_relpath = ?2 AND op_depth = 0 AND kind != 'file' " \
""
-#define STMT_SELECT_HAS_GRANDCHILDREN 198
-#define STMT_198_INFO {"STMT_SELECT_HAS_GRANDCHILDREN", NULL}
-#define STMT_198 \
+#define STMT_SELECT_HAS_GRANDCHILDREN 200
+#define STMT_200_INFO {"STMT_SELECT_HAS_GRANDCHILDREN", NULL}
+#define STMT_200 \
"SELECT 1 FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (((parent_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((parent_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -2087,16 +2118,16 @@
" AND file_external IS NULL " \
""
-#define STMT_SELECT_ALL_NODES 199
-#define STMT_199_INFO {"STMT_SELECT_ALL_NODES", NULL}
-#define STMT_199 \
+#define STMT_SELECT_ALL_NODES 201
+#define STMT_201_INFO {"STMT_SELECT_ALL_NODES", NULL}
+#define STMT_201 \
"SELECT op_depth, local_relpath, parent_relpath, file_external FROM nodes " \
"WHERE wc_id = ?1 " \
""
-#define STMT_SELECT_IPROPS 200
-#define STMT_200_INFO {"STMT_SELECT_IPROPS", NULL}
-#define STMT_200 \
+#define STMT_SELECT_IPROPS 202
+#define STMT_202_INFO {"STMT_SELECT_IPROPS", NULL}
+#define STMT_202 \
"SELECT inherited_props FROM nodes " \
"WHERE wc_id = ?1 " \
" AND local_relpath = ?2 " \
@@ -2103,17 +2134,17 @@
" AND op_depth = 0 " \
""
-#define STMT_UPDATE_IPROP 201
-#define STMT_201_INFO {"STMT_UPDATE_IPROP", NULL}
-#define STMT_201 \
+#define STMT_UPDATE_IPROP 203
+#define STMT_203_INFO {"STMT_UPDATE_IPROP", NULL}
+#define STMT_203 \
"UPDATE nodes " \
"SET inherited_props = ?3 " \
"WHERE (wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0) " \
""
-#define STMT_SELECT_IPROPS_NODE 202
-#define STMT_202_INFO {"STMT_SELECT_IPROPS_NODE", NULL}
-#define STMT_202 \
+#define STMT_SELECT_IPROPS_NODE 204
+#define STMT_204_INFO {"STMT_SELECT_IPROPS_NODE", NULL}
+#define STMT_204 \
"SELECT local_relpath, repos_path FROM nodes " \
"WHERE wc_id = ?1 " \
" AND local_relpath = ?2 " \
@@ -2121,9 +2152,9 @@
" AND (inherited_props not null) " \
""
-#define STMT_SELECT_IPROPS_RECURSIVE 203
-#define STMT_203_INFO {"STMT_SELECT_IPROPS_RECURSIVE", NULL}
-#define STMT_203 \
+#define STMT_SELECT_IPROPS_RECURSIVE 205
+#define STMT_205_INFO {"STMT_SELECT_IPROPS_RECURSIVE", NULL}
+#define STMT_205 \
"SELECT local_relpath, repos_path FROM nodes " \
"WHERE wc_id = ?1 " \
" AND (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END)) " \
@@ -2131,9 +2162,9 @@
" AND (inherited_props not null) " \
""
-#define STMT_SELECT_IPROPS_CHILDREN 204
-#define STMT_204_INFO {"STMT_SELECT_IPROPS_CHILDREN", NULL}
-#define STMT_204 \
+#define STMT_SELECT_IPROPS_CHILDREN 206
+#define STMT_206_INFO {"STMT_SELECT_IPROPS_CHILDREN", NULL}
+#define STMT_206 \
"SELECT local_relpath, repos_path FROM nodes " \
"WHERE wc_id = ?1 " \
" AND parent_relpath = ?2 " \
@@ -2141,9 +2172,9 @@
" AND (inherited_props not null) " \
""
-#define STMT_CREATE_SCHEMA 205
-#define STMT_205_INFO {"STMT_CREATE_SCHEMA", NULL}
-#define STMT_205 \
+#define STMT_CREATE_SCHEMA 207
+#define STMT_207_INFO {"STMT_CREATE_SCHEMA", NULL}
+#define STMT_207 \
"CREATE TABLE REPOSITORY ( " \
" id INTEGER PRIMARY KEY AUTOINCREMENT, " \
" root TEXT UNIQUE NOT NULL, " \
@@ -2208,9 +2239,9 @@
"; " \
""
-#define STMT_CREATE_NODES 206
-#define STMT_206_INFO {"STMT_CREATE_NODES", NULL}
-#define STMT_206 \
+#define STMT_CREATE_NODES 208
+#define STMT_208_INFO {"STMT_CREATE_NODES", NULL}
+#define STMT_208 \
"CREATE TABLE NODES ( " \
" wc_id INTEGER NOT NULL REFERENCES WCROOT (id), " \
" local_relpath TEXT NOT NULL, " \
@@ -2250,9 +2281,9 @@
" WHERE op_depth = 0; " \
""
-#define STMT_CREATE_NODES_TRIGGERS 207
-#define STMT_207_INFO {"STMT_CREATE_NODES_TRIGGERS", NULL}
-#define STMT_207 \
+#define STMT_CREATE_NODES_TRIGGERS 209
+#define STMT_209_INFO {"STMT_CREATE_NODES_TRIGGERS", NULL}
+#define STMT_209 \
"CREATE TRIGGER nodes_insert_trigger " \
"AFTER INSERT ON nodes " \
"WHEN NEW.checksum IS NOT NULL " \
@@ -2278,9 +2309,9 @@
"END; " \
""
-#define STMT_CREATE_EXTERNALS 208
-#define STMT_208_INFO {"STMT_CREATE_EXTERNALS", NULL}
-#define STMT_208 \
+#define STMT_CREATE_EXTERNALS 210
+#define STMT_210_INFO {"STMT_CREATE_EXTERNALS", NULL}
+#define STMT_210 \
"CREATE TABLE EXTERNALS ( " \
" wc_id INTEGER NOT NULL REFERENCES WCROOT (id), " \
" local_relpath TEXT NOT NULL, " \
@@ -2299,9 +2330,32 @@
" local_relpath); " \
""
-#define STMT_UPGRADE_TO_20 209
-#define STMT_209_INFO {"STMT_UPGRADE_TO_20", NULL}
-#define STMT_209 \
+#define STMT_INSTALL_SCHEMA_STATISTICS 211
+#define STMT_211_INFO {"STMT_INSTALL_SCHEMA_STATISTICS", NULL}
+#define STMT_211 \
+ "ANALYZE sqlite_master; " \
+ "DELETE FROM sqlite_stat1 " \
+ "WHERE tbl in ('NODES', 'ACTUAL_NODE', 'LOCK', 'WC_LOCK'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('NODES', 'sqlite_autoindex_NODES_1', '8000 8000 2 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('NODES', 'I_NODES_PARENT', '8000 8000 10 2 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('NODES', 'I_NODES_MOVED', '8000 8000 1 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('ACTUAL_NODE', 'sqlite_autoindex_ACTUAL_NODE_1', '8000 8000 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('ACTUAL_NODE', 'I_ACTUAL_PARENT', '8000 8000 10 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('LOCK', 'sqlite_autoindex_LOCK_1', '100 100 1'); " \
+ "INSERT OR REPLACE INTO sqlite_stat1(tbl, idx, stat) VALUES " \
+ " ('WC_LOCK', 'sqlite_autoindex_WC_LOCK_1', '100 100 1'); " \
+ "ANALYZE sqlite_master; " \
+ ""
+
+#define STMT_UPGRADE_TO_20 212
+#define STMT_212_INFO {"STMT_UPGRADE_TO_20", NULL}
+#define STMT_212 \
"UPDATE BASE_NODE SET checksum = (SELECT checksum FROM pristine " \
" WHERE md5_checksum = BASE_NODE.checksum) " \
"WHERE EXISTS (SELECT 1 FROM pristine WHERE md5_checksum = BASE_NODE.checksum); " \
@@ -2342,50 +2396,50 @@
"PRAGMA user_version = 20; " \
""
-#define STMT_UPGRADE_TO_21 210
-#define STMT_210_INFO {"STMT_UPGRADE_TO_21", NULL}
-#define STMT_210 \
+#define STMT_UPGRADE_TO_21 213
+#define STMT_213_INFO {"STMT_UPGRADE_TO_21", NULL}
+#define STMT_213 \
"PRAGMA user_version = 21; " \
""
-#define STMT_UPGRADE_21_SELECT_OLD_TREE_CONFLICT 211
-#define STMT_211_INFO {"STMT_UPGRADE_21_SELECT_OLD_TREE_CONFLICT", NULL}
-#define STMT_211 \
+#define STMT_UPGRADE_21_SELECT_OLD_TREE_CONFLICT 214
+#define STMT_214_INFO {"STMT_UPGRADE_21_SELECT_OLD_TREE_CONFLICT", NULL}
+#define STMT_214 \
"SELECT wc_id, local_relpath, tree_conflict_data " \
"FROM actual_node " \
"WHERE tree_conflict_data IS NOT NULL " \
""
-#define STMT_UPGRADE_21_ERASE_OLD_CONFLICTS 212
-#define STMT_212_INFO {"STMT_UPGRADE_21_ERASE_OLD_CONFLICTS", NULL}
-#define STMT_212 \
+#define STMT_UPGRADE_21_ERASE_OLD_CONFLICTS 215
+#define STMT_215_INFO {"STMT_UPGRADE_21_ERASE_OLD_CONFLICTS", NULL}
+#define STMT_215 \
"UPDATE actual_node SET tree_conflict_data = NULL " \
""
-#define STMT_UPGRADE_TO_22 213
-#define STMT_213_INFO {"STMT_UPGRADE_TO_22", NULL}
-#define STMT_213 \
+#define STMT_UPGRADE_TO_22 216
+#define STMT_216_INFO {"STMT_UPGRADE_TO_22", NULL}
+#define STMT_216 \
"UPDATE actual_node SET tree_conflict_data = conflict_data; " \
"UPDATE actual_node SET conflict_data = NULL; " \
"PRAGMA user_version = 22; " \
""
-#define STMT_UPGRADE_TO_23 214
-#define STMT_214_INFO {"STMT_UPGRADE_TO_23", NULL}
-#define STMT_214 \
+#define STMT_UPGRADE_TO_23 217
+#define STMT_217_INFO {"STMT_UPGRADE_TO_23", NULL}
+#define STMT_217 \
"PRAGMA user_version = 23; " \
""
-#define STMT_UPGRADE_23_HAS_WORKING_NODES 215
-#define STMT_215_INFO {"STMT_UPGRADE_23_HAS_WORKING_NODES", NULL}
-#define STMT_215 \
+#define STMT_UPGRADE_23_HAS_WORKING_NODES 218
+#define STMT_218_INFO {"STMT_UPGRADE_23_HAS_WORKING_NODES", NULL}
+#define STMT_218 \
"SELECT 1 FROM nodes WHERE op_depth > 0 " \
"LIMIT 1 " \
""
-#define STMT_UPGRADE_TO_24 216
-#define STMT_216_INFO {"STMT_UPGRADE_TO_24", NULL}
-#define STMT_216 \
+#define STMT_UPGRADE_TO_24 219
+#define STMT_219_INFO {"STMT_UPGRADE_TO_24", NULL}
+#define STMT_219 \
"UPDATE pristine SET refcount = " \
" (SELECT COUNT(*) FROM nodes " \
" WHERE checksum = pristine.checksum ); " \
@@ -2392,9 +2446,9 @@
"PRAGMA user_version = 24; " \
""
-#define STMT_UPGRADE_TO_25 217
-#define STMT_217_INFO {"STMT_UPGRADE_TO_25", NULL}
-#define STMT_217 \
+#define STMT_UPGRADE_TO_25 220
+#define STMT_220_INFO {"STMT_UPGRADE_TO_25", NULL}
+#define STMT_220 \
"DROP VIEW IF EXISTS NODES_CURRENT; " \
"CREATE VIEW NODES_CURRENT AS " \
" SELECT * FROM nodes " \
@@ -2406,9 +2460,9 @@
"PRAGMA user_version = 25; " \
""
-#define STMT_UPGRADE_TO_26 218
-#define STMT_218_INFO {"STMT_UPGRADE_TO_26", NULL}
-#define STMT_218 \
+#define STMT_UPGRADE_TO_26 221
+#define STMT_221_INFO {"STMT_UPGRADE_TO_26", NULL}
+#define STMT_221 \
"DROP VIEW IF EXISTS NODES_BASE; " \
"CREATE VIEW NODES_BASE AS " \
" SELECT * FROM nodes " \
@@ -2416,15 +2470,15 @@
"PRAGMA user_version = 26; " \
""
-#define STMT_UPGRADE_TO_27 219
-#define STMT_219_INFO {"STMT_UPGRADE_TO_27", NULL}
-#define STMT_219 \
+#define STMT_UPGRADE_TO_27 222
+#define STMT_222_INFO {"STMT_UPGRADE_TO_27", NULL}
+#define STMT_222 \
"PRAGMA user_version = 27; " \
""
-#define STMT_UPGRADE_27_HAS_ACTUAL_NODES_CONFLICTS 220
-#define STMT_220_INFO {"STMT_UPGRADE_27_HAS_ACTUAL_NODES_CONFLICTS", NULL}
-#define STMT_220 \
+#define STMT_UPGRADE_27_HAS_ACTUAL_NODES_CONFLICTS 223
+#define STMT_223_INFO {"STMT_UPGRADE_27_HAS_ACTUAL_NODES_CONFLICTS", NULL}
+#define STMT_223 \
"SELECT 1 FROM actual_node " \
"WHERE NOT ((prop_reject IS NULL) AND (conflict_old IS NULL) " \
" AND (conflict_new IS NULL) AND (conflict_working IS NULL) " \
@@ -2432,9 +2486,9 @@
"LIMIT 1 " \
""
-#define STMT_UPGRADE_TO_28 221
-#define STMT_221_INFO {"STMT_UPGRADE_TO_28", NULL}
-#define STMT_221 \
+#define STMT_UPGRADE_TO_28 224
+#define STMT_224_INFO {"STMT_UPGRADE_TO_28", NULL}
+#define STMT_224 \
"UPDATE NODES SET checksum = (SELECT checksum FROM pristine " \
" WHERE md5_checksum = nodes.checksum) " \
"WHERE EXISTS (SELECT 1 FROM pristine WHERE md5_checksum = nodes.checksum); " \
@@ -2441,9 +2495,9 @@
"PRAGMA user_version = 28; " \
""
-#define STMT_UPGRADE_TO_29 222
-#define STMT_222_INFO {"STMT_UPGRADE_TO_29", NULL}
-#define STMT_222 \
+#define STMT_UPGRADE_TO_29 225
+#define STMT_225_INFO {"STMT_UPGRADE_TO_29", NULL}
+#define STMT_225 \
"DROP TRIGGER IF EXISTS nodes_update_checksum_trigger; " \
"DROP TRIGGER IF EXISTS nodes_insert_trigger; " \
"DROP TRIGGER IF EXISTS nodes_delete_trigger; " \
@@ -2473,9 +2527,9 @@
"PRAGMA user_version = 29; " \
""
-#define STMT_UPGRADE_TO_30 223
-#define STMT_223_INFO {"STMT_UPGRADE_TO_30", NULL}
-#define STMT_223 \
+#define STMT_UPGRADE_TO_30 226
+#define STMT_226_INFO {"STMT_UPGRADE_TO_30", NULL}
+#define STMT_226 \
"CREATE UNIQUE INDEX IF NOT EXISTS I_NODES_MOVED " \
"ON NODES (wc_id, moved_to, op_depth); " \
"CREATE INDEX IF NOT EXISTS I_PRISTINE_MD5 ON PRISTINE (md5_checksum); " \
@@ -2483,9 +2537,9 @@
"UPDATE nodes SET file_external=1 WHERE file_external IS NOT NULL; " \
""
-#define STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE 224
-#define STMT_224_INFO {"STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE", NULL}
-#define STMT_224 \
+#define STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE 227
+#define STMT_227_INFO {"STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE", NULL}
+#define STMT_227 \
"SELECT wc_id, local_relpath, " \
" conflict_old, conflict_working, conflict_new, prop_reject, tree_conflict_data " \
"FROM actual_node " \
@@ -2497,9 +2551,9 @@
"ORDER by wc_id, local_relpath " \
""
-#define STMT_UPGRADE_30_SET_CONFLICT 225
-#define STMT_225_INFO {"STMT_UPGRADE_30_SET_CONFLICT", NULL}
-#define STMT_225 \
+#define STMT_UPGRADE_30_SET_CONFLICT 228
+#define STMT_228_INFO {"STMT_UPGRADE_30_SET_CONFLICT", NULL}
+#define STMT_228 \
"UPDATE actual_node SET conflict_data = ?3, conflict_old = NULL, " \
" conflict_working = NULL, conflict_new = NULL, prop_reject = NULL, " \
" tree_conflict_data = NULL " \
@@ -2506,15 +2560,15 @@
"WHERE wc_id = ?1 and local_relpath = ?2 " \
""
-#define STMT_UPGRADE_TO_31_ALTER_TABLE 226
-#define STMT_226_INFO {"STMT_UPGRADE_TO_31_ALTER_TABLE", NULL}
-#define STMT_226 \
+#define STMT_UPGRADE_TO_31_ALTER_TABLE 229
+#define STMT_229_INFO {"STMT_UPGRADE_TO_31_ALTER_TABLE", NULL}
+#define STMT_229 \
"ALTER TABLE NODES ADD COLUMN inherited_props BLOB; " \
""
-#define STMT_UPGRADE_TO_31_FINALIZE 227
-#define STMT_227_INFO {"STMT_UPGRADE_TO_31_FINALIZE", NULL}
-#define STMT_227 \
+#define STMT_UPGRADE_TO_31_FINALIZE 230
+#define STMT_230_INFO {"STMT_UPGRADE_TO_31_FINALIZE", NULL}
+#define STMT_230 \
"DROP INDEX IF EXISTS I_ACTUAL_CHANGELIST; " \
"DROP INDEX IF EXISTS I_EXTERNALS_PARENT; " \
"DROP INDEX I_NODES_PARENT; " \
@@ -2526,9 +2580,9 @@
"PRAGMA user_version = 31; " \
""
-#define STMT_UPGRADE_31_SELECT_WCROOT_NODES 228
-#define STMT_228_INFO {"STMT_UPGRADE_31_SELECT_WCROOT_NODES", NULL}
-#define STMT_228 \
+#define STMT_UPGRADE_31_SELECT_WCROOT_NODES 231
+#define STMT_231_INFO {"STMT_UPGRADE_31_SELECT_WCROOT_NODES", NULL}
+#define STMT_231 \
"SELECT l.wc_id, l.local_relpath FROM nodes as l " \
"LEFT OUTER JOIN nodes as r " \
"ON l.wc_id = r.wc_id " \
@@ -2540,9 +2594,9 @@
" OR (l.repos_path IS NOT (CASE WHEN (r.local_relpath) = '' THEN (CASE WHEN (r.repos_path) = '' THEN (l.local_relpath) WHEN (l.local_relpath) = '' THEN (r.repos_path) ELSE (r.repos_path) || '/' || (l.local_relpath) END) WHEN (r.repos_path) = '' THEN (CASE WHEN (r.local_relpath) = '' THEN (l.local_relpath) WHEN SUBSTR((l.local_relpath), 1, LENGTH(r.local_relpath)) = (r.local_relpath) THEN CASE WHEN LENGTH(r.local_relpath) = LENGTH(l.local_relpath) THEN '' WHEN SUBSTR((l.local_relpath), LENGTH(r.local_relpath)+1, 1) = '/' THEN SUBSTR((l.local_relpath), LENGTH(r.local_relpath)+2) END END) WHEN SUBSTR((l.local_relpath), 1, LENGTH(r.local_relpath)) = (r.local_relpath) THEN CASE WHEN LENGTH(r.local_relpath) = LENGTH(l.local_relpath) THEN (r.repos_path) WHEN SUBSTR((l.local_relpath), LENGTH(r.local_relpath)+1, 1) = '/' THEN (r.repos_path) || SUBSTR((l.local_relpath), LENGTH(r.local_relpath)+1) END END))) " \
""
-#define STMT_UPGRADE_TO_32 229
-#define STMT_229_INFO {"STMT_UPGRADE_TO_32", NULL}
-#define STMT_229 \
+#define STMT_UPGRADE_TO_32 232
+#define STMT_232_INFO {"STMT_UPGRADE_TO_32", NULL}
+#define STMT_232 \
"DROP INDEX IF EXISTS I_ACTUAL_CHANGELIST; " \
"DROP INDEX IF EXISTS I_EXTERNALS_PARENT; " \
"CREATE INDEX I_EXTERNALS_PARENT ON EXTERNALS (wc_id, parent_relpath); " \
@@ -2595,9 +2649,9 @@
"DROP TABLE ACTUAL_NODE_BACKUP; " \
""
-#define STMT_VERIFICATION_TRIGGERS 230
-#define STMT_230_INFO {"STMT_VERIFICATION_TRIGGERS", NULL}
-#define STMT_230 \
+#define STMT_VERIFICATION_TRIGGERS 233
+#define STMT_233_INFO {"STMT_VERIFICATION_TRIGGERS", NULL}
+#define STMT_233 \
"CREATE TEMPORARY TRIGGER no_repository_updates BEFORE UPDATE ON repository " \
"BEGIN " \
" SELECT RAISE(FAIL, 'Updates to REPOSITORY are not allowed.'); " \
@@ -2869,6 +2923,9 @@
STMT_228, \
STMT_229, \
STMT_230, \
+ STMT_231, \
+ STMT_232, \
+ STMT_233, \
NULL \
}
@@ -3105,5 +3162,8 @@
STMT_228_INFO, \
STMT_229_INFO, \
STMT_230_INFO, \
+ STMT_231_INFO, \
+ STMT_232_INFO, \
+ STMT_233_INFO, \
{NULL, NULL} \
}
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.sql 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.sql 2017-02-20 02:39:09 UTC (rev 9266)
@@ -191,7 +191,7 @@
-- STMT_DELETE_NODE
DELETE
FROM NODES
-WHERE wc_id = ?1 AND local_relpath = ?2
+WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = ?3
-- STMT_DELETE_ACTUAL_FOR_BASE_RECURSIVE
/* The ACTUAL_NODE applies to BASE, unless there is in at least one op_depth
@@ -417,6 +417,12 @@
WHERE work.wc_id = ?1 AND work.local_relpath = ?2 AND work.op_depth > 0
LIMIT 1
+-- STMT_SELECT_MOVED_TO_NODE
+SELECT op_depth, moved_to
+FROM nodes
+WHERE wc_id = ?1 AND local_relpath = ?2 AND moved_to IS NOT NULL
+ORDER BY op_depth DESC
+
-- STMT_SELECT_OP_DEPTH_MOVED_TO
SELECT op_depth, moved_to, repos_path, revision
FROM nodes
@@ -711,7 +717,7 @@
WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > ?3)
AND presence = MAP_BASE_DELETED
--- STMT_DELETE_ALL_LAYERS
+-- STMT_DELETE_NODE_ALL_LAYERS
DELETE FROM nodes
WHERE wc_id = ?1 AND local_relpath = ?2
@@ -1503,7 +1509,6 @@
AND presence=MAP_NORMAL
AND file_external IS NULL
-/* ### FIXME: op-depth? What about multiple moves? */
-- STMT_SELECT_MOVED_FROM_RELPATH
SELECT local_relpath, op_depth FROM nodes
WHERE wc_id = ?1 AND moved_to = ?2 AND op_depth > 0
@@ -1530,15 +1535,32 @@
WHERE wc_id = ?1 AND op_depth > 0
AND IS_STRICT_DESCENDANT_OF(moved_to, ?2)
+/* If the node is moved here (r.moved_here = 1) we are really interested in
+ where the node was moved from. To obtain that we need the op_depth, but
+ this form of select only allows a single return value */
-- STMT_SELECT_MOVED_FOR_DELETE
-SELECT local_relpath, moved_to, op_depth FROM nodes
+SELECT local_relpath, moved_to, op_depth,
+ (SELECT CASE WHEN r.moved_here THEN r.op_depth END FROM nodes r
+ WHERE r.wc_id = ?1
+ AND r.local_relpath = n.local_relpath
+ AND r.op_depth < n.op_depth
+ ORDER BY r.op_depth DESC LIMIT 1) AS moved_here_op_depth
+ FROM nodes n
WHERE wc_id = ?1
AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND moved_to IS NOT NULL
- AND op_depth >= (SELECT MAX(op_depth) FROM nodes o
- WHERE o.wc_id = ?1
- AND o.local_relpath = ?2)
+ AND op_depth >= ?3
+-- STMT_SELECT_MOVED_FROM_FOR_DELETE
+SELECT local_relpath, op_depth,
+ (SELECT CASE WHEN r.moved_here THEN r.op_depth END FROM nodes r
+ WHERE r.wc_id = ?1
+ AND r.local_relpath = n.local_relpath
+ AND r.op_depth < n.op_depth
+ ORDER BY r.op_depth DESC LIMIT 1) AS moved_here_op_depth
+ FROM nodes n
+WHERE wc_id = ?1 AND moved_to = ?2 AND op_depth > 0
+
-- STMT_UPDATE_MOVED_TO_DESCENDANTS
UPDATE nodes SET moved_to = RELPATH_SKIP_JOIN(?2, ?3, moved_to)
WHERE wc_id = ?1
@@ -1565,13 +1587,18 @@
-- STMT_SELECT_MOVED_PAIR3
SELECT local_relpath, moved_to, op_depth, kind FROM nodes
+WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth > ?3
+ AND moved_to IS NOT NULL
+UNION ALL
+SELECT local_relpath, moved_to, op_depth, kind FROM nodes
WHERE wc_id = ?1
- AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
+ AND IS_STRICT_DESCENDANT_OF(local_relpath, ?2)
AND op_depth > ?3
AND moved_to IS NOT NULL
+ORDER BY local_relpath, op_depth
-- STMT_SELECT_MOVED_OUTSIDE
-SELECT local_relpath, moved_to FROM nodes
+SELECT local_relpath, moved_to, op_depth FROM nodes
WHERE wc_id = ?1
AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
AND op_depth >= ?3
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -157,6 +157,8 @@
* The bump to 31 added the inherited_props column in the NODES table.
* Bumped in r1395109.
*
+ * == 1.8.x shipped with format 31
+ *
* Please document any further format changes here.
*/
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc_db.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc_db.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc_db.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -627,6 +627,10 @@
When removing a node if the parent has a higher working node then
the parent node and this node are both deleted or replaced and any
delete over this node must be removed.
+
+ This function (like most wcroot functions) assumes that its caller
+ only uses this function within an sqlite transaction if atomic
+ behavior is needed.
*/
svn_error_t *
svn_wc__db_retract_parent_delete(svn_wc__db_wcroot_t *wcroot,
@@ -635,14 +639,60 @@
apr_pool_t *scratch_pool)
{
svn_sqlite__stmt_t *stmt;
+ svn_boolean_t have_row;
+ int working_depth;
+ svn_wc__db_status_t presence;
+ const char *moved_to;
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_DELETE_LOWEST_WORKING_NODE));
+ STMT_SELECT_LOWEST_WORKING_NODE));
SVN_ERR(svn_sqlite__bindf(stmt, "isd", wcroot->wc_id, local_relpath,
op_depth));
- SVN_ERR(svn_sqlite__step_done(stmt));
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
- return SVN_NO_ERROR;
+ if (!have_row)
+ return svn_error_trace(svn_sqlite__reset(stmt));
+
+ working_depth = svn_sqlite__column_int(stmt, 0);
+ presence = svn_sqlite__column_token(stmt, 1, presence_map);
+ moved_to = svn_sqlite__column_text(stmt, 3, scratch_pool);
+
+ SVN_ERR(svn_sqlite__reset(stmt));
+
+ if (moved_to)
+ {
+ /* Turn the move into a copy to keep the NODES table valid */
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_CLEAR_MOVED_HERE_RECURSIVE));
+ SVN_ERR(svn_sqlite__bindf(stmt, "isd", wcroot->wc_id,
+ moved_to, relpath_depth(moved_to)));
+ SVN_ERR(svn_sqlite__step_done(stmt));
+
+ /* This leaves just the moved_to information on the origin,
+ which we will remove in the next step */
+ }
+
+ if (presence == svn_wc__db_status_base_deleted)
+ {
+ /* Nothing left to shadow; remove the base-deleted node */
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb, STMT_DELETE_NODE));
+ }
+ else if (moved_to)
+ {
+ /* Clear moved to information, as this node is no longer base-deleted */
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_CLEAR_MOVED_TO_RELPATH));
+ }
+ else
+ {
+ /* Nothing to update */
+ return SVN_NO_ERROR;
+ }
+
+ SVN_ERR(svn_sqlite__bindf(stmt, "isd", wcroot->wc_id, local_relpath,
+ working_depth));
+
+ return svn_error_trace(svn_sqlite__update(NULL, stmt));
}
@@ -1390,6 +1440,15 @@
return svn_error_trace(svn_sqlite__reset(stmt));
}
+svn_error_t *
+svn_wc__db_install_schema_statistics(svn_sqlite__db_t *sdb,
+ apr_pool_t *scratch_pool)
+{
+ SVN_ERR(svn_sqlite__exec_statements(sdb, STMT_INSTALL_SCHEMA_STATISTICS));
+
+ return SVN_NO_ERROR;
+}
+
/* Helper for create_db(). Initializes our wc.db schema.
*/
static svn_error_t *
@@ -1417,6 +1476,8 @@
SVN_ERR(create_repos_id(repos_id, repos_root_url, repos_uuid,
db, scratch_pool));
+ SVN_ERR(svn_wc__db_install_schema_statistics(db, scratch_pool));
+
/* Insert the wcroot. */
/* ### Right now, this just assumes wc metadata is being stored locally. */
SVN_ERR(svn_sqlite__get_statement(&stmt, db, STMT_INSERT_WCROOT));
@@ -2248,6 +2309,12 @@
* might introduce actual-only nodes without direct parents,
* and we're not yet sure if other existing code is prepared
* to handle such nodes. To be revisited post-1.8.
+ *
+ * ### In case of a conflict we are most likely creating WORKING nodes
+ * describing a copy of what was in BASE. The move information
+ * should be updated to describe a move from the WORKING layer.
+ * When stored that way the resolver of the tree conflict still has
+ * the knowledge of what was moved.
*/
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_SELECT_MOVED_OUTSIDE));
@@ -3748,8 +3815,15 @@
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
src_wcroot, src_relpath, scratch_pool, scratch_pool));
- SVN_ERR(db_read_pristine_props(&props, src_wcroot, src_relpath, FALSE,
- scratch_pool, scratch_pool));
+ if (dst_status != svn_wc__db_status_not_present
+ && dst_status != svn_wc__db_status_excluded
+ && dst_status != svn_wc__db_status_server_excluded)
+ {
+ SVN_ERR(db_read_pristine_props(&props, src_wcroot, src_relpath, FALSE,
+ scratch_pool, scratch_pool));
+ }
+ else
+ props = NULL;
blank_iwb(&iwb);
iwb.presence = dst_status;
@@ -4059,8 +4133,9 @@
svn_wc__db_status_t *status,
svn_node_kind_t *kind,
svn_boolean_t *op_root,
- svn_wc__db_wcroot_t *wcroot,
+ svn_wc__db_wcroot_t *src_wcroot,
const char *local_relpath,
+ svn_wc__db_wcroot_t *dst_wcroot,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -4077,7 +4152,7 @@
NULL /* have_base */,
NULL /* have_more_work */,
NULL /* have_work */,
- wcroot, local_relpath, result_pool, scratch_pool));
+ src_wcroot, local_relpath, result_pool, scratch_pool));
if (op_root)
*op_root = is_op_root;
@@ -4092,7 +4167,7 @@
scratch_pool);
SVN_ERR(get_info_for_copy(copyfrom_id, copyfrom_relpath, copyfrom_rev,
NULL, NULL, NULL,
- wcroot, parent_relpath,
+ src_wcroot, parent_relpath, dst_wcroot,
scratch_pool, scratch_pool));
if (*copyfrom_relpath)
*copyfrom_relpath = svn_relpath_join(*copyfrom_relpath, base_name,
@@ -4101,7 +4176,7 @@
else if (node_status == svn_wc__db_status_added)
{
SVN_ERR(scan_addition(&node_status, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, wcroot, local_relpath,
+ NULL, NULL, NULL, src_wcroot, local_relpath,
scratch_pool, scratch_pool));
}
else if (node_status == svn_wc__db_status_deleted && is_op_root)
@@ -4110,7 +4185,7 @@
SVN_ERR(scan_deletion_txn(&base_del_relpath, NULL,
&work_del_relpath,
- NULL, wcroot, local_relpath,
+ NULL, src_wcroot, local_relpath,
scratch_pool, scratch_pool));
if (work_del_relpath)
{
@@ -4123,7 +4198,8 @@
SVN_ERR(scan_addition(NULL, &op_root_relpath,
NULL, NULL, /* repos_* */
copyfrom_relpath, copyfrom_id, copyfrom_rev,
- NULL, NULL, NULL, wcroot, parent_del_relpath,
+ NULL, NULL, NULL,
+ src_wcroot, parent_del_relpath,
scratch_pool, scratch_pool));
*copyfrom_relpath
= svn_relpath_join(*copyfrom_relpath,
@@ -4138,7 +4214,7 @@
copyfrom_id, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
- wcroot, local_relpath,
+ src_wcroot, local_relpath,
result_pool,
scratch_pool));
}
@@ -4160,6 +4236,24 @@
if (status)
*status = node_status;
+ if (src_wcroot != dst_wcroot && *copyfrom_relpath)
+ {
+ const char *repos_root_url;
+ const char *repos_uuid;
+
+ /* Pass the right repos-id for the destination db. We can't just use
+ the id of the source database, as this value can change after
+ relocation (and perhaps also when we start storing multiple
+ working copies in a single db)! */
+
+ SVN_ERR(svn_wc__db_fetch_repos_info(&repos_root_url, &repos_uuid,
+ src_wcroot->sdb, *copyfrom_id,
+ scratch_pool));
+
+ SVN_ERR(create_repos_id(copyfrom_id, repos_root_url, repos_uuid,
+ dst_wcroot->sdb, scratch_pool));
+ }
+
return SVN_NO_ERROR;
}
@@ -4319,8 +4413,9 @@
const apr_array_header_t *children;
SVN_ERR(get_info_for_copy(©from_id, ©from_relpath, ©from_rev,
- &status, &kind, &op_root, src_wcroot,
- src_relpath, scratch_pool, scratch_pool));
+ &status, &kind, &op_root,
+ src_wcroot, src_relpath, dst_wcroot,
+ scratch_pool, scratch_pool));
SVN_ERR(op_depth_for_copy(&dst_op_depth, &dst_np_op_depth,
&dst_parent_op_depth,
@@ -5043,6 +5138,17 @@
scratch_pool));
}
+ if (dst_presence == svn_wc__db_status_not_present)
+ {
+ /* Don't create descendants of a not present node! */
+
+ /* This code is currently still triggered by copying deleted nodes
+ between separate working copies. See ### comment above. */
+
+ svn_pool_destroy(iterpool);
+ return SVN_NO_ERROR;
+ }
+
SVN_ERR(gather_repo_children(&children, src_wcroot, src_relpath,
src_op_depth, scratch_pool, iterpool));
@@ -6388,6 +6494,7 @@
{
SVN_ERR(svn_wc__db_resolve_break_moved_away_internal(wcroot,
local_relpath,
+ op_depth,
scratch_pool));
}
else
@@ -6554,10 +6661,12 @@
while (have_row)
{
const char *move_src_relpath = svn_sqlite__column_text(stmt, 0, NULL);
+ int move_op_depth = svn_sqlite__column_int(stmt, 2);
svn_error_t *err;
err = svn_wc__db_resolve_break_moved_away_internal(wcroot,
move_src_relpath,
+ move_op_depth,
scratch_pool);
if (err)
return svn_error_compose_create(err, svn_sqlite__reset(stmt));
@@ -7141,7 +7250,7 @@
if (local_relpath[0] != '\0')
{
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_DELETE_NODE));
+ STMT_DELETE_NODE_ALL_LAYERS));
SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
SVN_ERR(svn_sqlite__step_done(stmt));
}
@@ -7452,9 +7561,87 @@
/* The op-depth of the deleted node at the source of the move. */
int op_depth;
+
+ /* When >= 1 the op_depth at which local_relpath was moved to its
+ location. Used to find its original location outside the delete */
+ int moved_from_depth;
};
+/* Helper function to resolve the original location of local_relpath at OP_DEPTH
+ before it was moved into the tree rooted at ROOT_RELPATH. */
static svn_error_t *
+resolve_moved_from(const char **moved_from_relpath,
+ int *moved_from_op_depth,
+ svn_wc__db_wcroot_t *wcroot,
+ const char *root_relpath,
+ const char *local_relpath,
+ int op_depth,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ const char *suffix = "";
+ svn_sqlite__stmt_t *stmt;
+ const char *m_from_relpath;
+ int m_from_op_depth;
+ int m_move_from_depth;
+ svn_boolean_t have_row;
+
+ while (relpath_depth(local_relpath) > op_depth)
+ {
+ const char *name;
+ svn_relpath_split(&local_relpath, &name, local_relpath, scratch_pool);
+ suffix = svn_relpath_join(suffix, name, scratch_pool);
+ }
+
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_SELECT_MOVED_FROM_FOR_DELETE));
+ SVN_ERR(svn_sqlite__bindf(stmt, "is",
+ wcroot->wc_id, local_relpath));
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+
+ if (!have_row)
+ {
+ /* assert(have_row); */
+ *moved_from_relpath = NULL;
+ *moved_from_op_depth = -1;
+
+ SVN_ERR(svn_sqlite__reset(stmt));
+
+ return SVN_NO_ERROR;
+ }
+
+ m_from_relpath = svn_sqlite__column_text(stmt, 0, scratch_pool);
+ m_from_op_depth = svn_sqlite__column_int(stmt, 1);
+ m_move_from_depth = svn_sqlite__column_int(stmt, 2);
+
+ SVN_ERR(svn_sqlite__reset(stmt));
+
+ if (! svn_relpath_skip_ancestor(root_relpath, m_from_relpath))
+ {
+ *moved_from_relpath = svn_relpath_join(m_from_relpath, suffix,
+ result_pool);
+ *moved_from_op_depth = m_from_op_depth; /* ### Ok? */
+ return SVN_NO_ERROR;
+ }
+ else if (!m_move_from_depth)
+ {
+ *moved_from_relpath = NULL;
+ *moved_from_op_depth = -1;
+ return SVN_NO_ERROR;
+ }
+
+ return svn_error_trace(
+ resolve_moved_from(moved_from_relpath,
+ moved_from_op_depth,
+ wcroot,
+ root_relpath,
+ svn_relpath_join(m_from_relpath, suffix,
+ scratch_pool),
+ m_move_from_depth,
+ result_pool, scratch_pool));
+}
+
+static svn_error_t *
delete_node(void *baton,
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
@@ -7465,20 +7652,71 @@
svn_boolean_t have_row, op_root;
svn_boolean_t add_work = FALSE;
svn_sqlite__stmt_t *stmt;
- int select_depth; /* Depth of what is to be deleted */
- svn_boolean_t refetch_depth = FALSE;
+ int working_op_depth; /* Depth of what is to be deleted */
+ int keep_op_depth = 0; /* Depth of what is below what is deleted */
svn_node_kind_t kind;
apr_array_header_t *moved_nodes = NULL;
- int delete_depth = relpath_depth(local_relpath);
+ int delete_op_depth = relpath_depth(local_relpath);
- SVN_ERR(read_info(&status,
- &kind, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- &op_root, NULL, NULL,
- NULL, NULL, NULL,
- wcroot, local_relpath,
- scratch_pool, scratch_pool));
+ assert(*local_relpath); /* Can't delete wcroot */
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_SELECT_NODE_INFO));
+ SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+
+ if (!have_row)
+ {
+ return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND,
+ svn_sqlite__reset(stmt),
+ _("The node '%s' was not found."),
+ path_for_error_message(wcroot,
+ local_relpath,
+ scratch_pool));
+ }
+
+ working_op_depth = svn_sqlite__column_int(stmt, 0);
+ status = svn_sqlite__column_token(stmt, 3, presence_map);
+ kind = svn_sqlite__column_token(stmt, 4, kind_map);
+
+ if (working_op_depth < delete_op_depth)
+ {
+ op_root = FALSE;
+ add_work = TRUE;
+ keep_op_depth = working_op_depth;
+ }
+ else
+ {
+ op_root = TRUE;
+
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+
+ if (have_row)
+ {
+ svn_wc__db_status_t below_status;
+ int below_op_depth;
+
+ below_op_depth = svn_sqlite__column_int(stmt, 0);
+ below_status = svn_sqlite__column_token(stmt, 3, presence_map);
+
+ if (below_status != svn_wc__db_status_not_present
+ && below_status != svn_wc__db_status_base_deleted)
+ {
+ add_work = TRUE;
+ keep_op_depth = below_op_depth;
+ }
+ else
+ keep_op_depth = 0;
+ }
+ else
+ keep_op_depth = -1;
+ }
+
+ SVN_ERR(svn_sqlite__reset(stmt));
+
+ if (working_op_depth != 0) /* WORKING */
+ SVN_ERR(convert_to_working_status(&status, status));
+
if (status == svn_wc__db_status_deleted
|| status == svn_wc__db_status_not_present)
return SVN_NO_ERROR;
@@ -7556,6 +7794,7 @@
part, scratch_pool);
moved_node->op_depth = move_op_depth;
moved_node->moved_to_relpath = b->moved_to_relpath;
+ moved_node->moved_from_depth = -1;
APR_ARRAY_PUSH(moved_nodes, const struct moved_node_t *) = moved_node;
}
@@ -7567,8 +7806,9 @@
* possibly because of a nested move operation. */
moved_node = apr_palloc(scratch_pool, sizeof(struct moved_node_t));
moved_node->local_relpath = local_relpath;
- moved_node->op_depth = delete_depth;
+ moved_node->op_depth = delete_op_depth;
moved_node->moved_to_relpath = b->moved_to_relpath;
+ moved_node->moved_from_depth = -1;
APR_ARRAY_PUSH(moved_nodes, const struct moved_node_t *) = moved_node;
}
@@ -7583,14 +7823,6 @@
b->moved_to_relpath));
SVN_ERR(svn_sqlite__update(NULL, stmt));
}
- else
- {
- SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_CLEAR_MOVED_TO_DESCENDANTS));
- SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id,
- local_relpath));
- SVN_ERR(svn_sqlite__update(NULL, stmt));
- }
/* Find children that were moved out of the subtree rooted at this node.
* We'll need to update their op-depth columns because their deletion
@@ -7597,10 +7829,12 @@
* is now implied by the deletion of their parent (i.e. this node). */
{
apr_pool_t *iterpool;
+ int i;
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_SELECT_MOVED_FOR_DELETE));
- SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
+ SVN_ERR(svn_sqlite__bindf(stmt, "isd", wcroot->wc_id, local_relpath,
+ delete_op_depth));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
iterpool = svn_pool_create(scratch_pool);
@@ -7610,52 +7844,85 @@
const char *child_relpath = svn_sqlite__column_text(stmt, 0, NULL);
const char *mv_to_relpath = svn_sqlite__column_text(stmt, 1, NULL);
int child_op_depth = svn_sqlite__column_int(stmt, 2);
+ int moved_from_depth = -1;
svn_boolean_t fixup = FALSE;
- if (!b->moved_to_relpath
+ if (! b->moved_to_relpath
&& ! svn_relpath_skip_ancestor(local_relpath, mv_to_relpath))
{
- /* Update the op-depth of an moved node below this tree */
- fixup = TRUE;
- child_op_depth = delete_depth;
- }
- else if (b->moved_to_relpath
- && delete_depth == child_op_depth)
- {
- /* Update the op-depth of a tree shadowed by this tree */
- fixup = TRUE;
- child_op_depth = delete_depth;
- }
- else if (b->moved_to_relpath
- && child_op_depth >= delete_depth
- && !svn_relpath_skip_ancestor(local_relpath, mv_to_relpath))
- {
- /* Update the move destination of something that is now moved
- away further */
+ /* a NULL moved_here_depth will be reported as 0 */
+ int moved_here_depth = svn_sqlite__column_int(stmt, 3);
- child_relpath = svn_relpath_skip_ancestor(local_relpath, child_relpath);
+ /* Plain delete. Fixup move information of descendants that were
+ moved here, or that were moved out */
- if (child_relpath)
+ if (moved_here_depth >= delete_op_depth)
{
- child_relpath = svn_relpath_join(b->moved_to_relpath, child_relpath, scratch_pool);
+ /* The move we recorded here must be moved to the location
+ this node had before it was moved here.
- if (child_op_depth > delete_depth
- && svn_relpath_skip_ancestor(local_relpath, child_relpath))
- child_op_depth = delete_depth;
- else
- child_op_depth = relpath_depth(child_relpath);
+ This might contain multiple steps when the node was moved
+ in several places within the to be deleted tree */
+ /* ### TODO: Add logic */
fixup = TRUE;
+ moved_from_depth = moved_here_depth;
}
+ else
+ {
+ /* Update the op-depth of an moved away node that was
+ registered as moved by the records that we are about
+ to delete */
+ fixup = TRUE;
+ child_op_depth = delete_op_depth;
+ }
}
+ else if (b->moved_to_relpath)
+ {
+ /* The node is moved to a new location */
+ if (delete_op_depth == child_op_depth)
+ {
+ /* Update the op-depth of a tree shadowed by this tree */
+ fixup = TRUE;
+ /*child_op_depth = delete_depth;*/
+ }
+ else if (child_op_depth >= delete_op_depth
+ && !svn_relpath_skip_ancestor(local_relpath,
+ mv_to_relpath))
+ {
+ /* Update the move destination of something that is now moved
+ away further */
+
+ child_relpath = svn_relpath_skip_ancestor(local_relpath,
+ child_relpath);
+
+ if (child_relpath)
+ {
+ child_relpath = svn_relpath_join(b->moved_to_relpath,
+ child_relpath,
+ scratch_pool);
+
+ if (child_op_depth > delete_op_depth
+ && svn_relpath_skip_ancestor(local_relpath,
+ child_relpath))
+ child_op_depth = delete_op_depth;
+ else
+ child_op_depth = relpath_depth(child_relpath);
+
+ fixup = TRUE;
+ }
+ }
+ }
+
if (fixup)
{
- mn = apr_pcalloc(scratch_pool, sizeof(struct moved_node_t));
+ mn = apr_palloc(scratch_pool, sizeof(struct moved_node_t));
mn->local_relpath = apr_pstrdup(scratch_pool, child_relpath);
mn->moved_to_relpath = apr_pstrdup(scratch_pool, mv_to_relpath);
mn->op_depth = child_op_depth;
+ mn->moved_from_depth = moved_from_depth;
if (!moved_nodes)
moved_nodes = apr_array_make(scratch_pool, 1,
@@ -7665,39 +7932,51 @@
SVN_ERR(svn_sqlite__step(&have_row, stmt));
}
+ SVN_ERR(svn_sqlite__reset(stmt));
+
+ for (i = 0; moved_nodes && (i < moved_nodes->nelts); i++)
+ {
+ struct moved_node_t *mn = APR_ARRAY_IDX(moved_nodes, i,
+ struct moved_node_t *);
+
+ if (mn->moved_from_depth > 0)
+ {
+ svn_pool_clear(iterpool);
+
+ SVN_ERR(resolve_moved_from(&mn->local_relpath, &mn->op_depth,
+ wcroot, local_relpath,
+ mn->local_relpath,
+ mn->moved_from_depth,
+ scratch_pool, iterpool));
+
+ if (!mn->local_relpath)
+ svn_sort__array_delete(moved_nodes, i--, 1);
+ }
+ }
+
svn_pool_destroy(iterpool);
- SVN_ERR(svn_sqlite__reset(stmt));
}
- if (op_root)
+ if (!b->moved_to_relpath)
{
- svn_boolean_t below_base;
- svn_boolean_t below_work;
- svn_wc__db_status_t below_status;
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_CLEAR_MOVED_TO_DESCENDANTS));
+ SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id,
+ local_relpath));
+ SVN_ERR(svn_sqlite__update(NULL, stmt));
- /* Use STMT_SELECT_NODE_INFO directly instead of read_info plus
- info_below_working */
- SVN_ERR(info_below_working(&below_base, &below_work, &below_status,
- wcroot, local_relpath, -1, scratch_pool));
- if ((below_base || below_work)
- && below_status != svn_wc__db_status_not_present
- && below_status != svn_wc__db_status_deleted)
+ if (op_root)
{
- add_work = TRUE;
- refetch_depth = TRUE;
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_CLEAR_MOVED_TO_FROM_DEST));
+ SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id,
+ local_relpath));
+
+ SVN_ERR(svn_sqlite__update(NULL, stmt));
}
-
- select_depth = relpath_depth(local_relpath);
}
- else
- {
- add_work = TRUE;
- if (status != svn_wc__db_status_normal)
- SVN_ERR(op_depth_of(&select_depth, wcroot, local_relpath));
- else
- select_depth = 0; /* Deleting BASE node */
- }
+
/* ### Put actual-only nodes into the list? */
if (b->notify)
{
@@ -7704,7 +7983,7 @@
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_INSERT_DELETE_LIST));
SVN_ERR(svn_sqlite__bindf(stmt, "isd",
- wcroot->wc_id, local_relpath, select_depth));
+ wcroot->wc_id, local_relpath, working_op_depth));
SVN_ERR(svn_sqlite__step_done(stmt));
}
@@ -7711,12 +7990,9 @@
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_DELETE_NODES_ABOVE_DEPTH_RECURSIVE));
SVN_ERR(svn_sqlite__bindf(stmt, "isd",
- wcroot->wc_id, local_relpath, delete_depth));
+ wcroot->wc_id, local_relpath, delete_op_depth));
SVN_ERR(svn_sqlite__step_done(stmt));
- if (refetch_depth)
- SVN_ERR(op_depth_of(&select_depth, wcroot, local_relpath));
-
/* Delete ACTUAL_NODE rows, but leave those that have changelist
and a NODES row. */
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
@@ -7746,7 +8022,7 @@
STMT_INSERT_DELETE_FROM_NODE_RECURSIVE));
SVN_ERR(svn_sqlite__bindf(stmt, "isdd",
wcroot->wc_id, local_relpath,
- select_depth, delete_depth));
+ keep_op_depth, delete_op_depth));
SVN_ERR(svn_sqlite__step_done(stmt));
}
@@ -8645,7 +8921,11 @@
else
child->op_root = (op_depth == relpath_depth(child_relpath));
- svn_hash_sets(nodes, apr_pstrdup(result_pool, name), child);
+ if (op_depth && child->op_root)
+ child_item->info.moved_here = svn_sqlite__column_boolean(stmt, 20);
+
+ if (new_child)
+ svn_hash_sets(nodes, apr_pstrdup(result_pool, name), child);
}
if (op_depth == 0)
@@ -8667,18 +8947,48 @@
child_item->nr_layers++;
child_item->info.have_more_work = (child_item->nr_layers > 1);
- /* Moved-to can only exist at op_depth > 0. */
- /* ### Should we really do this for every layer where op_depth > 0
- in undefined order? */
+
+ /* A local_relpath can be moved multiple times at different op
+ depths and it really depends on the caller what is interesting.
+ We provide a simple linked list with the moved_from information */
+
moved_to_relpath = svn_sqlite__column_text(stmt, 21, NULL);
if (moved_to_relpath)
- child_item->info.moved_to_abspath =
- svn_dirent_join(wcroot->abspath, moved_to_relpath, result_pool);
+ {
+ struct svn_wc__db_moved_to_info_t *moved_to;
+ struct svn_wc__db_moved_to_info_t **next;
+ const char *shadow_op_relpath;
+ int cur_op_depth;
- /* Moved-here can only exist at op_depth > 0. */
- /* ### Should we really do this for every layer where op_depth > 0
- in undefined order? */
- child_item->info.moved_here = svn_sqlite__column_boolean(stmt, 20);
+ moved_to = apr_pcalloc(result_pool, sizeof(*moved_to));
+ moved_to->moved_to_abspath = svn_dirent_join(wcroot->abspath,
+ moved_to_relpath,
+ result_pool);
+
+ cur_op_depth = relpath_depth(child_relpath);
+ shadow_op_relpath = child_relpath;
+
+ while (cur_op_depth > op_depth)
+ {
+ shadow_op_relpath = svn_relpath_dirname(shadow_op_relpath,
+ scratch_pool);
+ cur_op_depth--;
+ }
+
+ moved_to->shadow_op_root_abspath =
+ svn_dirent_join(wcroot->abspath, shadow_op_relpath,
+ result_pool);
+
+ next = &child_item->info.moved_to;
+
+ while (*next &&
+ 0 < strcmp((*next)->shadow_op_root_abspath,
+ moved_to->shadow_op_root_abspath))
+ next = &((*next)->next);
+
+ moved_to->next = *next;
+ *next = moved_to;
+ }
}
SVN_ERR(svn_sqlite__step(&have_row, stmt));
@@ -8766,7 +9076,179 @@
return SVN_NO_ERROR;
}
+static svn_error_t *
+db_read_props(apr_hash_t **props,
+ svn_wc__db_wcroot_t *wcroot,
+ const char *local_relpath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+static svn_error_t *
+read_single_info(const struct svn_wc__db_info_t **info,
+ svn_wc__db_wcroot_t *wcroot,
+ const char *local_relpath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ struct svn_wc__db_info_t *mtb;
+ apr_int64_t repos_id;
+ const svn_checksum_t *checksum;
+ const char *original_repos_relpath;
+ svn_boolean_t have_work;
+
+ mtb = apr_pcalloc(result_pool, sizeof(*mtb));
+
+ SVN_ERR(read_info(&mtb->status, &mtb->kind, &mtb->revnum,
+ &mtb->repos_relpath, &repos_id, &mtb->changed_rev,
+ &mtb->changed_date, &mtb->changed_author, &mtb->depth,
+ &checksum, NULL, &original_repos_relpath, NULL, NULL,
+ &mtb->lock, &mtb->recorded_size, &mtb->recorded_time,
+ &mtb->changelist, &mtb->conflicted, &mtb->op_root,
+ &mtb->had_props, &mtb->props_mod, &mtb->have_base,
+ &mtb->have_more_work, &have_work,
+ wcroot, local_relpath,
+ result_pool, scratch_pool));
+
+ /* Query the same rows in the database again for move information */
+ if (have_work && (mtb->have_base || mtb->have_more_work))
+ {
+ svn_sqlite__stmt_t *stmt;
+ svn_boolean_t have_row;
+ const char *cur_relpath = NULL;
+ int cur_op_depth;
+
+ SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
+ STMT_SELECT_MOVED_TO_NODE));
+ SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
+
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+
+ while (have_row)
+ {
+ struct svn_wc__db_moved_to_info_t *move;
+ int op_depth = svn_sqlite__column_int(stmt, 0);
+ const char *moved_to_relpath = svn_sqlite__column_text(stmt, 1, NULL);
+
+ move = apr_pcalloc(result_pool, sizeof(*move));
+ move->moved_to_abspath = svn_dirent_join(wcroot->abspath,
+ moved_to_relpath,
+ result_pool);
+
+ if (!cur_relpath)
+ {
+ cur_relpath = local_relpath;
+ cur_op_depth = relpath_depth(cur_relpath);
+ }
+ while (cur_op_depth > op_depth)
+ {
+ cur_relpath = svn_relpath_dirname(cur_relpath, scratch_pool);
+ cur_op_depth--;
+ }
+ move->shadow_op_root_abspath = svn_dirent_join(wcroot->abspath,
+ cur_relpath,
+ result_pool);
+
+ move->next = mtb->moved_to;
+ mtb->moved_to = move;
+
+ SVN_ERR(svn_sqlite__step(&have_row, stmt));
+ }
+
+ SVN_ERR(svn_sqlite__reset(stmt));
+ }
+
+ /* Maybe we have to get some shadowed lock from BASE to make our test suite
+ happy... (It might be completely unrelated, but...)
+ This queries the same BASE row again, joined to the lock table */
+ if (mtb->have_base && (have_work || mtb->kind == svn_node_file))
+ {
+ svn_boolean_t update_root;
+ svn_wc__db_lock_t **lock_arg = NULL;
+
+ if (have_work)
+ lock_arg = &mtb->lock;
+
+ SVN_ERR(svn_wc__db_base_get_info_internal(NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL, lock_arg, NULL, NULL,
+ &update_root,
+ wcroot, local_relpath,
+ result_pool, scratch_pool));
+
+ mtb->file_external = (update_root && mtb->kind == svn_node_file);
+ }
+
+ if (mtb->status == svn_wc__db_status_added)
+ {
+ svn_wc__db_status_t status;
+
+ SVN_ERR(scan_addition(&status, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL,
+ wcroot, local_relpath,
+ result_pool, scratch_pool));
+
+ mtb->moved_here = (status == svn_wc__db_status_moved_here);
+ mtb->incomplete = (status == svn_wc__db_status_incomplete);
+ }
+
+#ifdef HAVE_SYMLINK
+ if (mtb->kind == svn_node_file
+ && (mtb->had_props || mtb->props_mod))
+ {
+ apr_hash_t *properties;
+
+ if (mtb->props_mod)
+ SVN_ERR(db_read_props(&properties,
+ wcroot, local_relpath,
+ scratch_pool, scratch_pool));
+ else
+ SVN_ERR(db_read_pristine_props(&properties, wcroot, local_relpath,
+ TRUE /* deleted_ok */,
+ scratch_pool, scratch_pool));
+
+ mtb->special = (NULL != svn_hash_gets(properties, SVN_PROP_SPECIAL));
+ }
+#endif
+
+ mtb->has_checksum = (checksum != NULL);
+ mtb->copied = (original_repos_relpath != NULL);
+
+ SVN_ERR(svn_wc__db_fetch_repos_info(&mtb->repos_root_url, &mtb->repos_uuid,
+ wcroot->sdb, repos_id, result_pool));
+
+ if (mtb->kind == svn_node_dir)
+ SVN_ERR(is_wclocked(&mtb->locked, wcroot, local_relpath, scratch_pool));
+
+ *info = mtb;
+
+ return SVN_NO_ERROR;
+}
+
svn_error_t *
+svn_wc__db_read_single_info(const struct svn_wc__db_info_t **info,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ svn_wc__db_wcroot_t *wcroot;
+ const char *local_relpath;
+
+ SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
+
+ SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath, db,
+ local_abspath,
+ scratch_pool, scratch_pool));
+ VERIFY_USABLE_WCROOT(wcroot);
+
+ SVN_WC__DB_WITH_TXN(read_single_info(info, wcroot, local_relpath,
+ result_pool, scratch_pool),
+ wcroot);
+
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *
svn_wc__db_read_pristine_info(svn_wc__db_status_t *status,
svn_node_kind_t *kind,
svn_revnum_t *changed_rev,
@@ -10695,7 +11177,7 @@
if we need to remove shadowed layers below our descendants. */
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
- STMT_DELETE_ALL_LAYERS));
+ STMT_DELETE_NODE_ALL_LAYERS));
SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, local_relpath));
SVN_ERR(svn_sqlite__update(&affected_rows, stmt));
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc_db.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc_db.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc_db.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1909,6 +1909,16 @@
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* Structure used as linked list in svn_wc__db_info_t to describe all nodes
+ in this location that were moved to another location */
+struct svn_wc__db_moved_to_info_t
+{
+ const char *moved_to_abspath;
+ const char *shadow_op_root_abspath;
+
+ struct svn_wc__db_moved_to_info_t *next;
+};
+
/* Structure returned by svn_wc__db_read_children_info. Only has the
fields needed by status. */
struct svn_wc__db_info_t {
@@ -1945,7 +1955,10 @@
svn_wc__db_lock_t *lock; /* Repository file lock */
svn_boolean_t incomplete; /* TRUE if a working node is incomplete */
- const char *moved_to_abspath; /* Only on op-roots. See svn_wc_status3_t. */
+ struct svn_wc__db_moved_to_info_t *moved_to; /* A linked list of locations
+ where nodes at this path
+ are moved to. Highest layers
+ first */
svn_boolean_t moved_here; /* Only on op-roots. */
svn_boolean_t file_external;
@@ -1967,6 +1980,14 @@
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* Like svn_wc__db_read_children_info, but only gets an info node for the root
+ element. */
+svn_error_t *
+svn_wc__db_read_single_info(const struct svn_wc__db_info_t **info,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* Structure returned by svn_wc__db_read_walker_info. Only has the
fields needed by svn_wc__internal_walk_children(). */
@@ -2831,6 +2852,16 @@
@{
*/
+/* Installs or updates Sqlite schema statistics for the current (aka latest)
+ working copy schema.
+
+ This function should be called once on initializing the database and after
+ an schema update completes */
+svn_error_t *
+svn_wc__db_install_schema_statistics(svn_sqlite__db_t *sdb,
+ apr_pool_t *scratch_pool);
+
+
/* Create a new wc.db file for LOCAL_DIR_ABSPATH, which is going to be a
working copy for the repository REPOS_ROOT_URL with uuid REPOS_UUID.
Return the raw sqlite handle, repository id and working copy id
@@ -3382,7 +3413,14 @@
apr_pool_t *scratch_pool);
/* Like svn_wc__db_resolve_delete_raise_moved_away this should be
- combined. */
+ combined.
+
+ ### LOCAL_ABSPATH specifies the move origin, but the move origin
+ ### is not necessary unique enough. This function needs an op_root_abspath
+ ### argument to differentiate between different origins.
+
+ ### See move_tests.py: move_many_update_delete for an example case.
+ */
svn_error_t *
svn_wc__db_resolve_break_moved_away(svn_wc__db_t *db,
const char *local_abspath,
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc_db_private.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc_db_private.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -442,9 +442,12 @@
svn_wc__db_t *db,
apr_pool_t *scratch_pool);
+/* Unbreak the move from LOCAL_RELPATH on op-depth in WCROOT, by making
+ the destination a normal copy */
svn_error_t *
svn_wc__db_resolve_break_moved_away_internal(svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
+ int op_depth,
apr_pool_t *scratch_pool);
svn_error_t *
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2284,30 +2284,34 @@
svn_wc__db_t *db,
apr_pool_t *scratch_pool)
{
- const char *dummy1, *move_dst_op_root_relpath;
- const char *move_src_root_relpath, *move_src_op_root_relpath;
apr_hash_t *src_done;
SVN_ERR(svn_sqlite__exec_statements(wcroot->sdb,
STMT_CREATE_UPDATE_MOVE_LIST));
- SVN_ERR(svn_wc__db_op_depth_moved_to(&dummy1, &move_dst_op_root_relpath,
- &move_src_root_relpath,
- &move_src_op_root_relpath, 0,
- wcroot, local_relpath,
- scratch_pool, scratch_pool));
+ if (local_relpath[0] != '\0')
+ {
+ const char *dummy1, *move_dst_op_root_relpath;
+ const char *move_src_root_relpath, *move_src_op_root_relpath;
- if (move_src_root_relpath)
- {
- if (strcmp(move_src_root_relpath, local_relpath))
+ /* Is the root of the update moved away? (Impossible for the wcroot) */
+ SVN_ERR(svn_wc__db_op_depth_moved_to(&dummy1, &move_dst_op_root_relpath,
+ &move_src_root_relpath,
+ &move_src_op_root_relpath, 0,
+ wcroot, local_relpath,
+ scratch_pool, scratch_pool));
+
+ if (move_src_root_relpath)
{
- SVN_ERR(bump_mark_tree_conflict(wcroot, move_src_root_relpath,
- move_src_op_root_relpath,
- move_dst_op_root_relpath,
- db, scratch_pool));
- return SVN_NO_ERROR;
+ if (strcmp(move_src_root_relpath, local_relpath))
+ {
+ SVN_ERR(bump_mark_tree_conflict(wcroot, move_src_root_relpath,
+ move_src_op_root_relpath,
+ move_dst_op_root_relpath,
+ db, scratch_pool));
+ return SVN_NO_ERROR;
+ }
}
-
}
src_done = apr_hash_make(scratch_pool);
@@ -2440,17 +2444,23 @@
svn_error_t *
svn_wc__db_resolve_break_moved_away_internal(svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
+ int op_depth,
apr_pool_t *scratch_pool)
{
const char *dummy1, *move_dst_op_root_relpath;
const char *dummy2, *move_src_op_root_relpath;
+ /* We want to include the passed op-depth, but the function does a > check */
SVN_ERR(svn_wc__db_op_depth_moved_to(&dummy1, &move_dst_op_root_relpath,
&dummy2,
&move_src_op_root_relpath,
- relpath_depth(local_relpath) - 1,
+ op_depth - 1,
wcroot, local_relpath,
scratch_pool, scratch_pool));
+
+ SVN_ERR_ASSERT(move_src_op_root_relpath != NULL
+ && move_dst_op_root_relpath != NULL);
+
SVN_ERR(break_move(wcroot, local_relpath,
relpath_depth(move_src_op_root_relpath),
move_dst_op_root_relpath,
@@ -2519,6 +2529,7 @@
SVN_WC__DB_WITH_TXN(
svn_wc__db_resolve_break_moved_away_internal(wcroot, local_relpath,
+ relpath_depth(local_relpath),
scratch_pool),
wcroot);
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc_db_util.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc_db_util.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc_db_util.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -136,23 +136,7 @@
svn_dirent_local_style(sdb_abspath,
scratch_pool));
}
-#ifndef WIN32
- else
- {
- apr_file_t *f;
- /* A standard SQLite build creates a DB with mode 644 ^ !umask
- which means the file doesn't have group/world write access
- even when umask allows it. By ensuring the file exists before
- SQLite gets involved we give it the permissions allowed by
- umask. */
- SVN_ERR(svn_io_file_open(&f, sdb_abspath,
- (APR_READ | APR_WRITE | APR_CREATE),
- APR_OS_DEFAULT, scratch_pool));
- SVN_ERR(svn_io_file_close(f, scratch_pool));
- }
-#endif
-
SVN_ERR(svn_sqlite__open(sdb, sdb_abspath, smode,
my_statements ? my_statements : statements,
0, NULL, result_pool, scratch_pool));
Modified: trunk/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
===================================================================
--- trunk/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -690,8 +690,12 @@
svn_error_clear(err);
*wcroot = NULL;
}
- else
- SVN_ERR(err);
+ else if (err)
+ {
+ /* Close handle if we are not going to use it to support
+ upgrading with exclusive wc locking. */
+ return svn_error_compose_create(err, svn_sqlite__close(sdb));
+ }
}
else
{
Modified: trunk/contrib/subversion/subversion/mod_authz_svn/mod_authz_svn.c
===================================================================
--- trunk/contrib/subversion/subversion/mod_authz_svn/mod_authz_svn.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/mod_authz_svn/mod_authz_svn.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -91,7 +91,8 @@
/* canonicalize ACCESS_FILE based on the type of argument.
* If SERVER_RELATIVE is true, ACCESS_FILE is a relative
* path then ACCESS_FILE is converted to an absolute
- * path rooted at the server root. */
+ * path rooted at the server root.
+ * Returns NULL if path is not valid.*/
static const char *
canonicalize_access_file(const char *access_file,
svn_boolean_t server_relative,
@@ -104,7 +105,11 @@
else if (!svn_path_is_repos_relative_url(access_file))
{
if (server_relative)
- access_file = ap_server_root_relative(pool, access_file);
+ {
+ access_file = ap_server_root_relative(pool, access_file);
+ if (access_file == NULL)
+ return NULL;
+ }
access_file = svn_dirent_internal_style(access_file, pool);
}
@@ -126,6 +131,8 @@
"directives are mutually exclusive.";
conf->access_file = canonicalize_access_file(arg1, TRUE, cmd->pool);
+ if (!conf->access_file)
+ return apr_pstrcat(cmd->pool, "Invalid file path ", arg1, NULL);
return NULL;
}
@@ -145,6 +152,9 @@
conf->repo_relative_access_file = canonicalize_access_file(arg1, FALSE,
cmd->pool);
+ if (!conf->repo_relative_access_file)
+ return apr_pstrcat(cmd->pool, "Invalid file path ", arg1, NULL);
+
return NULL;
}
@@ -155,6 +165,9 @@
conf->groups_file = canonicalize_access_file(arg1, TRUE, cmd->pool);
+ if (!conf->groups_file)
+ return apr_pstrcat(cmd->pool, "Invalid file path ", arg1, NULL);
+
return NULL;
}
Modified: trunk/contrib/subversion/subversion/mod_dav_svn/dav_svn.h
===================================================================
--- trunk/contrib/subversion/subversion/mod_dav_svn/dav_svn.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/mod_dav_svn/dav_svn.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -52,8 +52,11 @@
/* a pool-key for the shared dav_svn_root used by autoversioning */
#define DAV_SVN__AUTOVERSIONING_ACTIVITY "svn-autoversioning-activity"
-/* Option values for SVNAllowBulkUpdates */
+/* Option values for SVNAllowBulkUpdates. Note that
+ it's important that CONF_BULKUPD_DEFAULT is 0 to make
+ dav_svn_merge_dir_config do the right thing. */
typedef enum dav_svn__bulk_upd_conf {
+ CONF_BULKUPD_DEFAULT,
CONF_BULKUPD_ON,
CONF_BULKUPD_OFF,
CONF_BULKUPD_PREFER
@@ -900,7 +903,13 @@
const char *uri,
apr_pool_t *pool);
+/* Test the request R to determine if we should return the list of
+ * repositories at the parent path. Only true if SVNListParentPath directive
+ * is 'on' and the request is for our configured root path. */
+svn_boolean_t
+dav_svn__is_parentpath_list(request_rec *r);
+
int dav_svn__find_ns(const apr_array_header_t *namespaces, const char *uri);
Modified: trunk/contrib/subversion/subversion/mod_dav_svn/lock.c
===================================================================
--- trunk/contrib/subversion/subversion/mod_dav_svn/lock.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/mod_dav_svn/lock.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -453,7 +453,8 @@
lock. For the --force case, this is required and for the non-force case,
we allow the filesystem to produce a better error for svn clients.
*/
- if (info->r->method_number == M_LOCK)
+ if (info->r->method_number == M_LOCK
+ && resource->info->repos->is_svn_client)
{
*locks = NULL;
return 0;
@@ -594,7 +595,8 @@
lock. For the --force case, this is required and for the non-force case,
we allow the filesystem to produce a better error for svn clients.
*/
- if (info->r->method_number == M_LOCK)
+ if (info->r->method_number == M_LOCK
+ && resource->info->repos->is_svn_client)
{
*locks_present = 0;
return 0;
Modified: trunk/contrib/subversion/subversion/mod_dav_svn/mod_dav_svn.c
===================================================================
--- trunk/contrib/subversion/subversion/mod_dav_svn/mod_dav_svn.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/mod_dav_svn/mod_dav_svn.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -214,7 +214,7 @@
<Location /blah> directive. So we treat it as a urlpath. */
if (dir)
conf->root_dir = svn_urlpath__canonicalize(dir, p);
- conf->bulk_updates = CONF_BULKUPD_ON;
+ conf->bulk_updates = CONF_BULKUPD_DEFAULT;
conf->v2_protocol = CONF_FLAG_ON;
conf->hooks_env = NULL;
@@ -812,7 +812,12 @@
dir_conf_t *conf;
conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
- return conf->bulk_updates;
+
+ /* SVNAllowBulkUpdates is 'on' by default. */
+ if (conf->bulk_updates == CONF_BULKUPD_DEFAULT)
+ return CONF_BULKUPD_ON;
+ else
+ return conf->bulk_updates;
}
@@ -1094,8 +1099,96 @@
return DECLINED;
}
+#define NO_MAP_TO_STORAGE_NOTE "dav_svn-no-map-to-storage"
+/* Fill the filename on the request with a bogus path since we aren't serving
+ * a file off the disk. This means that <Directory> blocks will not match and
+ * that %f in logging formats will show as "svn:/path/to/repo/path/in/repo". */
+static int dav_svn__translate_name(request_rec *r)
+{
+ const char *fs_path, *repos_basename, *repos_path, *slash;
+ const char *ignore_cleaned_uri, *ignore_relative_path;
+ int ignore_had_slash;
+ dir_conf_t *conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
+ /* module is not configured, bail out early */
+ if (!conf->fs_path && !conf->fs_parent_path)
+ return DECLINED;
+
+ if (dav_svn__is_parentpath_list(r))
+ {
+ /* SVNListParentPath is on and the request is for the conf->root_dir,
+ * so just set the repos_basename to an empty string and the repos_path
+ * to NULL so we end up just reporting our parent path as the bogus
+ * path. */
+ repos_basename = "";
+ repos_path = NULL;
+ }
+ else
+ {
+ /* Retrieve path to repo and within repo for the request */
+ dav_error *err = dav_svn_split_uri(r, r->uri, conf->root_dir,
+ &ignore_cleaned_uri,
+ &ignore_had_slash, &repos_basename,
+ &ignore_relative_path, &repos_path);
+ if (err)
+ {
+ dav_svn__log_err(r, err, APLOG_ERR);
+ return err->status;
+ }
+ }
+
+ if (conf->fs_parent_path)
+ {
+ fs_path = svn_dirent_join(conf->fs_parent_path, repos_basename,
+ r->pool);
+ }
+ else
+ {
+ fs_path = conf->fs_path;
+ }
+
+ /* Avoid a trailing slash on the bogus path when repos_path is just "/" and
+ * ensure that there is always a slash between fs_path and repos_path as
+ * long as the repos_path is not an empty path. */
+ slash = "";
+ if (repos_path)
+ {
+ if ('/' == repos_path[0] && '\0' == repos_path[1])
+ repos_path = NULL;
+ else if ('/' != repos_path[0] && '\0' != repos_path[0])
+ slash = "/";
+ }
+
+ /* Combine 'svn:', fs_path and repos_path to produce the bogus path we're
+ * placing in r->filename. We can't use our standard join helpers such
+ * as svn_dirent_join. fs_path is a dirent and repos_path is a fspath
+ * (that can be trivially converted to a relpath by skipping the leading
+ * slash). In general it is safe to join these, but when a path in a
+ * repository is 'trunk/c:hi' this results in a non canonical dirent on
+ * Windows. Instead we just cat them together. */
+ r->filename = apr_pstrcat(r->pool,
+ "svn:", fs_path, slash, repos_path, NULL);
+
+ /* Leave a note to ourselves so that we know not to decline in the
+ * map_to_storage hook. */
+ apr_table_setn(r->notes, NO_MAP_TO_STORAGE_NOTE, (const char*)1);
+ return OK;
+}
+
+/* Prevent core_map_to_storage from running if we prevented the r->filename
+ * from being set since core_map_to_storage doesn't like r->filename being
+ * bogus. */
+static int dav_svn__map_to_storage(request_rec *r)
+{
+ /* Check a note we left in translate_name since map_to_storage doesn't
+ * have access to our configuration. */
+ if (apr_table_get(r->notes, NO_MAP_TO_STORAGE_NOTE))
+ return OK;
+
+ return DECLINED;
+}
+
/** Module framework stuff **/
@@ -1268,6 +1361,12 @@
ap_register_input_filter("IncomingRewrite", dav_svn__location_in_filter,
NULL, AP_FTYPE_CONTENT_SET);
ap_hook_fixups(dav_svn__proxy_request_fixup, NULL, NULL, APR_HOOK_MIDDLE);
+ /* translate_name hook is LAST so that it doesn't interfere with modules
+ * like mod_alias that are MIDDLE. */
+ ap_hook_translate_name(dav_svn__translate_name, NULL, NULL, APR_HOOK_LAST);
+ /* map_to_storage hook is LAST to avoid interferring with mod_http's
+ * handling of OPTIONS and TRACE. */
+ ap_hook_map_to_storage(dav_svn__map_to_storage, NULL, NULL, APR_HOOK_LAST);
}
Modified: trunk/contrib/subversion/subversion/mod_dav_svn/reports/update.c
===================================================================
--- trunk/contrib/subversion/subversion/mod_dav_svn/reports/update.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/mod_dav_svn/reports/update.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -694,8 +694,8 @@
/* That said, beginning in Subversion 1.8, clients might
request even in skelta mode that we transmit properties
- on newly added files explicitly. */
- if ((! b->copyfrom) && value && b->uc->include_props)
+ on added files and directories explicitly. */
+ if (value && b->uc->include_props)
{
SVN_ERR(send_propchange(b, name, value, pool));
}
Modified: trunk/contrib/subversion/subversion/mod_dav_svn/repos.c
===================================================================
--- trunk/contrib/subversion/subversion/mod_dav_svn/repos.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/mod_dav_svn/repos.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1790,16 +1790,99 @@
"Could not get created rev of "
"resource", r->pool);
- if (comb->priv.version_name < created_rev)
+ if (SVN_IS_VALID_REVNUM(created_rev))
{
- serr = svn_error_createf(SVN_ERR_RA_OUT_OF_DATE, NULL,
- "Item '%s' is out of date",
- comb->priv.repos_path);
- return dav_svn__convert_err(serr, HTTP_CONFLICT,
- "Attempting to modify out-of-date resource.",
- r->pool);
+ if (comb->priv.version_name < created_rev)
+ {
+ serr = svn_error_createf(SVN_ERR_RA_OUT_OF_DATE, NULL,
+ comb->res.collection
+ ? "Directory '%s' is out of date"
+ : (comb->res.exists
+ ? "File '%s' is out of date"
+ : "'%s' is out of date"),
+ comb->priv.repos_path);
+ return dav_svn__convert_err(serr, HTTP_CONFLICT,
+ "Attempting to modify out-of-date resource.",
+ r->pool);
+ }
}
+ else if (SVN_IS_VALID_REVNUM(comb->priv.version_name)
+ && comb->res.collection)
+ {
+ /* Issue #4480: With HTTPv2 we can receive the first change for a
+ directory after it has been made mutable, because one of its
+ descendants was changed before changing the directory.
+ We have to check if whatever the node is in HEAD is equivalent
+ to what it was in the provided BASE revision.
+
+ If the node was copied, we would process it before its decendants
+ and we already performed quite a few checks when making it mutable
+ via its descendant, so what we should really check here is if the
+ properties changed since the BASE version.
+
+ ### I think svn_fs_node_relation() checks for more changes than we
+ should check for here. Needs further review. But it looks like\
+ this check matches the checks in the libsvn_fs commit editor.
+
+ For now I would say reporting out of date in a few too many
+ cases is safer than not reporting out of date when we should.
+ */
+ svn_revnum_t txn_base_rev;
+ svn_fs_root_t *txn_base_root;
+ svn_fs_root_t *rev_root;
+ const svn_fs_id_t *txn_base_id;
+ const svn_fs_id_t *rev_id;
+
+ txn_base_rev = svn_fs_txn_base_revision(comb->res.info->root.txn);
+
+ if (comb->priv.version_name == txn_base_rev)
+ return NULL; /* Easy out: Nothing changed */
+
+ serr = svn_fs_revision_root(&txn_base_root, comb->res.info->repos->fs,
+ txn_base_rev, r->pool);
+
+ if (!serr)
+ serr = svn_fs_node_id(&txn_base_id, txn_base_root,
+ comb->priv.repos_path, r->pool);
+
+ if (serr != NULL)
+ {
+ return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
+ "Could not open youngest revision root "
+ "for verification against the base "
+ "revision", r->pool);
+ }
+
+ serr = svn_fs_revision_root(&rev_root, comb->res.info->repos->fs,
+ comb->priv.version_name, r->pool);
+
+ if (!serr)
+ serr = svn_fs_node_id(&rev_id, rev_root,
+ comb->priv.repos_path, r->pool);
+
+ if (serr != NULL)
+ {
+ return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
+ "Could not open the base revision"
+ "for verification against the youngest "
+ "revision", r->pool);
+ }
+
+ svn_fs_close_root(rev_root);
+ svn_fs_close_root(txn_base_root);
+
+ if (0 != svn_fs_compare_ids(txn_base_id, rev_id))
+ {
+ serr = svn_error_createf(SVN_ERR_RA_OUT_OF_DATE, NULL,
+ "Directory '%s' is out of date",
+ comb->priv.repos_path);
+ return dav_svn__convert_err(serr, HTTP_CONFLICT,
+ "Attempting to modify out-of-date resource.",
+ r->pool);
+ }
+ }
+
return NULL;
}
@@ -1969,26 +2052,31 @@
/* Special case: detect and build the SVNParentPath as a unique type
of private resource, iff the SVNListParentPath directive is 'on'. */
- if (fs_parent_path && dav_svn__get_list_parentpath_flag(r))
+ if (dav_svn__is_parentpath_list(r))
{
- char *uri = apr_pstrdup(r->pool, r->uri);
- char *parentpath = apr_pstrdup(r->pool, root_path);
- apr_size_t uri_len = strlen(uri);
- apr_size_t parentpath_len = strlen(parentpath);
+ /* Only allow GET and HEAD on the parentpath resource
+ * httpd uses the same method_number for HEAD as GET */
+ if (r->method_number != M_GET)
+ {
+ int status;
- if (uri[uri_len-1] == '/')
- uri[uri_len-1] = '\0';
+ /* Marshall the error back to the client by generating by
+ * way of the dav_svn__error_response_tag trick. */
+ err = dav_svn__new_error(r->pool, HTTP_METHOD_NOT_ALLOWED,
+ SVN_ERR_APMOD_MALFORMED_URI,
+ "The URI does not contain the name "
+ "of a repository.");
+ /* can't use r->allowed since the default handler isn't called */
+ apr_table_setn(r->headers_out, "Allow", "GET,HEAD");
+ status = dav_svn__error_response_tag(r, err);
- if (parentpath[parentpath_len-1] == '/')
- parentpath[parentpath_len-1] = '\0';
+ return dav_push_error(r->pool, status, err->error_id, NULL, err);
+ }
- if (strcmp(parentpath, uri) == 0)
- {
- err = get_parentpath_resource(r, resource);
- if (err)
- return err;
- return NULL;
- }
+ err = get_parentpath_resource(r, resource);
+ if (err)
+ return err;
+ return NULL;
}
/* This does all the work of interpreting/splitting the request uri. */
@@ -2455,9 +2543,12 @@
parent->info = parentinfo;
parentinfo->uri_path =
- svn_stringbuf_create(get_parent_path(resource->info->uri_path->data,
- TRUE, resource->pool),
- resource->pool);
+ svn_stringbuf_create(
+ get_parent_path(
+ svn_urlpath__canonicalize(resource->info->uri_path->data,
+ resource->pool),
+ TRUE, resource->pool),
+ resource->pool);
parentinfo->repos = resource->info->repos;
parentinfo->root = resource->info->root;
parentinfo->r = resource->info->r;
Modified: trunk/contrib/subversion/subversion/mod_dav_svn/util.c
===================================================================
--- trunk/contrib/subversion/subversion/mod_dav_svn/util.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/mod_dav_svn/util.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -425,7 +425,33 @@
"Unsupported URI form");
}
+svn_boolean_t
+dav_svn__is_parentpath_list(request_rec *r)
+{
+ const char *fs_parent_path = dav_svn__get_fs_parent_path(r);
+ if (fs_parent_path && dav_svn__get_list_parentpath_flag(r))
+ {
+ const char *root_path = dav_svn__get_root_dir(r);
+ char *uri = apr_pstrdup(r->pool, r->uri);
+ char *parentpath = apr_pstrdup(r->pool, root_path);
+ apr_size_t uri_len = strlen(uri);
+ apr_size_t parentpath_len = strlen(parentpath);
+
+ if (uri[uri_len-1] == '/')
+ uri[uri_len-1] = '\0';
+
+ if (parentpath[parentpath_len-1] == '/')
+ parentpath[parentpath_len-1] = '\0';
+
+ if (strcmp(parentpath, uri) == 0)
+ {
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
/* ### move this into apr_xml */
int
dav_svn__find_ns(const apr_array_header_t *namespaces, const char *uri)
Copied: trunk/contrib/subversion/subversion/po/subversion.pot (from rev 9265, vendor/apache/subversion/dist/subversion/po/subversion.pot)
===================================================================
--- trunk/contrib/subversion/subversion/po/subversion.pot (rev 0)
+++ trunk/contrib/subversion/subversion/po/subversion.pot 2017-02-20 02:39:09 UTC (rev 9266)
@@ -0,0 +1,14010 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: dev at subversion.apache.org\n"
+"POT-Creation-Date: 2014-08-01 23:16+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#. Constructing nice error messages for roots.
+#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
+#. for PATH in ROOT. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:81
+#, c-format
+msgid "File not found: transaction '%s', path '%s'"
+msgstr ""
+
+#: ../include/private/svn_fs_util.h:86
+#, c-format
+msgid "File not found: revision %ld, path '%s'"
+msgstr ""
+
+#. Build a detailed `file already exists' message for PATH in ROOT.
+#. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:97
+#, c-format
+msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
+msgstr ""
+
+#: ../include/private/svn_fs_util.h:102
+#, c-format
+msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
+msgstr ""
+
+#. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:110
+msgid "Root object must be a transaction root"
+msgstr ""
+
+#. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node
+#. outside of a transaction. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:117
+#, c-format
+msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
+msgstr ""
+
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:124
+#, c-format
+msgid "'%s' is not a directory in filesystem '%s'"
+msgstr ""
+
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:131
+#, c-format
+msgid "'%s' is not a file in filesystem '%s'"
+msgstr ""
+
+#. FS is of type "svn_fs_t *", LOCK is of type "svn_lock_t *".
+#: ../include/private/svn_fs_util.h:139
+#, c-format
+msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
+msgstr ""
+
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:146
+#, c-format
+msgid "No lock on path '%s' in filesystem '%s'"
+msgstr ""
+
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:153
+#, c-format
+msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
+msgstr ""
+
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:160
+#, c-format
+msgid "No username is currently associated with filesystem '%s'"
+msgstr ""
+
+#. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
+#. LOCK_OWNER doesn't match the USERNAME associated with FS.
+#. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:169
+#, c-format
+msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../include/svn_error_codes.h:164
+msgid "Bad parent pool passed to svn_make_pool()"
+msgstr ""
+
+#: ../include/svn_error_codes.h:168
+msgid "Bogus filename"
+msgstr ""
+
+#: ../include/svn_error_codes.h:172
+msgid "Bogus URL"
+msgstr ""
+
+#: ../include/svn_error_codes.h:176
+msgid "Bogus date"
+msgstr ""
+
+#: ../include/svn_error_codes.h:180
+msgid "Bogus mime-type"
+msgstr ""
+
+#: ../include/svn_error_codes.h:190
+msgid "Wrong or unexpected property value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:194
+msgid "Version file format not correct"
+msgstr ""
+
+#: ../include/svn_error_codes.h:198
+msgid "Path is not an immediate child of the specified directory"
+msgstr ""
+
+#: ../include/svn_error_codes.h:202
+msgid "Bogus UUID"
+msgstr ""
+
+#: ../include/svn_error_codes.h:207 ../include/svn_error_codes.h:944
+msgid "Invalid configuration value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:211
+msgid "Bogus server specification"
+msgstr ""
+
+#: ../include/svn_error_codes.h:215
+msgid "Unsupported checksum type"
+msgstr ""
+
+#: ../include/svn_error_codes.h:219
+msgid "Invalid character in hex checksum"
+msgstr ""
+
+#: ../include/svn_error_codes.h:224
+msgid "Unknown string value of token"
+msgstr ""
+
+#: ../include/svn_error_codes.h:229
+msgid "Invalid changelist name"
+msgstr ""
+
+#: ../include/svn_error_codes.h:234
+msgid "Invalid atomic"
+msgstr ""
+
+#: ../include/svn_error_codes.h:240
+msgid "No such XML tag attribute"
+msgstr ""
+
+#: ../include/svn_error_codes.h:244
+msgid "<delta-pkg> is missing ancestry"
+msgstr ""
+
+#: ../include/svn_error_codes.h:248
+msgid "Unrecognized binary data encoding; can't decode"
+msgstr ""
+
+#: ../include/svn_error_codes.h:252
+msgid "XML data was not well-formed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:256
+msgid "Data cannot be safely XML-escaped"
+msgstr ""
+
+#: ../include/svn_error_codes.h:262
+msgid "Inconsistent line ending style"
+msgstr ""
+
+#: ../include/svn_error_codes.h:266
+msgid "Unrecognized line ending style"
+msgstr ""
+
+#: ../include/svn_error_codes.h:271
+msgid "Line endings other than expected"
+msgstr ""
+
+#: ../include/svn_error_codes.h:275
+msgid "Ran out of unique names"
+msgstr ""
+
+#: ../include/svn_error_codes.h:280
+msgid "Framing error in pipe protocol"
+msgstr ""
+
+#: ../include/svn_error_codes.h:285
+msgid "Read error in pipe"
+msgstr ""
+
+#: ../include/svn_error_codes.h:289 ../libsvn_subr/cmdline.c:362
+#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:569 ../svnlook/svnlook.c:2009
+#, c-format
+msgid "Write error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:294
+msgid "Write error in pipe"
+msgstr ""
+
+#: ../include/svn_error_codes.h:300
+msgid "Unexpected EOF on stream"
+msgstr ""
+
+#: ../include/svn_error_codes.h:304
+msgid "Malformed stream data"
+msgstr ""
+
+#: ../include/svn_error_codes.h:308
+msgid "Unrecognized stream data"
+msgstr ""
+
+#: ../include/svn_error_codes.h:313
+msgid "Stream doesn't support seeking"
+msgstr ""
+
+#: ../include/svn_error_codes.h:319
+msgid "Unknown svn_node_kind"
+msgstr ""
+
+#: ../include/svn_error_codes.h:323
+msgid "Unexpected node kind found"
+msgstr ""
+
+#: ../include/svn_error_codes.h:329
+msgid "Can't find an entry"
+msgstr ""
+
+#: ../include/svn_error_codes.h:335
+msgid "Entry already exists"
+msgstr ""
+
+#: ../include/svn_error_codes.h:339
+msgid "Entry has no revision"
+msgstr ""
+
+#: ../include/svn_error_codes.h:343
+msgid "Entry has no URL"
+msgstr ""
+
+#: ../include/svn_error_codes.h:347
+msgid "Entry has an invalid attribute"
+msgstr ""
+
+#: ../include/svn_error_codes.h:351
+msgid "Can't create an entry for a forbidden name"
+msgstr ""
+
+#: ../include/svn_error_codes.h:357
+msgid "Obstructed update"
+msgstr ""
+
+#: ../include/svn_error_codes.h:362
+msgid "Mismatch popping the WC unwind stack"
+msgstr ""
+
+#: ../include/svn_error_codes.h:367
+msgid "Attempt to pop empty WC unwind stack"
+msgstr ""
+
+#: ../include/svn_error_codes.h:372
+msgid "Attempt to unlock with non-empty unwind stack"
+msgstr ""
+
+#: ../include/svn_error_codes.h:376
+msgid "Attempted to lock an already-locked dir"
+msgstr ""
+
+#: ../include/svn_error_codes.h:380
+msgid "Working copy not locked; this is probably a bug, please report"
+msgstr ""
+
+#: ../include/svn_error_codes.h:385
+msgid "Invalid lock"
+msgstr ""
+
+#: ../include/svn_error_codes.h:391 ../include/svn_error_codes.h:397
+msgid "Path is not a working copy directory"
+msgstr ""
+
+#: ../include/svn_error_codes.h:401
+msgid "Path is not a working copy file"
+msgstr ""
+
+#: ../include/svn_error_codes.h:405
+msgid "Problem running log"
+msgstr ""
+
+#: ../include/svn_error_codes.h:409
+msgid "Can't find a working copy path"
+msgstr ""
+
+#: ../include/svn_error_codes.h:413
+msgid "Working copy is not up-to-date"
+msgstr ""
+
+#: ../include/svn_error_codes.h:417
+msgid "Left locally modified or unversioned files"
+msgstr ""
+
+#: ../include/svn_error_codes.h:421
+msgid "Unmergeable scheduling requested on an entry"
+msgstr ""
+
+#: ../include/svn_error_codes.h:425
+msgid "Found a working copy path"
+msgstr ""
+
+#: ../include/svn_error_codes.h:429
+msgid "A conflict in the working copy obstructs the current operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:433
+msgid "Working copy is corrupt"
+msgstr ""
+
+#: ../include/svn_error_codes.h:437
+msgid "Working copy text base is corrupt"
+msgstr ""
+
+#: ../include/svn_error_codes.h:441
+msgid "Cannot change node kind"
+msgstr ""
+
+#: ../include/svn_error_codes.h:445
+msgid "Invalid operation on the current working directory"
+msgstr ""
+
+#: ../include/svn_error_codes.h:449
+msgid "Problem on first log entry in a working copy"
+msgstr ""
+
+#: ../include/svn_error_codes.h:453
+msgid "Unsupported working copy format"
+msgstr ""
+
+#: ../include/svn_error_codes.h:457
+msgid "Path syntax not supported in this context"
+msgstr ""
+
+#: ../include/svn_error_codes.h:462
+msgid "Invalid schedule"
+msgstr ""
+
+#: ../include/svn_error_codes.h:467
+msgid "Invalid relocation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:472
+msgid "Invalid switch"
+msgstr ""
+
+#: ../include/svn_error_codes.h:477
+msgid "Changelist doesn't match"
+msgstr ""
+
+#: ../include/svn_error_codes.h:482
+msgid "Conflict resolution failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:486
+msgid "Failed to locate 'copyfrom' path in working copy"
+msgstr ""
+
+#: ../include/svn_error_codes.h:494
+msgid "Moving a path from one changelist to another"
+msgstr ""
+
+#: ../include/svn_error_codes.h:499
+msgid "Cannot delete a file external"
+msgstr ""
+
+#: ../include/svn_error_codes.h:504
+msgid "Cannot move a file external"
+msgstr ""
+
+#: ../include/svn_error_codes.h:509
+msgid "Something's amiss with the wc sqlite database"
+msgstr ""
+
+#: ../include/svn_error_codes.h:514
+msgid "The working copy is missing"
+msgstr ""
+
+#: ../include/svn_error_codes.h:519
+msgid "The specified node is not a symlink"
+msgstr ""
+
+#: ../include/svn_error_codes.h:524
+msgid "The specified path has an unexpected status"
+msgstr ""
+
+#: ../include/svn_error_codes.h:529
+msgid "The working copy needs to be upgraded"
+msgstr ""
+
+#: ../include/svn_error_codes.h:534
+msgid ""
+"Previous operation has not finished; run 'cleanup' if it was interrupted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:540
+msgid "The operation cannot be performed with the specified depth"
+msgstr ""
+
+#: ../include/svn_error_codes.h:545
+msgid "Couldn't open a working copy file because access was denied"
+msgstr ""
+
+#: ../include/svn_error_codes.h:550
+msgid "Mixed-revision working copy was found but not expected"
+msgstr ""
+
+#: ../include/svn_error_codes.h:555
+msgid "Duplicate targets in svn:externals property"
+msgstr ""
+
+#: ../include/svn_error_codes.h:561
+msgid "General filesystem error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:565
+msgid "Error closing filesystem"
+msgstr ""
+
+#: ../include/svn_error_codes.h:569
+msgid "Filesystem is already open"
+msgstr ""
+
+#: ../include/svn_error_codes.h:573
+msgid "Filesystem is not open"
+msgstr ""
+
+#: ../include/svn_error_codes.h:577
+msgid "Filesystem is corrupt"
+msgstr ""
+
+#: ../include/svn_error_codes.h:581
+msgid "Invalid filesystem path syntax"
+msgstr ""
+
+#: ../include/svn_error_codes.h:585
+msgid "Invalid filesystem revision number"
+msgstr ""
+
+#: ../include/svn_error_codes.h:589
+msgid "Invalid filesystem transaction name"
+msgstr ""
+
+#: ../include/svn_error_codes.h:593
+msgid "Filesystem directory has no such entry"
+msgstr ""
+
+#: ../include/svn_error_codes.h:597
+msgid "Filesystem has no such representation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:601
+msgid "Filesystem has no such string"
+msgstr ""
+
+#: ../include/svn_error_codes.h:605
+msgid "Filesystem has no such copy"
+msgstr ""
+
+#: ../include/svn_error_codes.h:609
+msgid "The specified transaction is not mutable"
+msgstr ""
+
+#: ../include/svn_error_codes.h:613
+msgid "Filesystem has no item"
+msgstr ""
+
+#: ../include/svn_error_codes.h:617
+msgid "Filesystem has no such node-rev-id"
+msgstr ""
+
+#: ../include/svn_error_codes.h:621
+msgid "String does not represent a node or node-rev-id"
+msgstr ""
+
+#: ../include/svn_error_codes.h:625
+msgid "Name does not refer to a filesystem directory"
+msgstr ""
+
+#: ../include/svn_error_codes.h:629
+msgid "Name does not refer to a filesystem file"
+msgstr ""
+
+#: ../include/svn_error_codes.h:633
+msgid "Name is not a single path component"
+msgstr ""
+
+#: ../include/svn_error_codes.h:637
+msgid "Attempt to change immutable filesystem node"
+msgstr ""
+
+#: ../include/svn_error_codes.h:641
+msgid "Item already exists in filesystem"
+msgstr ""
+
+#: ../include/svn_error_codes.h:645
+msgid "Attempt to remove or recreate fs root dir"
+msgstr ""
+
+#: ../include/svn_error_codes.h:649
+msgid "Object is not a transaction root"
+msgstr ""
+
+#: ../include/svn_error_codes.h:653
+msgid "Object is not a revision root"
+msgstr ""
+
+#: ../include/svn_error_codes.h:657
+msgid "Merge conflict during commit"
+msgstr ""
+
+#: ../include/svn_error_codes.h:661
+msgid "A representation vanished or changed between reads"
+msgstr ""
+
+#: ../include/svn_error_codes.h:665
+msgid "Tried to change an immutable representation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:669
+msgid "Malformed skeleton data"
+msgstr ""
+
+#: ../include/svn_error_codes.h:673
+msgid "Transaction is out of date"
+msgstr ""
+
+#: ../include/svn_error_codes.h:677
+msgid "Berkeley DB error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:681
+msgid "Berkeley DB deadlock error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:685
+msgid "Transaction is dead"
+msgstr ""
+
+#: ../include/svn_error_codes.h:689
+msgid "Transaction is not dead"
+msgstr ""
+
+#: ../include/svn_error_codes.h:694
+msgid "Unknown FS type"
+msgstr ""
+
+#: ../include/svn_error_codes.h:699
+msgid "No user associated with filesystem"
+msgstr ""
+
+#: ../include/svn_error_codes.h:704
+msgid "Path is already locked"
+msgstr ""
+
+#: ../include/svn_error_codes.h:709 ../include/svn_error_codes.h:886
+msgid "Path is not locked"
+msgstr ""
+
+#: ../include/svn_error_codes.h:714
+msgid "Lock token is incorrect"
+msgstr ""
+
+#: ../include/svn_error_codes.h:719
+msgid "No lock token provided"
+msgstr ""
+
+#: ../include/svn_error_codes.h:724
+msgid "Username does not match lock owner"
+msgstr ""
+
+#: ../include/svn_error_codes.h:729
+msgid "Filesystem has no such lock"
+msgstr ""
+
+#: ../include/svn_error_codes.h:734
+msgid "Lock has expired"
+msgstr ""
+
+#: ../include/svn_error_codes.h:739 ../include/svn_error_codes.h:873
+msgid "Item is out of date"
+msgstr ""
+
+#: ../include/svn_error_codes.h:751
+msgid "Unsupported FS format"
+msgstr ""
+
+#: ../include/svn_error_codes.h:756
+msgid "Representation is being written"
+msgstr ""
+
+#: ../include/svn_error_codes.h:761
+msgid "The generated transaction name is too long"
+msgstr ""
+
+#: ../include/svn_error_codes.h:766
+msgid "Filesystem has no such node origin record"
+msgstr ""
+
+#: ../include/svn_error_codes.h:771
+msgid "Filesystem upgrade is not supported"
+msgstr ""
+
+#: ../include/svn_error_codes.h:776
+msgid "Filesystem has no such checksum-representation index record"
+msgstr ""
+
+#: ../include/svn_error_codes.h:781
+msgid "Property value in filesystem differs from the provided base value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:787
+msgid "The filesystem editor completion process was not followed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:792
+msgid "A packed revprop could not be read"
+msgstr ""
+
+#: ../include/svn_error_codes.h:797
+msgid "Could not initialize the revprop caching infrastructure."
+msgstr ""
+
+#: ../include/svn_error_codes.h:803
+msgid "The repository is locked, perhaps for db recovery"
+msgstr ""
+
+#: ../include/svn_error_codes.h:807
+msgid "A repository hook failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:811
+msgid "Incorrect arguments supplied"
+msgstr ""
+
+#: ../include/svn_error_codes.h:815
+msgid "A report cannot be generated because no data was supplied"
+msgstr ""
+
+#: ../include/svn_error_codes.h:819
+msgid "Bogus revision report"
+msgstr ""
+
+#: ../include/svn_error_codes.h:828
+msgid "Unsupported repository version"
+msgstr ""
+
+#: ../include/svn_error_codes.h:832
+msgid "Disabled repository feature"
+msgstr ""
+
+#: ../include/svn_error_codes.h:836
+msgid "Error running post-commit hook"
+msgstr ""
+
+#: ../include/svn_error_codes.h:841
+msgid "Error running post-lock hook"
+msgstr ""
+
+#: ../include/svn_error_codes.h:846
+msgid "Error running post-unlock hook"
+msgstr ""
+
+#: ../include/svn_error_codes.h:851
+msgid "Repository upgrade is not supported"
+msgstr ""
+
+#: ../include/svn_error_codes.h:857
+msgid "Bad URL passed to RA layer"
+msgstr ""
+
+#: ../include/svn_error_codes.h:861
+msgid "Authorization failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:865
+msgid "Unknown authorization method"
+msgstr ""
+
+#: ../include/svn_error_codes.h:869
+msgid "Repository access method not implemented"
+msgstr ""
+
+#: ../include/svn_error_codes.h:877
+msgid "Repository has no UUID"
+msgstr ""
+
+#: ../include/svn_error_codes.h:881
+msgid "Unsupported RA plugin ABI version"
+msgstr ""
+
+#: ../include/svn_error_codes.h:891
+msgid "Server can only replay from the root of a repository"
+msgstr ""
+
+#: ../include/svn_error_codes.h:896
+msgid "Repository UUID does not match expected UUID"
+msgstr ""
+
+#: ../include/svn_error_codes.h:901
+msgid "Repository root URL does not match expected root URL"
+msgstr ""
+
+#: ../include/svn_error_codes.h:906
+msgid "Session URL does not match expected session URL"
+msgstr ""
+
+#: ../include/svn_error_codes.h:911 ../libsvn_ra_svn/client.c:492
+#, c-format
+msgid "Can't create tunnel"
+msgstr ""
+
+#: ../include/svn_error_codes.h:917
+msgid "RA layer failed to init socket layer"
+msgstr ""
+
+#: ../include/svn_error_codes.h:921
+msgid "RA layer failed to create HTTP request"
+msgstr ""
+
+#: ../include/svn_error_codes.h:925
+msgid "RA layer request failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:929
+msgid "RA layer didn't receive requested OPTIONS info"
+msgstr ""
+
+#: ../include/svn_error_codes.h:933
+msgid "RA layer failed to fetch properties"
+msgstr ""
+
+#: ../include/svn_error_codes.h:937
+msgid "RA layer file already exists"
+msgstr ""
+
+#: ../include/svn_error_codes.h:951
+msgid "HTTP Path Not Found"
+msgstr ""
+
+#: ../include/svn_error_codes.h:955
+msgid "Failed to execute WebDAV PROPPATCH"
+msgstr ""
+
+#: ../include/svn_error_codes.h:960 ../include/svn_error_codes.h:1403
+#: ../libsvn_ra_svn/marshal.c:1075 ../libsvn_ra_svn/marshal.c:1285
+#: ../libsvn_ra_svn/marshal.c:1315
+msgid "Malformed network data"
+msgstr ""
+
+#: ../include/svn_error_codes.h:965
+msgid "Unable to extract data from response header"
+msgstr ""
+
+#: ../include/svn_error_codes.h:970
+msgid "Repository has been moved"
+msgstr ""
+
+#: ../include/svn_error_codes.h:975 ../libsvn_ra_serf/update.c:2863
+#: ../libsvn_ra_serf/util.c:944
+msgid "Connection timed out"
+msgstr ""
+
+#: ../include/svn_error_codes.h:980
+msgid "URL access forbidden for unknown reason"
+msgstr ""
+
+#: ../include/svn_error_codes.h:986 ../include/svn_error_codes.h:1407
+msgid "Couldn't find a repository"
+msgstr ""
+
+#: ../include/svn_error_codes.h:990
+msgid "Couldn't open a repository"
+msgstr ""
+
+#: ../include/svn_error_codes.h:996
+msgid "Svndiff data has invalid header"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1000
+msgid "Svndiff data contains corrupt window"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1004
+msgid "Svndiff data contains backward-sliding source view"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1008
+msgid "Svndiff data contains invalid instruction"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1012
+msgid "Svndiff data ends unexpectedly"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1016
+msgid "Svndiff compressed data is invalid"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1022
+msgid "Apache has no path to an SVN filesystem"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1026
+msgid "Apache got a malformed URI"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1030
+msgid "Activity not found"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1034
+msgid "Baseline incorrect"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1038
+msgid "Input/output error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1044
+msgid "A path under version control is needed for this operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1048
+msgid "Repository access is needed for this operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1052
+msgid "Bogus revision information given"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1056
+msgid "Attempting to commit to a URL more than once"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1060
+msgid "Operation does not apply to binary file"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1066
+msgid "Format of an svn:externals property was invalid"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1070
+msgid "Attempting restricted operation for modified resource"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1074
+msgid "Operation does not apply to directory"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1078
+msgid "Revision range is not allowed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1082
+msgid "Inter-repository relocation not allowed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1086
+msgid "Author name cannot contain a newline"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1090
+msgid "Bad property name"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1095
+msgid "Two versioned resources are unrelated"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1100
+msgid "Path has no lock token"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1105
+msgid "Operation does not support multiple sources"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1110
+msgid "No versioned parent directories"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1115 ../include/svn_error_codes.h:1135
+msgid "Working copy and merge source not ready for reintegration"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1120
+msgid "A file external cannot overwrite an existing versioned item"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1125
+msgid "Invalid path component strip count specified"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1130
+msgid "Detected a cycle while processing the operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1140
+msgid "Invalid mergeinfo detected in merge target"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1145
+msgid "Can't perform this operation without a valid lock token"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1150
+msgid "The operation is forbidden by the server"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1156
+msgid "A problem occurred; see other errors for details"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1160
+msgid "Failure loading plugin"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1164
+msgid "Malformed file"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1168
+msgid "Incomplete data"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1172
+msgid "Incorrect parameters given"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1176
+msgid "Tried a versioning operation on an unversioned resource"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1180
+msgid "Test failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1184
+msgid "Trying to use an unsupported feature"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1188
+msgid "Unexpected or unknown property kind"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1192
+msgid "Illegal target for the requested operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1196
+msgid "MD5 checksum is missing"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1200
+msgid "Directory needs to be empty but is not"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1204
+msgid "Error calling external program"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1208
+msgid "Python exception has been set with the error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1212
+msgid "A checksum mismatch occurred"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1216
+msgid "The operation was interrupted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1220
+msgid "The specified diff option is not supported"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1224
+msgid "Property not found"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1228
+msgid "No auth file path available"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1233
+msgid "Incompatible library version"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1238
+msgid "Mergeinfo parse error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1243
+msgid "Cease invocation of this API"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1248
+msgid "Error parsing revision number"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1253
+msgid "Iteration terminated before completion"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1258
+msgid "Unknown changelist"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1263
+msgid "Reserved directory name in command line arguments"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1268
+msgid "Inquiry about unknown capability"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1273
+msgid "Test skipped"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1278
+msgid "APR memcache library not available"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1283
+msgid "Couldn't perform atomic initialization"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1288
+msgid "SQLite error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1293
+msgid "Attempted to write to readonly SQLite db"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1300
+msgid "Unsupported schema found in SQLite db"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1305
+msgid "The SQLite db is busy"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1310
+msgid ""
+"SQLite busy at transaction rollback; resetting all busy SQLite statements to "
+"allow rollback"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1316
+msgid "Constraint error in SQLite db"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1321
+msgid "Too many memcached servers configured"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1326
+msgid "Failed to parse version number string"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1331
+msgid "Atomic data storage is corrupt"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1337
+msgid "Error parsing arguments"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1341
+msgid "Not enough arguments provided"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1345
+msgid "Mutually exclusive arguments specified"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1349
+msgid "Attempted command in administrative dir"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1353
+msgid "The log message file is under version control"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1357
+msgid "The log message is a pathname"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1361
+msgid "Committing in directory scheduled for addition"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1365
+msgid "No external editor available"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1369
+msgid "Something is wrong with the log message's contents"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1373
+msgid "A log message was given where none was necessary"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1377
+msgid "No external merge tool available"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1381
+msgid "Failed processing one or more externals definitions"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1387
+msgid "Special code for wrapping server errors to report to client"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1391
+msgid "Unknown svn protocol command"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1395
+msgid "Network connection closed unexpectedly"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1399
+msgid "Network read/write error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1411
+msgid "Client/server version mismatch"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1416
+msgid "Cannot negotiate authentication mechanism"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1421
+msgid "Editor drive was aborted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1429
+msgid "Credential data unavailable"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1433
+msgid "No authentication provider available"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1437
+msgid "All authentication providers exhausted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1441
+msgid "Credentials not saved"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1446
+msgid "Authentication failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1452
+msgid "Read access denied for root of edit"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1457
+msgid "Item is not readable"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1462
+msgid "Item is partially readable"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1466
+msgid "Invalid authz configuration"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1471
+msgid "Item is not writable"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1478
+msgid "Diff data source modified unexpectedly"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1484
+msgid "Initialization of SSPI library failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1488
+msgid "Server SSL certificate untrusted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1493
+msgid "Initialization of the GSSAPI context failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1498
+msgid "While handling serf response:"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1504
+msgid "Assertion failure"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1508
+msgid "No non-tracing links found in the error chain"
+msgstr ""
+
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:274
+msgid "GNOME Keyring is locked and we are non-interactive"
+msgstr ""
+
+#: ../libsvn_client/add.c:606 ../libsvn_client/cmdline.c:356
+#: ../libsvn_subr/opt.c:932
+#, c-format
+msgid "'%s' ends in a reserved name"
+msgstr ""
+
+#: ../libsvn_client/add.c:875
+#, c-format
+msgid "'%s' prevents creating parent of '%s'"
+msgstr ""
+
+#: ../libsvn_client/add.c:914 ../libsvn_wc/adm_ops.c:732
+#, c-format
+msgid ""
+"'%s' is an existing item in conflict; please mark the conflict as resolved "
+"before adding a new item here"
+msgstr ""
+
+#: ../libsvn_client/add.c:921 ../libsvn_wc/adm_ops.c:687
+#: ../libsvn_wc/workqueue.c:905 ../libsvn_wc/workqueue.c:999
+#, c-format
+msgid "'%s' not found"
+msgstr ""
+
+#: ../libsvn_client/add.c:927 ../libsvn_wc/adm_ops.c:692
+#: ../libsvn_wc/delete.c:98
+#, c-format
+msgid "Unsupported node kind for path '%s'"
+msgstr ""
+
+#: ../libsvn_client/add.c:960 ../libsvn_client/changelist.c:65
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:55
+#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:815
+#: ../libsvn_client/patch.c:3009 ../libsvn_client/relocate.c:232
+#: ../libsvn_client/resolved.c:121 ../libsvn_client/revert.c:136
+#: ../libsvn_client/status.c:353 ../libsvn_client/switch.c:473
+#: ../libsvn_client/update.c:646 ../libsvn_client/upgrade.c:105
+#: ../svn/util.c:984
+#, c-format
+msgid "'%s' is not a local path"
+msgstr ""
+
+#: ../libsvn_client/add.c:1001 ../libsvn_client/copy_foreign.c:489
+#: ../libsvn_wc/adm_ops.c:766 ../libsvn_wc/copy.c:715
+#, c-format
+msgid "'%s' is already under version control"
+msgstr ""
+
+#: ../libsvn_client/add.c:1134 ../libsvn_client/add.c:1161
+#, c-format
+msgid "There is no valid URI above '%s'"
+msgstr ""
+
+#: ../libsvn_client/blame.c:605
+msgid "Start revision must precede end revision"
+msgstr ""
+
+#: ../libsvn_client/blame.c:633
+#, c-format
+msgid "Cannot calculate blame information for binary file '%s'"
+msgstr ""
+
+#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:610
+#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:833
+#: ../libsvn_client/prop_commands.c:1423 ../libsvn_client/revisions.c:104
+#: ../libsvn_wc/adm_ops.c:1197 ../libsvn_wc/adm_ops.c:1247
+#: ../libsvn_wc/copy.c:563 ../libsvn_wc/copy.c:624 ../libsvn_wc/entries.c:1301
+#: ../libsvn_wc/entries.c:2681 ../libsvn_wc/entries.c:2712
+#: ../svn/notify.c:1095
+#, c-format
+msgid "'%s' is not under version control"
+msgstr ""
+
+#: ../libsvn_client/cat.c:82
+#, c-format
+msgid "'%s' refers to a directory"
+msgstr ""
+
+#: ../libsvn_client/cat.c:92
+#, c-format
+msgid "'%s' has no pristine version until it is committed"
+msgstr ""
+
+#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:390
+msgid "(local)"
+msgstr ""
+
+#: ../libsvn_client/cat.c:247
+#, c-format
+msgid "URL '%s' refers to a directory"
+msgstr ""
+
+#: ../libsvn_client/changelist.c:57
+msgid "Target changelist name must not be empty"
+msgstr ""
+
+#: ../libsvn_client/checkout.c:109 ../libsvn_client/export.c:1447
+#, c-format
+msgid "URL '%s' doesn't exist"
+msgstr ""
+
+#: ../libsvn_client/checkout.c:113
+#, c-format
+msgid "URL '%s' refers to a file, not a directory"
+msgstr ""
+
+#: ../libsvn_client/checkout.c:147
+#, c-format
+msgid "'%s' is already a working copy for a different URL"
+msgstr ""
+
+#: ../libsvn_client/checkout.c:155
+#, c-format
+msgid "'%s' already exists and is not a directory"
+msgstr ""
+
+#: ../libsvn_client/cmdline.c:104
+#, c-format
+msgid "All non-relative targets must have the same root URL"
+msgstr ""
+
+#: ../libsvn_client/cmdline.c:312
+msgid ""
+"Resolving '^/': no repository root found in the target arguments or in the "
+"current directory"
+msgstr ""
+
+#: ../libsvn_client/commit.c:155 ../libsvn_client/copy.c:1522
+msgid "Commit failed (details follow):"
+msgstr ""
+
+#: ../libsvn_client/commit.c:163
+msgid "Commit succeeded, but other errors follow:"
+msgstr ""
+
+#: ../libsvn_client/commit.c:170
+msgid "Error unlocking locked dirs (details follow):"
+msgstr ""
+
+#: ../libsvn_client/commit.c:181
+msgid "Error bumping revisions post-commit (details follow):"
+msgstr ""
+
+#: ../libsvn_client/commit.c:314
+#, c-format
+msgid ""
+"Cannot delete the directory '%s' in a non-recursive commit because it has "
+"children"
+msgstr ""
+
+#: ../libsvn_client/commit.c:613
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr ""
+
+#: ../libsvn_client/commit.c:735
+msgid ""
+"Commit can only commit to a single repository at a time.\n"
+"Are all targets part of the same working copy?"
+msgstr ""
+
+#: ../libsvn_client/commit.c:851
+#, c-format
+msgid ""
+"Cannot commit '%s' because it was moved from '%s' which is not part of the "
+"commit; both sides of the move must be committed together"
+msgstr ""
+
+#: ../libsvn_client/commit.c:882
+#, c-format
+msgid ""
+"Cannot commit '%s' because it was moved to '%s' which is not part of the "
+"commit; both sides of the move must be committed together"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:94 ../libsvn_repos/commit.c:167
+#, c-format
+msgid "Directory '%s' is out of date"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:95 ../libsvn_repos/commit.c:169
+#, c-format
+msgid "File '%s' is out of date"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:130
+#, c-format
+msgid "Directory '%s' is locked in another working copy"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:131
+#, c-format
+msgid "File '%s' is locked in another working copy"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:166
+#, c-format
+msgid "Changing directory '%s' is forbidden by the server"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:167
+#, c-format
+msgid "Changing file '%s' is forbidden by the server"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:315
+#, c-format
+msgid "Aborting commit: '%s' remains in tree-conflict"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:666
+#, c-format
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:685
+#, c-format
+msgid "Node '%s' has unexpectedly changed kind"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:726
+#, c-format
+msgid "'%s' is scheduled for addition, but is missing"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:1257
+#, c-format
+msgid ""
+"'%s' is not known to exist in the repository and is not part of the commit, "
+"yet its child '%s' is part of the commit"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:1397
+#, c-format
+msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:1548
+#, c-format
+msgid "Commit item '%s' has copy flag but no copyfrom URL"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:1553
+#, c-format
+msgid "Commit item '%s' has copy flag but an invalid revision"
+msgstr ""
+
+#: ../libsvn_client/commit_util.c:2015
+msgid "Standard properties can't be set explicitly as revision properties"
+msgstr ""
+
+#: ../libsvn_client/copy.c:439
+#, c-format
+msgid "Path '%s' exists, but is excluded"
+msgstr ""
+
+#: ../libsvn_client/copy.c:445 ../libsvn_client/copy.c:1062
+#: ../libsvn_client/copy.c:1321 ../libsvn_client/copy.c:1896
+#: ../libsvn_client/import.c:862
+#, c-format
+msgid "Path '%s' already exists"
+msgstr ""
+
+#: ../libsvn_client/copy.c:500
+#, c-format
+msgid "Path '%s' already exists as unversioned node"
+msgstr ""
+
+#: ../libsvn_client/copy.c:522 ../libsvn_client/copy.c:532
+#: ../libsvn_client/copy.c:1912
+#, c-format
+msgid "Path '%s' is not a directory"
+msgstr ""
+
+#: ../libsvn_client/copy.c:571 ../libsvn_client/merge.c:10154
+#: ../svnlook/svnlook.c:1425
+#, c-format
+msgid "Path '%s' does not exist"
+msgstr ""
+
+#: ../libsvn_client/copy.c:741 ../libsvn_client/copy.c:782
+#, c-format
+msgid "Path '%s' already exists, but is not a directory"
+msgstr ""
+
+#: ../libsvn_client/copy.c:843
+msgid "Source and destination URLs appear not to point to the same repository."
+msgstr ""
+
+#: ../libsvn_client/copy.c:1052 ../libsvn_client/prop_commands.c:167
+#, c-format
+msgid "Path '%s' does not exist in revision %ld"
+msgstr ""
+
+#: ../libsvn_client/copy.c:1880
+#, c-format
+msgid "Path '%s' not found in revision %ld"
+msgstr ""
+
+#: ../libsvn_client/copy.c:1885
+#, c-format
+msgid "Path '%s' not found in head revision"
+msgstr ""
+
+#: ../libsvn_client/copy.c:2013
+msgid "Cannot mix repository and working copy sources"
+msgstr ""
+
+#: ../libsvn_client/copy.c:2065
+#, c-format
+msgid "Cannot copy path '%s' into its own child '%s'"
+msgstr ""
+
+#: ../libsvn_client/copy.c:2101
+#, c-format
+msgid ""
+"Cannot move the external at '%s'; please edit the svn:externals property on "
+"'%s'."
+msgstr ""
+
+#: ../libsvn_client/copy.c:2116
+msgid "Moves between the working copy and the repository are not supported"
+msgstr ""
+
+#: ../libsvn_client/copy.c:2131
+#, c-format
+msgid "Cannot move URL '%s' into itself"
+msgstr ""
+
+#: ../libsvn_client/copy.c:2132
+#, c-format
+msgid "Cannot move path '%s' into itself"
+msgstr ""
+
+#: ../libsvn_client/copy.c:2199
+#, c-format
+msgid "'%s' does not have a URL associated with it"
+msgstr ""
+
+#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:282
+#: ../libsvn_client/externals.c:904 ../libsvn_client/externals.c:1114
+#: ../libsvn_wc/update_editor.c:1124
+#, c-format
+msgid "Path '%s' is not in the working copy"
+msgstr ""
+
+#: ../libsvn_client/copy_foreign.c:372 ../libsvn_client/export.c:814
+#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1051
+#: ../libsvn_ra_svn/client.c:1208 ../libsvn_wc/diff_editor.c:1981
+#: ../libsvn_wc/diff_editor.c:2060 ../libsvn_wc/externals.c:651
+#: ../libsvn_wc/update_editor.c:4279
+#, c-format
+msgid "Checksum mismatch for '%s'"
+msgstr ""
+
+#: ../libsvn_client/copy_foreign.c:479
+#, c-format
+msgid "'%s' is not a valid location inside a repository"
+msgstr ""
+
+#: ../libsvn_client/copy_foreign.c:510
+#, c-format
+msgid "Can't add '%s', because no parent directory is found"
+msgstr ""
+
+#: ../libsvn_client/delete.c:76
+#, c-format
+msgid "'%s' is in the way of the resource actually under version control"
+msgstr ""
+
+#: ../libsvn_client/delete.c:95
+#, c-format
+msgid "'%s' has local modifications -- commit or revert them first"
+msgstr ""
+
+#: ../libsvn_client/delete.c:127
+#, c-format
+msgid ""
+"Cannot remove the external at '%s'; please edit or delete the svn:externals "
+"property on '%s'"
+msgstr ""
+
+#: ../libsvn_client/deprecated.c:862 ../svn/move-cmd.c:65
+msgid "Cannot specify revisions (except HEAD) with move operations"
+msgstr ""
+
+#: ../libsvn_client/deprecated.c:1624
+msgid "No commits in repository"
+msgstr ""
+
+#: ../libsvn_client/deprecated.c:2930 ../libsvn_wc/deprecated.c:3953
+msgid "Non-recursive relocation not supported"
+msgstr ""
+
+#. Utilities
+#: ../libsvn_client/diff.c:64
+#, c-format
+msgid "Path '%s' must be an immediate child of the directory '%s'"
+msgstr ""
+
+#: ../libsvn_client/diff.c:258
+#, c-format
+msgid "%s\t(revision %ld)"
+msgstr ""
+
+#: ../libsvn_client/diff.c:260
+#, c-format
+msgid "%s\t(working copy)"
+msgstr ""
+
+#: ../libsvn_client/diff.c:512 ../svnlook/svnlook.c:795
+#, c-format
+msgid "%sProperty changes on: %s%s"
+msgstr ""
+
+#: ../libsvn_client/diff.c:760
+#, c-format
+msgid "Cannot display: file marked as a binary type.%s"
+msgstr ""
+
+#: ../libsvn_client/diff.c:1265 ../libsvn_client/merge.c:7203
+#: ../libsvn_client/merge.c:10556
+msgid "Not all required revisions are specified"
+msgstr ""
+
+#: ../libsvn_client/diff.c:1279
+msgid ""
+"At least one revision must be something other than BASE or WORKING when "
+"diffing a URL"
+msgstr ""
+
+#: ../libsvn_client/diff.c:1316
+#, c-format
+msgid "Diff target '%s' was not found in the repository at revision '%ld'"
+msgstr ""
+
+#: ../libsvn_client/diff.c:1321
+#, c-format
+msgid ""
+"Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
+msgstr ""
+
+#: ../libsvn_client/diff.c:1496
+#, c-format
+msgid ""
+"Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
+msgstr ""
+
+#: ../libsvn_client/diff.c:1501
+#, c-format
+msgid ""
+"Diff targets '%s' and '%s' were not found in the repository at revisions "
+"'%ld' and '%ld'"
+msgstr ""
+
+#: ../libsvn_client/diff.c:1575
+msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported"
+msgstr ""
+
+#: ../libsvn_client/diff.c:1616
+msgid ""
+"Only diffs between a path's text-base and its working files are supported at "
+"this time"
+msgstr ""
+
+#: ../libsvn_client/diff.c:2221
+msgid ""
+"Summarized diffs are only supported between a path's text-base and its "
+"working files at this time"
+msgstr ""
+
+#: ../libsvn_client/diff.c:2582 ../libsvn_client/diff.c:2648
+msgid "Cannot ignore properties and show only properties at the same time"
+msgstr ""
+
+#: ../libsvn_client/diff_local.c:609
+#, c-format
+msgid "'%s' is not the same node kind as '%s'"
+msgstr ""
+
+#: ../libsvn_client/diff_local.c:632 ../libsvn_wc/props.c:1568
+#, c-format
+msgid "'%s' is not a file or directory"
+msgstr ""
+
+#: ../libsvn_client/export.c:102
+#, c-format
+msgid "'%s' is not a valid EOL value"
+msgstr ""
+
+#: ../libsvn_client/export.c:240
+msgid "Destination directory exists, and will not be overwritten unless forced"
+msgstr ""
+
+#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1527
+#: ../libsvn_wc/adm_crawler.c:1204 ../libsvn_wc/conflicts.c:1293
+#: ../libsvn_wc/copy.c:586 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327
+#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:704 ../libsvn_wc/props.c:227
+#: ../libsvn_wc/status.c:2679 ../libsvn_wc/wc_db.c:2576
+#: ../libsvn_wc/wc_db.c:2770 ../libsvn_wc/wc_db.c:2794
+#: ../libsvn_wc/wc_db.c:2952 ../libsvn_wc/wc_db.c:3950
+#: ../libsvn_wc/wc_db.c:6001 ../libsvn_wc/wc_db.c:6321
+#: ../libsvn_wc/wc_db.c:6482 ../libsvn_wc/wc_db.c:6637
+#: ../libsvn_wc/wc_db.c:7672 ../libsvn_wc/wc_db.c:8631
+#: ../libsvn_wc/wc_db.c:9294 ../libsvn_wc/wc_db.c:9923
+#: ../libsvn_wc/wc_db.c:10070 ../libsvn_wc/wc_db.c:10210
+#: ../libsvn_wc/wc_db.c:10560 ../libsvn_wc/wc_db.c:12047
+#: ../libsvn_wc/wc_db.c:12123 ../libsvn_wc/wc_db.c:13657
+#: ../libsvn_wc/wc_db.c:13717 ../libsvn_wc/wc_db.c:13855
+#: ../libsvn_wc/wc_db.c:14013 ../libsvn_wc/wc_db.c:14450
+#: ../libsvn_wc/wc_db.c:15231
+#, c-format
+msgid "The node '%s' was not found."
+msgstr ""
+
+#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1184
+#: ../libsvn_client/export.c:1241
+#, c-format
+msgid "Destination file '%s' exists, and will not be overwritten unless forced"
+msgstr ""
+
+#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1189
+#: ../libsvn_client/export.c:1246
+#, c-format
+msgid "Destination '%s' exists. Cannot overwrite directory with non-directory"
+msgstr ""
+
+#: ../libsvn_client/export.c:473 ../libsvn_client/export.c:622
+#: ../libsvn_client/export.c:1078
+#, c-format
+msgid "'%s' exists and is not a directory"
+msgstr ""
+
+#: ../libsvn_client/export.c:477 ../libsvn_client/export.c:626
+#: ../libsvn_client/export.c:1082
+#, c-format
+msgid "'%s' already exists"
+msgstr ""
+
+#: ../libsvn_client/externals.c:406
+#, c-format
+msgid ""
+"Cannot insert a file external defined on '%s' into the working copy '%s'."
+msgstr ""
+
+#: ../libsvn_client/externals.c:431
+#, c-format
+msgid ""
+"The file external from '%s' cannot overwrite the existing versioned item at "
+"'%s'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:444
+#, c-format
+msgid "The file external '%s' can not be created because the node exists."
+msgstr ""
+
+#: ../libsvn_client/externals.c:703
+#, c-format
+msgid "URL '%s' at revision %ld doesn't exist"
+msgstr ""
+
+#: ../libsvn_client/externals.c:708
+#, c-format
+msgid "URL '%s' at revision %ld is not a file or a directory"
+msgstr ""
+
+#: ../libsvn_client/externals.c:786
+#, c-format
+msgid ""
+"Unsupported external: URL of file external '%s' is not in repository '%s'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:979
+#, c-format
+msgid "Traversal of '%s' found no ambient depth"
+msgstr ""
+
+#: ../libsvn_client/import.c:159
+#, c-format
+msgid "%s property on '%s' contains unrecognized EOL-style '%s'"
+msgstr ""
+
+#: ../libsvn_client/import.c:489
+#, c-format
+msgid "Unknown or unversionable type for '%s'"
+msgstr ""
+
+#: ../libsvn_client/import.c:707
+msgid "New entry name required when importing a file"
+msgstr ""
+
+#: ../libsvn_client/import.c:758 ../libsvn_client/patch.c:3016
+#: ../libsvn_client/patch.c:3028 ../libsvn_wc/delete.c:93
+#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:77
+#, c-format
+msgid "'%s' does not exist"
+msgstr ""
+
+#: ../libsvn_client/import.c:891
+#, c-format
+msgid "'%s' is a reserved name and cannot be imported"
+msgstr ""
+
+#: ../libsvn_client/info.c:310 ../libsvn_client/list.c:376
+#, c-format
+msgid "URL '%s' non-existent in revision %ld"
+msgstr ""
+
+#: ../libsvn_client/locking_commands.c:266
+#: ../libsvn_client/locking_commands.c:292
+msgid "No common parent found, unable to operate on disjoint arguments"
+msgstr ""
+
+#: ../libsvn_client/locking_commands.c:325
+#, c-format
+msgid "The node '%s' is not a file"
+msgstr ""
+
+#: ../libsvn_client/locking_commands.c:345
+msgid "Unable to lock/unlock across multiple repositories"
+msgstr ""
+
+#: ../libsvn_client/locking_commands.c:400
+#, c-format
+msgid "'%s' is not locked in this working copy"
+msgstr ""
+
+#: ../libsvn_client/locking_commands.c:450
+#, c-format
+msgid "'%s' is not locked"
+msgstr ""
+
+#: ../libsvn_client/locking_commands.c:483 ../libsvn_fs/fs-loader.c:1413
+#: ../libsvn_ra/ra_loader.c:1074
+msgid "Lock comment contains illegal characters"
+msgstr ""
+
+#: ../libsvn_client/log.c:309
+msgid "No valid target found"
+msgstr ""
+
+#: ../libsvn_client/log.c:340
+#, c-format
+msgid "'%s' is not a relative path"
+msgstr ""
+
+#: ../libsvn_client/log.c:366
+msgid "When specifying working copy paths, only one target may be given"
+msgstr ""
+
+#: ../libsvn_client/log.c:390 ../libsvn_client/revisions.c:189
+msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
+msgstr ""
+
+#: ../libsvn_client/log.c:523 ../libsvn_client/log.c:830
+msgid "Missing required revision specification"
+msgstr ""
+
+#: ../libsvn_client/merge.c:443
+#, c-format
+msgid "URL '%s' of '%s' is not in repository '%s'"
+msgstr ""
+
+#: ../libsvn_client/merge.c:480
+#, c-format
+msgid "'%s' must be from the same repository as '%s'"
+msgstr ""
+
+#. xgettext: the '.working', '.merge-left.r%ld' and
+#. '.merge-right.r%ld' strings are used to tag onto a file
+#. name in case of a merge conflict
+#: ../libsvn_client/merge.c:2050
+#, c-format
+msgid ".working%s%s"
+msgstr ""
+
+#: ../libsvn_client/merge.c:2053
+#, c-format
+msgid ".merge-left.r%ld%s%s"
+msgstr ""
+
+#: ../libsvn_client/merge.c:2057
+#, c-format
+msgid ".merge-right.r%ld%s%s"
+msgstr ""
+
+#: ../libsvn_client/merge.c:4708
+msgid ""
+"Cannot reverse-merge a range from a path's own future history; try updating "
+"first"
+msgstr ""
+
+#: ../libsvn_client/merge.c:5443
+#, c-format
+msgid ""
+"One or more conflicts were produced while merging r%ld:%ld into\n"
+"'%s' --\n"
+"resolve all conflicts and rerun the merge to apply the remaining\n"
+"unmerged revisions"
+msgstr ""
+
+#: ../libsvn_client/merge.c:6258
+#, c-format
+msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
+msgstr ""
+
+#: ../libsvn_client/merge.c:6407
+msgid ""
+"Merge tracking not allowed with missing subtrees; try restoring these items "
+"first:\n"
+msgstr ""
+
+#: ../libsvn_client/merge.c:7407
+#, c-format
+msgid ""
+"Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
+msgstr ""
+
+#: ../libsvn_client/merge.c:9726
+msgid "Use of two URLs is not compatible with mergeinfo modification"
+msgstr ""
+
+#: ../libsvn_client/merge.c:9733 ../libsvn_client/merge.c:10068
+msgid ""
+"Merge from foreign repository is not compatible with mergeinfo modification"
+msgstr ""
+
+#: ../libsvn_client/merge.c:10161 ../libsvn_client/merge.c:10304
+#, c-format
+msgid "Merge target '%s' does not exist in the working copy"
+msgstr ""
+
+#: ../libsvn_client/merge.c:10184
+msgid "Cannot determine revision of working copy"
+msgstr ""
+
+#: ../libsvn_client/merge.c:10190
+#, c-format
+msgid ""
+"Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
+msgstr ""
+
+#: ../libsvn_client/merge.c:10205
+msgid "Cannot merge into a working copy with a switched subtree"
+msgstr ""
+
+#: ../libsvn_client/merge.c:10221
+msgid "Cannot merge into a working copy that has local modifications"
+msgstr ""
+
+#: ../libsvn_client/merge.c:10241 ../svn/merge-cmd.c:60
+#, c-format
+msgid ""
+"Invalid merge source '%s'; a working copy path can only be used with a "
+"repository revision (a number, a date, or head)"
+msgstr ""
+
+#: ../libsvn_client/merge.c:10559 ../svn/merge-cmd.c:127
+msgid "Merge sources must both be either paths or URLs"
+msgstr ""
+
+#: ../libsvn_client/merge.c:11320 ../libsvn_client/merge.c:11482
+#: ../libsvn_client/merge.c:12369
+#, c-format
+msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
+msgstr ""
+
+#: ../libsvn_client/merge.c:11432
+#, c-format
+msgid ""
+"Neither the reintegrate source nor target can be the root of the repository"
+msgstr ""
+
+#: ../libsvn_client/merge.c:11442
+msgid "Reintegrate merge not possible"
+msgstr ""
+
+#: ../libsvn_client/merge.c:11515
+#, c-format
+msgid ""
+"Reintegrate can only be used if revisions %ld through %ld were previously "
+"merged from %s to the reintegrate source, but this is not the case:\n"
+"%s"
+msgstr ""
+
+#: ../libsvn_client/merge.c:11577
+#, c-format
+msgid ""
+"Can't reintegrate into '%s' because it is locally added and therefore not "
+"related to the merge source"
+msgstr ""
+
+#: ../libsvn_client/merge.c:11845
+msgid "Cannot merge automatically while ignoring mergeinfo"
+msgstr ""
+
+#: ../libsvn_client/merge.c:12585
+msgid ""
+"The required merge is reintegrate-like, and the record-only option cannot be "
+"used with this kind of merge"
+msgstr ""
+
+#: ../libsvn_client/merge.c:12591
+msgid ""
+"The required merge is reintegrate-like, and the depth option cannot be used "
+"with this kind of merge"
+msgstr ""
+
+#: ../libsvn_client/merge.c:12597
+msgid ""
+"The required merge is reintegrate-like, and the force_delete option cannot "
+"be used with this kind of merge"
+msgstr ""
+
+#: ../libsvn_client/mergeinfo.c:1718
+msgid "Only depths 'infinity' and 'empty' are currently supported"
+msgstr ""
+
+#: ../libsvn_client/patch.c:279
+#, c-format
+msgid "Cannot strip %u components from '%s'"
+msgstr ""
+
+#: ../libsvn_client/patch.c:910
+msgid "Invalid link representation"
+msgstr ""
+
+#: ../libsvn_client/patch.c:3005
+msgid "strip count must be positive"
+msgstr ""
+
+#: ../libsvn_client/patch.c:3021 ../libsvn_fs_base/tree.c:3978
+#: ../libsvn_fs_base/tree.c:3983 ../libsvn_fs_fs/tree.c:3066
+#: ../libsvn_fs_fs/tree.c:3071 ../libsvn_ra/compat.c:675
+#: ../libsvn_ra_local/ra_plugin.c:1145
+#, c-format
+msgid "'%s' is not a file"
+msgstr ""
+
+#: ../libsvn_client/patch.c:3033 ../libsvn_wc/util.c:59
+#, c-format
+msgid "'%s' is not a directory"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:60
+#, c-format
+msgid "'%s' is a wcprop, thus not accessible to clients"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:155
+#, c-format
+msgid "Property '%s' is not a regular property"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:266
+#, c-format
+msgid "Revision property '%s' not allowed in this context"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:273 ../libsvn_client/prop_commands.c:468
+#, c-format
+msgid "Bad property name: '%s'"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:301
+msgid "Targets must be working copy paths"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:362
+msgid "Targets must be URLs"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:372
+msgid "Setting property on non-local targets needs a base revision"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:387
+#, c-format
+msgid "Setting property '%s' on non-local targets is not supported"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:415
+#, c-format
+msgid ""
+"revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone "
+"else deleted it?)"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:424
+#, c-format
+msgid ""
+"revprop '%s' in r%ld has unexpected value in repository (maybe someone else "
+"changed it?)"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:432
+#, c-format
+msgid ""
+"revprop '%s' in r%ld is unexpectedly present in repository (maybe someone "
+"else set it?)"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:463
+msgid ""
+"Author name should not contain a newline; value will not be set unless forced"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:577
+#, c-format
+msgid "'%s' does not exist in revision %ld"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:583 ../libsvn_client/prop_commands.c:1102
+#: ../libsvn_wc/crop.c:168
+#, c-format
+msgid "Unknown node kind for '%s'"
+msgstr ""
+
+#: ../libsvn_client/ra.c:161
+#, c-format
+msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation"
+msgstr ""
+
+#: ../libsvn_client/ra.c:415
+#, c-format
+msgid "Redirect cycle detected for URL '%s'"
+msgstr ""
+
+#: ../libsvn_client/ra.c:501 ../libsvn_client/ra.c:812
+#, c-format
+msgid "'%s' has no URL"
+msgstr ""
+
+#: ../libsvn_client/ra.c:679 ../libsvn_ra/compat.c:395
+#, c-format
+msgid "Unable to find repository location for '%s' in revision %ld"
+msgstr ""
+
+#: ../libsvn_client/ra.c:691
+#, c-format
+msgid ""
+"The location for '%s' for revision %ld does not exist in the repository or "
+"refers to an unrelated object"
+msgstr ""
+
+#: ../libsvn_client/relocate.c:117
+#, c-format
+msgid "'%s' is not the root of the repository"
+msgstr ""
+
+#: ../libsvn_client/relocate.c:124
+#, c-format
+msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
+msgstr ""
+
+#: ../libsvn_client/repos_diff.c:931 ../libsvn_wc/externals.c:570
+#, c-format
+msgid "Base checksum mismatch for '%s'"
+msgstr ""
+
+#: ../libsvn_client/revisions.c:113 ../libsvn_client/revisions.c:138
+#, c-format
+msgid "Path '%s' has no committed revision"
+msgstr ""
+
+#: ../libsvn_client/revisions.c:166
+#, c-format
+msgid "Unrecognized revision type requested for '%s'"
+msgstr ""
+
+#: ../libsvn_client/status.c:407 ../libsvn_client/status.c:586
+#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542
+#: ../libsvn_wc/wc_db.c:13269 ../libsvn_wc/wc_db_wcroot.c:630
+#, c-format
+msgid "'%s' is not a working copy"
+msgstr ""
+
+#: ../libsvn_client/status.c:454
+#, c-format
+msgid "Entry '%s' has no URL"
+msgstr ""
+
+#: ../libsvn_client/switch.c:129
+#, c-format
+msgid "Cannot both exclude and switch a path"
+msgstr ""
+
+#: ../libsvn_client/switch.c:150
+#, c-format
+msgid "Cannot switch '%s' because it is not in the repository yet"
+msgstr ""
+
+#: ../libsvn_client/switch.c:175
+#, c-format
+msgid "Directory '%s' has no URL"
+msgstr ""
+
+#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236
+#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4870
+#, c-format
+msgid ""
+"'%s'\n"
+"is not the same repository as\n"
+"'%s'"
+msgstr ""
+
+#: ../libsvn_client/switch.c:242
+#, c-format
+msgid "'%s' shares no common ancestry with '%s'"
+msgstr ""
+
+#: ../libsvn_client/util.c:336
+#, c-format
+msgid "Cannot mix repository and working copy targets"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:175
+msgid "Compression of svndiff data failed"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:538
+msgid "Decompression of svndiff data failed: no size"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:541
+msgid "Decompression of svndiff data failed: size too large"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:565
+msgid "Decompression of svndiff data failed"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:572
+msgid "Size of uncompressed data does not match stored original length"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:648
+#, c-format
+msgid "Invalid diff stream: insn %d cannot be decoded"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:652
+#, c-format
+msgid "Invalid diff stream: insn %d has length zero"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:656
+#, c-format
+msgid "Invalid diff stream: insn %d overflows the target view"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:665
+#, c-format
+msgid "Invalid diff stream: [src] insn %d overflows the source view"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:672
+#, c-format
+msgid ""
+"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:679
+#, c-format
+msgid "Invalid diff stream: [new] insn %d overflows the new data section"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:689
+msgid "Delta does not fill the target window"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:692
+msgid "Delta does not contain enough new data"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:801
+msgid "Svndiff has invalid header"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:857 ../libsvn_delta/svndiff.c:1039
+msgid "Svndiff contains a too-large window"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:864 ../libsvn_delta/svndiff.c:1046
+msgid "Svndiff contains corrupt window header"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:873
+msgid "Svndiff has backwards-sliding source views"
+msgstr ""
+
+#: ../libsvn_delta/svndiff.c:930 ../libsvn_delta/svndiff.c:987
+#: ../libsvn_delta/svndiff.c:1068
+msgid "Unexpected end of svndiff input"
+msgstr ""
+
+#: ../libsvn_diff/diff_file.c:184
+#, c-format
+msgid "File '%s' is too large to be read in to memory"
+msgstr ""
+
+#: ../libsvn_diff/diff_file.c:1106
+#, c-format
+msgid "The file '%s' changed unexpectedly during diff"
+msgstr ""
+
+#: ../libsvn_diff/diff_file.c:1276
+msgid "Error in options to internal diff"
+msgstr ""
+
+#: ../libsvn_diff/diff_file.c:1302
+#, c-format
+msgid "Invalid argument '%s' in diff options"
+msgstr ""
+
+#. Order of date components can be different in different languages
+#: ../libsvn_diff/diff_file.c:1799
+msgid "%a %b %e %H:%M:%S %Y"
+msgstr ""
+
+#: ../libsvn_diff/diff_file.c:1875 ../libsvn_diff/diff_file.c:1891
+#, c-format
+msgid "Path '%s' must be inside the directory '%s'"
+msgstr ""
+
+#: ../libsvn_diff/diff_file.c:2409
+#, c-format
+msgid "Failed to delete mmap '%s'"
+msgstr ""
+
+#: ../libsvn_diff/util.c:463
+#, c-format
+msgid " Reverse-merged %s:r%s%s"
+msgstr ""
+
+#: ../libsvn_diff/util.c:480
+#, c-format
+msgid " Merged %s:r%s%s"
+msgstr ""
+
+#: ../libsvn_fs/editor.c:219
+#, c-format
+msgid "Revision for modifying '%s' is required"
+msgstr ""
+
+#: ../libsvn_fs/editor.c:228
+#, c-format
+msgid "'%s' is out of date; try updating"
+msgstr ""
+
+#: ../libsvn_fs/editor.c:265
+#, c-format
+msgid "'%s' has been modified since the commit began (restart the commit)"
+msgstr ""
+
+#: ../libsvn_fs/editor.c:323
+#, c-format
+msgid "'%s' already exists, so may be out of date; try updating"
+msgstr ""
+
+#: ../libsvn_fs/editor.c:456
+msgid "The filesystem does not support 'absent' nodes"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:121
+#, c-format
+msgid "Invalid name for FS type '%s'"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:138 ../libsvn_ra/ra_loader.c:161
+#: ../libsvn_ra/ra_loader.c:174
+#, c-format
+msgid "'%s' does not define '%s()'"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:164
+#, c-format
+msgid "Failed to load module for FS type '%s'"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:186
+#, c-format
+msgid ""
+"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:266
+#, c-format
+msgid "Unknown FS type '%s'"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:389
+#, c-format
+msgid "Path '%s' is not in UTF-8"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:397
+#, c-format
+msgid "Path '%s' contains '.' or '..' element"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:554 ../libsvn_repos/repos.c:1982
+msgid "Hotcopy source and destination are equal"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:564
+#, c-format
+msgid "'%s' already exists and is a file"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:569
+#, c-format
+msgid "'%s' already exists and has an unknown node kind"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:587
+#, c-format
+msgid ""
+"The filesystem type of the hotcopy source ('%s') does not match the "
+"filesystem type of the hotcopy destination ('%s')"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:1395
+#, c-format
+msgid "Malformed UUID '%s'"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:1423
+#, c-format
+msgid "Lock token URI '%s' has bad scheme; expected '%s'"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:1430
+#, c-format
+msgid "Lock token '%s' is not ASCII at byte %u"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:1437
+#, c-format
+msgid "Lock token URI '%s' is not XML-safe"
+msgstr ""
+
+#: ../libsvn_fs/fs-loader.c:1444
+msgid "Negative expiration date passed to svn_fs_lock"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/bdb-err.c:104
+#, c-format
+msgid "Berkeley DB error for filesystem '%s' while %s:\n"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:94
+msgid "creating change"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:118
+msgid "deleting changes"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/fs_fs.c:5911
+msgid "Missing required node revision ID"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/fs_fs.c:5921
+msgid "Invalid change ordering: new node revision ID without delete"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/fs_fs.c:5932
+msgid "Invalid change ordering: non-add change on deleted path"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/fs_fs.c:5941
+msgid "Invalid change ordering: add change on preexisting path"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:272
+#: ../libsvn_fs_base/bdb/changes-table.c:395
+msgid "creating cursor for reading changes"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:297
+#: ../libsvn_fs_base/bdb/changes-table.c:416
+#, c-format
+msgid "Error reading changes for key '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:356
+#: ../libsvn_fs_base/bdb/changes-table.c:439
+msgid "fetching changes"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/changes-table.c:369
+#: ../libsvn_fs_base/bdb/changes-table.c:452
+msgid "closing changes cursor"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:87
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:116
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:159
+msgid "Only SHA1 checksums can be used as keys in the checksum-reps table.\n"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:135
+#, c-format
+msgid "Representation key for checksum '%s' exists in filesystem '%s'."
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:142
+msgid "storing checksum-reps record"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:164
+msgid "deleting entry from 'checksum-reps' table"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:186
+msgid "allocating new representation reuse ID (getting 'next-key')"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:207
+msgid "bumping next representation reuse ID"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/copies-table.c:92
+msgid "storing copy record"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/copies-table.c:115
+msgid "allocating new copy ID (getting 'next-key')"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/copies-table.c:133
+msgid "bumping next copy key"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/copies-table.c:171
+msgid "deleting entry from 'copies' table"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/copies-table.c:199
+msgid "reading copy"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/lock-tokens-table.c:87
+msgid "storing lock token record"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/lock-tokens-table.c:108
+msgid "deleting entry from 'lock-tokens' table"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/lock-tokens-table.c:135
+msgid "reading lock token"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/locks-table.c:93
+msgid "storing lock record"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/locks-table.c:116
+msgid "deleting lock from 'locks' table"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/locks-table.c:143
+msgid "reading lock"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/locks-table.c:246
+msgid "creating cursor for reading lock tokens"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/locks-table.c:321
+msgid "fetching lock tokens"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/locks-table.c:323
+msgid "fetching lock tokens (closing cursor)"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/miscellaneous-table.c:95
+msgid "deleting record from 'miscellaneous' table"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/miscellaneous-table.c:103
+msgid "storing miscellaneous record"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/miscellaneous-table.c:131
+msgid "fetching miscellaneous record"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/node-origins-table.c:117
+#, c-format
+msgid ""
+"Node origin for '%s' exists in filesystem '%s' with a different value (%s) "
+"than what we were about to store (%s)"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/node-origins-table.c:127
+msgid "storing node-origins record"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/node-origins-table.c:142
+msgid "deleting entry from 'node-origins' table"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:102
+msgid "allocating new node ID (getting 'next-key')"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:120
+msgid "bumping next node ID key"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:156
+#, c-format
+msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:182
+msgid "deleting entry from 'nodes' table"
+msgstr ""
+
+#. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/nodes-table.c:220
+msgid "reading node revision"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/nodes-table.c:253
+msgid "storing node revision"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/reps-table.c:98
+#: ../libsvn_fs_base/bdb/reps-table.c:200
+#, c-format
+msgid "No such representation '%s'"
+msgstr ""
+
+#. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/reps-table.c:101
+msgid "reading representation"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/reps-table.c:128
+msgid "storing representation"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/reps-table.c:156
+msgid "allocating new representation (getting next-key)"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/reps-table.c:177
+msgid "bumping next representation key"
+msgstr ""
+
+#. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/reps-table.c:203
+msgid "deleting representation"
+msgstr ""
+
+#. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/rev-table.c:95
+msgid "reading filesystem revision"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/rev-table.c:141
+msgid "updating filesystem revision"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/rev-table.c:149
+msgid "storing filesystem revision"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/rev-table.c:179
+msgid "getting youngest revision (creating cursor)"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/rev-table.c:203
+msgid "getting youngest revision (finding last entry)"
+msgstr ""
+
+#. You can't commit a transaction with open cursors, because:
+#. 1) key/value pairs don't get deleted until the cursors referring
+#. to them are closed, so closing a cursor can fail for various
+#. reasons, and txn_commit shouldn't fail that way, and
+#. 2) using a cursor after committing its transaction can cause
+#. undetectable database corruption.
+#: ../libsvn_fs_base/bdb/rev-table.c:213
+msgid "getting youngest revision (closing cursor)"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:94
+#: ../libsvn_fs_base/bdb/strings-table.c:300
+#: ../libsvn_fs_base/bdb/strings-table.c:491
+msgid "creating cursor for reading a string"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:124
+msgid "moving cursor"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:136
+msgid "rerunning cursor move"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:228
+#: ../libsvn_fs_base/bdb/strings-table.c:247
+#: ../libsvn_fs_base/bdb/strings-table.c:265
+msgid "reading string"
+msgstr ""
+
+#. Done with the cursor.
+#: ../libsvn_fs_base/bdb/strings-table.c:254
+#: ../libsvn_fs_base/bdb/strings-table.c:334
+#: ../libsvn_fs_base/bdb/strings-table.c:539
+msgid "closing string-reading cursor"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:313
+#: ../libsvn_fs_base/bdb/strings-table.c:505
+msgid "getting next-key value"
+msgstr ""
+
+#. ignore the error, the original is
+#. more important.
+#: ../libsvn_fs_base/bdb/strings-table.c:331
+msgid "bumping next string key"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:358
+msgid "appending string"
+msgstr ""
+
+#. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/strings-table.c:390
+msgid "clearing string"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:399
+msgid "storing empty contents"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:436
+msgid "fetching string length"
+msgstr ""
+
+#. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/strings-table.c:466
+msgid "deleting string"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:524
+msgid "writing copied data"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/strings-table.c:535
+msgid "fetching string data for a copy"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/txn-table.c:99
+msgid "storing transaction record"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/txn-table.c:123
+msgid "allocating new transaction ID (getting 'next-key')"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/txn-table.c:142
+msgid "bumping next transaction key"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/txn-table.c:188
+msgid "deleting entry from 'transactions' table"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/txn-table.c:218
+msgid "reading transaction"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/txn-table.c:251
+msgid "reading transaction list (opening cursor)"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/txn-table.c:314
+msgid "reading transaction list (listing keys)"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/txn-table.c:317
+msgid "reading transaction list (closing cursor)"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/uuids-table.c:119
+msgid "get repository uuid"
+msgstr ""
+
+#: ../libsvn_fs_base/bdb/uuids-table.c:147
+msgid "set repository uuid"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:228
+#, c-format
+msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:236
+#, c-format
+msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:245
+#, c-format
+msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:294
+msgid "Attempted to get entries of a non-directory node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:372
+#, c-format
+msgid "Attempted to create a node with an illegal name '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:378
+msgid "Attempted to create entry in non-directory parent"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:473 ../libsvn_fs_base/dag.c:737
+#: ../libsvn_fs_fs/dag.c:384
+#, c-format
+msgid "Attempted to clone child of non-mutable node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:480
+#, c-format
+msgid "Attempted to create entry that already exists"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:462
+msgid "Attempted to set entry in non-directory node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:468
+msgid "Attempted to set entry in immutable node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:602
+#, c-format
+msgid "Can't set proplist on *immutable* node-revision %s"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:743
+#, c-format
+msgid "Attempted to make a child clone with an illegal name '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:860
+#, c-format
+msgid "Attempted to delete entry '%s' from *non*-directory node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:866
+#, c-format
+msgid "Attempted to delete entry '%s' from immutable directory node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:873
+#, c-format
+msgid "Attempted to delete a node with an illegal name '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:888 ../libsvn_fs_base/dag.c:921
+#, c-format
+msgid "Delete failed: directory has no entry '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:970
+#, c-format
+msgid "Attempted removal of immutable node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1088
+#, c-format
+msgid "Attempted to get textual contents of a *non*-file node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1121
+#, c-format
+msgid "Attempted to get length of a *non*-file node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1148
+#, c-format
+msgid "Attempted to get checksum of a *non*-file node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1187 ../libsvn_fs_base/dag.c:1244
+#, c-format
+msgid "Attempted to set textual contents of a *non*-file node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1193 ../libsvn_fs_base/dag.c:1250
+#, c-format
+msgid "Attempted to set textual contents of an immutable node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1279 ../libsvn_fs_base/reps-strings.c:829
+#, c-format
+msgid "Checksum mismatch on representation '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1373
+#, c-format
+msgid "Attempted to open non-existent child node '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1379
+#, c-format
+msgid "Attempted to open node with an illegal name '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1700
+#, c-format
+msgid "Attempted merge tracking info change on immutable node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1740
+#, c-format
+msgid "Attempted mergeinfo count change on immutable node"
+msgstr ""
+
+#: ../libsvn_fs_base/dag.c:1752
+#, c-format
+msgid "Invalid value (%%%s) for node revision mergeinfo count"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:46
+#, c-format
+msgid "Corrupt filesystem revision %ld in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2268
+#, c-format
+msgid "Reference to non-existent node '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:68
+#, c-format
+msgid "No such revision %ld in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:80
+#, c-format
+msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:91
+#, c-format
+msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:102
+#, c-format
+msgid "No transaction named '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:113
+#, c-format
+msgid "Cannot modify transaction named '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:124
+#, c-format
+msgid "No copy with id '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:134
+#, c-format
+msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:144
+#, c-format
+msgid "No token given for path '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:153
+#, c-format
+msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:163
+#, c-format
+msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/err.c:173
+#, c-format
+msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:89
+#, c-format
+msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:100
+#, c-format
+msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:190
+#, c-format
+msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:553
+#, c-format
+msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:559
+#, c-format
+msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:574
+msgid "creating 'nodes' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:575
+msgid "opening 'nodes' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:580
+msgid "creating 'revisions' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:581
+msgid "opening 'revisions' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:586
+msgid "creating 'transactions' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:587
+msgid "opening 'transactions' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:592
+msgid "creating 'copies' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:593
+msgid "opening 'copies' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:598
+msgid "creating 'changes' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:599
+msgid "opening 'changes' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:604
+msgid "creating 'representations' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:605
+msgid "opening 'representations' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:610
+msgid "creating 'strings' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:611
+msgid "opening 'strings' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:616
+msgid "creating 'uuids' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:617
+msgid "opening 'uuids' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:622
+msgid "creating 'locks' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:623
+msgid "opening 'locks' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:628
+msgid "creating 'lock-tokens' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:629
+msgid "opening 'lock-tokens' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:637
+msgid "creating 'node-origins' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:638
+msgid "opening 'node-origins' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:647
+msgid "creating 'miscellaneous' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:648
+msgid "opening 'miscellaneous' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:657
+msgid "creating 'checksum-reps' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:658
+msgid "opening 'checksum-reps' table"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:730
+#, c-format
+msgid ""
+"The '%s' feature requires version %d of the filesystem schema; filesystem "
+"'%s' uses only version %d"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:749
+#, c-format
+msgid "Expected FS format '%d'; found format '%d'"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:1215
+#, c-format
+msgid "BDB repositories do not support incremental hotcopy"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:1319
+msgid ""
+"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
+"may be interfering with the hotcopy algorithm. If\n"
+"the problem persists, try deactivating this feature\n"
+"in DB_CONFIG"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:1338
+msgid ""
+"Error running catastrophic recovery on hotcopy; the\n"
+"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
+"hotcopy algorithm. If the problem persists, try deactivating\n"
+"this feature in DB_CONFIG"
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:1383
+msgid "Module for working with a Berkeley DB repository."
+msgstr ""
+
+#: ../libsvn_fs_base/fs.c:1430
+#, c-format
+msgid "Unsupported FS loader version (%d) for bdb"
+msgstr ""
+
+#: ../libsvn_fs_base/lock.c:108 ../libsvn_fs_base/lock.c:113
+#: ../libsvn_fs_fs/lock.c:786 ../libsvn_fs_fs/lock.c:791
+#: ../libsvn_fs_fs/lock.c:813
+#, c-format
+msgid "Path '%s' doesn't exist in HEAD revision"
+msgstr ""
+
+#: ../libsvn_fs_base/lock.c:540 ../libsvn_fs_fs/lock.c:682
+#, c-format
+msgid "Cannot verify lock on path '%s'; no username available"
+msgstr ""
+
+#: ../libsvn_fs_base/lock.c:546 ../libsvn_fs_fs/lock.c:688
+#, c-format
+msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')"
+msgstr ""
+
+#: ../libsvn_fs_base/lock.c:552 ../libsvn_fs_fs/lock.c:694
+#, c-format
+msgid "Cannot verify lock on path '%s'; no matching lock-token available"
+msgstr ""
+
+#. Helper macro that evaluates to an error message indicating that
+#. the representation referred to by X has an unknown node kind.
+#: ../libsvn_fs_base/reps-strings.c:58
+#, c-format
+msgid "Unknown node kind for representation '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:110
+msgid "Representation is not of type 'delta'"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:380
+msgid "Svndiff source length inconsistency"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:506
+#, c-format
+msgid "Diff version inconsistencies in representation '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:532
+#, c-format
+msgid ""
+"Corruption detected whilst reading delta chain from representation '%s' to "
+"'%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:798
+#, c-format
+msgid "Rep contents are too large: got %s, limit is %s"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:814
+#, c-format
+msgid "Failure reading representation '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:924
+#, c-format
+msgid "MD5 checksum mismatch on representation '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:934
+#, c-format
+msgid "SHA1 checksum mismatch on representation '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:945
+msgid "Null rep, but offset past zero already"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:1062 ../libsvn_fs_base/reps-strings.c:1253
+#, c-format
+msgid "Rep '%s' is not mutable"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:1077
+#, c-format
+msgid "Rep '%s' both mutable and non-fulltext"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:1372
+msgid "Failed to get new string key"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:1449
+#, c-format
+msgid "Attempt to deltify '%s' against itself"
+msgstr ""
+
+#: ../libsvn_fs_base/reps-strings.c:1522
+#, c-format
+msgid "Failed to calculate MD5 digest for '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/revs-txns.c:72
+#, c-format
+msgid "Transaction is not dead: '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/revs-txns.c:75
+#, c-format
+msgid "Transaction is dead: '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:9763
+#, c-format
+msgid "revprop '%s' has unexpected value in filesystem"
+msgstr ""
+
+#: ../libsvn_fs_base/revs-txns.c:1030
+msgid "Transaction aborted, but cleanup failed"
+msgstr ""
+
+#: ../libsvn_fs_base/trail.c:99
+msgid "beginning Berkeley DB transaction"
+msgstr ""
+
+#: ../libsvn_fs_base/trail.c:134
+msgid "aborting Berkeley DB transaction"
+msgstr ""
+
+#: ../libsvn_fs_base/trail.c:158
+msgid "committing Berkeley DB transaction"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:772 ../libsvn_fs_fs/tree.c:1065
+#, c-format
+msgid "Failure opening '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:1403 ../libsvn_fs_fs/tree.c:1516
+msgid "Cannot compare property value between two different filesystems"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:1849 ../libsvn_fs_base/tree.c:1919
+msgid "Corrupt DB: faulty predecessor count"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:1976
+#, c-format
+msgid "Unexpected immutable node at '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:1997 ../libsvn_fs_fs/tree.c:1546
+#: ../libsvn_repos/commit.c:1255
+#, c-format
+msgid "Conflict at '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:2050 ../libsvn_fs_base/tree.c:2802
+#: ../libsvn_fs_fs/tree.c:1597 ../libsvn_fs_fs/tree.c:2134
+msgid "Bad merge; ancestor, source, and target not all in same fs"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:2066 ../libsvn_fs_fs/tree.c:1613
+#, c-format
+msgid "Bad merge; target '%s' has id '%s', same as ancestor"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:2610
+#, c-format
+msgid "Transaction '%s' out-of-date with respect to revision '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:2886
+#, c-format
+msgid "Cannot deltify revisions prior to r%ld"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:3004 ../libsvn_fs_fs/tree.c:2289
+msgid "The root directory cannot be deleted"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:3217 ../libsvn_fs_fs/tree.c:2359
+#, c-format
+msgid "Cannot copy between two different filesystems ('%s' and '%s')"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:3226 ../libsvn_fs_fs/tree.c:2365
+msgid "Copy from mutable tree not currently supported"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:3736 ../libsvn_fs_fs/tree.c:2842
+#, c-format
+msgid "Base checksum mismatch on '%s'"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:3969 ../libsvn_fs_fs/tree.c:3057
+msgid "Cannot compare file contents between two different filesystems"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:5013 ../libsvn_fs_base/tree.c:5188
+#, c-format
+msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
+msgstr ""
+
+#: ../libsvn_fs_base/tree.c:5049
+#, c-format
+msgid ""
+"Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not "
+"a directory"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:426 ../libsvn_fs_fs/dag.c:442
+#: ../libsvn_ra_serf/serf.c:1038 ../libsvn_ra_serf/serf.c:1101
+msgid "Can't get entries of non-directory"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:551
+#, c-format
+msgid ""
+"Can't increment mergeinfo count on node-revision %%s to negative value %%%s"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:562
+#, c-format
+msgid ""
+"Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:1134
+msgid "Empty noderev in cache"
+msgstr ""
+
+#: ../libsvn_fs_fs/dag.c:1326
+#, c-format
+msgid "Attempted to update ancestry of non-mutable node"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs.c:83
+#, c-format
+msgid "Can't fetch FSFS shared data"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs.c:110
+#, c-format
+msgid "Can't store FSFS shared data"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs.c:404
+msgid "Module for working with a plain file (FSFS) repository."
+msgstr ""
+
+#: ../libsvn_fs_fs/fs.c:454
+#, c-format
+msgid "Unsupported FS loader version (%d) for fsfs"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:727
+#, c-format
+msgid "Can't unlock unknown transaction '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:731
+#, c-format
+msgid "Can't unlock nonlocked transaction '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:738
+#, c-format
+msgid "Can't unlock prototype revision lockfile for transaction '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:744
+#, c-format
+msgid "Can't close prototype revision lockfile for transaction '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:806
+#, c-format
+msgid ""
+"Cannot write to the prototype revision file of transaction '%s' because a "
+"previous representation is currently being written by this process"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:842
+#, c-format
+msgid ""
+"Cannot write to the prototype revision file of transaction '%s' because a "
+"previous representation is currently being written by another process"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:849 ../libsvn_subr/io.c:2014
+#, c-format
+msgid "Can't get exclusive lock on file '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:968
+#, c-format
+msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:995
+#, c-format
+msgid ""
+"Found format '%d', only created by unreleased dev builds; see http://"
+"subversion.apache.org/docs/release-notes/1.7#revprop-packing"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1006
+#, c-format
+msgid "Expected FS format between '1' and '%d'; found format '%d'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1052
+#, c-format
+msgid "Can't read first line of format file '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1092
+#, c-format
+msgid "'%s' contains invalid filesystem format option '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1582
+#, c-format
+msgid "'%s' is not a regular file. Please move it out of the way and try again"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1753
+#, c-format
+msgid "Can't read '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1816 ../libsvn_fs_fs/fs_fs.c:1835
+#, c-format
+msgid "Found malformed header '%s' in revision file"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1871
+#, c-format
+msgid "Invalid revision number '%ld'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1886 ../libsvn_fs_fs/fs_fs.c:1941
+#: ../libsvn_fs_fs/fs_fs.c:1952 ../libsvn_repos/log.c:2268
+#: ../libsvn_repos/log.c:2272
+#, c-format
+msgid "No such revision %ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1986
+msgid "Unexpected EOF"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:1993
+#, c-format
+msgid "Number '%s' invalid or too large"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2160 ../libsvn_fs_fs/fs_fs.c:2174
+#: ../libsvn_fs_fs/fs_fs.c:2182 ../libsvn_fs_fs/fs_fs.c:2190
+#: ../libsvn_fs_fs/fs_fs.c:2199 ../libsvn_fs_fs/fs_fs.c:2212
+#: ../libsvn_fs_fs/fs_fs.c:2221
+msgid "Malformed text representation offset line in node-rev"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2252
+#, c-format
+msgid "While reading representation offsets for node-revision '%s':"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2407
+msgid "Missing id field in node-rev"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2421
+#, c-format
+msgid "Missing kind field in node-rev '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2456
+#, c-format
+msgid "Missing cpath field in node-rev '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2484 ../libsvn_fs_fs/fs_fs.c:2491
+#, c-format
+msgid "Malformed copyroot line in node-rev '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2508 ../libsvn_fs_fs/fs_fs.c:2515
+#, c-format
+msgid "Malformed copyfrom line in node-rev '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2684 ../libsvn_fs_fs/fs_fs.c:7632
+#, c-format
+msgid "Attempted to write to non-transaction '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2821
+#, c-format
+msgid "Malformed representation header at %s"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2853
+#, c-format
+msgid "Missing node-id in node-rev at r%ld (offset %s)"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2862
+#, c-format
+msgid "Corrupt node-id '%s' in node-rev at r%ld (offset %s)"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2953
+#, c-format
+msgid "Revision file (r%ld) lacks trailing newline"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2967
+#, c-format
+msgid "Final line in revision file (r%ld) longer than 64 characters"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:2982
+#, c-format
+msgid "Final line in revision file r%ld missing space"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3686
+#, c-format
+msgid "Packed revprop manifest for r%ld too small"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3743
+#, c-format
+msgid "Revprop pack for revision r%ld contains revprops for r%ld .. r%ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3754
+#, c-format
+msgid "Revprop pack for revision r%ld starts at non-packed revisions r%ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3763
+msgid "Header end not found"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3791
+msgid "Packed revprop size exceeds pack file size"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3850
+#, c-format
+msgid "No such packed revision %ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3890
+#, c-format
+msgid "Failed to read revprop pack file for r%ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3897
+#, c-format
+msgid "Revprop pack file for r%ld is corrupt"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:3970
+#, c-format
+msgid "Could not read revprops for revision %ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:4199
+#, c-format
+msgid "Packed file '%s' misses a tag"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:4537
+msgid "Malformed svndiff data in representation"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:4973 ../libsvn_fs_fs/fs_fs.c:4992
+msgid "Reading one svndiff window read beyond the end of the representation"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:5080
+msgid "svndiff window length is corrupt"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:5248
+msgid "Checksum mismatch while reading representation"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:5613 ../libsvn_fs_fs/fs_fs.c:5627
+#: ../libsvn_fs_fs/fs_fs.c:5634
+#, c-format
+msgid "Directory entry corrupt in '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6112 ../libsvn_fs_fs/fs_fs.c:6117
+#: ../libsvn_fs_fs/fs_fs.c:6123 ../libsvn_fs_fs/fs_fs.c:6140
+#: ../libsvn_fs_fs/fs_fs.c:6173 ../libsvn_fs_fs/fs_fs.c:6193
+#: ../libsvn_fs_fs/fs_fs.c:6228 ../libsvn_fs_fs/fs_fs.c:6233
+msgid "Invalid changes line in rev-file"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6166
+msgid "Invalid change kind in rev file"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6186
+msgid "Invalid text-mod flag in rev-file"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6206
+msgid "Invalid prop-mod flag in rev-file"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6464
+msgid "Copying from transactions not allowed"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6597
+#, c-format
+msgid "Unable to create transaction directory in '%s' for revision %ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6662
+msgid "Internal error: a null transaction id was passed to get_txn_proplist()"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6821 ../libsvn_fs_fs/fs_fs.c:6828
+msgid "next-id file corrupt"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:6924
+#, c-format
+msgid "Transaction '%s' cleanup failed"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:7064
+#, c-format
+msgid "Invalid change type %d"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:7652
+msgid "Can't set text contents of a directory"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:7738 ../libsvn_fs_fs/fs_fs.c:7743
+#: ../libsvn_fs_fs/fs_fs.c:7750
+msgid "Corrupt 'current' file"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:8010
+#, c-format
+msgid ""
+"predecessor count for the root node-revision is wrong: found (%d+%ld != %d), "
+"committing r%ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:8145
+msgid "Truncated protorev file detected"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:8545
+msgid "Transaction out of date"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9044
+msgid "Recovery encountered a non-directory node"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9066
+msgid "Recovery encountered a deltified directory representation"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9102 ../libsvn_fs_fs/fs_fs.c:9111
+#: ../libsvn_fs_fs/fs_fs.c:9117
+msgid "Directory entry corrupt"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9290
+#, c-format
+msgid "Expected current rev to be <= %ld but found %ld"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9347
+#, c-format
+msgid "Revision %ld has a revs file but no revprops file"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9354
+#, c-format
+msgid "Revision %ld has a revs file but the revprops file is inaccessible"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9363
+#, c-format
+msgid "Revision %ld has a non-file where its revprops file should be"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9541
+#, c-format
+msgid ""
+"Node origin for '%s' exists with a different value (%s) than what we were "
+"about to store (%s)"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:9647
+#, c-format
+msgid "No such transaction '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:10364
+#, c-format
+msgid "FSFS format (%d) too old to pack; please upgrade the filesystem."
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:10643 ../libsvn_subr/io.c:248
+#, c-format
+msgid "Error converting entry in directory '%s' to UTF-8"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:10680 ../libsvn_subr/io.c:1021
+#, c-format
+msgid "Source '%s' is not a directory"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:10686 ../libsvn_subr/io.c:1027
+#, c-format
+msgid "Destination '%s' is not a directory"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:10758 ../libsvn_subr/io.c:1104
+#: ../libsvn_subr/io.c:2492
+#, c-format
+msgid "Can't read directory '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:10763 ../libsvn_subr/io.c:1109
+#: ../libsvn_subr/io.c:2497 ../libsvn_subr/io.c:4002
+#, c-format
+msgid "Error closing directory '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11046
+#, c-format
+msgid ""
+"The FSFS format (%d) of the hotcopy source does not match the FSFS format "
+"(%d) of the hotcopy destination; please upgrade both repositories to the "
+"same format"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11055
+msgid ""
+"The UUID of the hotcopy source does not match the UUID of the hotcopy "
+"destination"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11062
+msgid ""
+"The sharding layout configuration of the hotcopy source does not match the "
+"sharding layout configuration of the hotcopy destination"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11188
+#, c-format
+msgid ""
+"Failed to create hotcopy at '%s'. The file '%s' is missing from the source "
+"repository. Please create this file, for instance by running 'svnadmin "
+"upgrade %s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11214
+#, c-format
+msgid ""
+"The hotcopy destination already contains more revisions (%lu) than the "
+"hotcopy source contains (%lu); are source and destination swapped?"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11250
+#, c-format
+msgid ""
+"The hotcopy destination already contains more packed revisions (%lu) than "
+"the hotcopy source contains (%lu)"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11365
+#, c-format
+msgid ""
+"The assumed HEAD revision (%lu) of the hotcopy source has been packed while "
+"the hotcopy was in progress; please restart the hotcopy operation"
+msgstr ""
+
+#: ../libsvn_fs_fs/fs_fs.c:11380
+#, c-format
+msgid ""
+"Revision %lu disappeared from the hotcopy source while hotcopy was in "
+"progress"
+msgstr ""
+
+#: ../libsvn_fs_fs/lock.c:120
+#, c-format
+msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/lock.c:228
+#, c-format
+msgid "Cannot write lock/entries hashfile '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/lock.c:280
+#, c-format
+msgid "Can't parse lock/entries hashfile '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/lock.c:818
+#, c-format
+msgid "Lock failed: newer version of '%s' exists"
+msgstr ""
+
+#: ../libsvn_fs_fs/rep-cache.c:138
+msgid "Couldn't open rep-cache database"
+msgstr ""
+
+#: ../libsvn_fs_fs/rep-cache.c:267 ../libsvn_fs_fs/rep-cache.c:312
+msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n"
+msgstr ""
+
+#: ../libsvn_fs_fs/rep-cache.c:348
+#, c-format
+msgid ""
+"Representation key for checksum '%%s' exists in filesystem '%%s' with a "
+"different value (%%ld,%%%s,%%%s,%%%s) than what we were about to store (%%ld,"
+"%%%s,%%%s,%%%s)"
+msgstr ""
+
+#: ../libsvn_fs_fs/tree.c:2209 ../libsvn_subr/path.c:1233
+#, c-format
+msgid "Invalid control character '0x%02x' in path '%s'"
+msgstr ""
+
+#: ../libsvn_fs_fs/tree.c:3808
+#, c-format
+msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
+msgstr ""
+
+#: ../libsvn_fs_fs/tree.c:3924
+#, c-format
+msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't"
+msgstr ""
+
+#: ../libsvn_fs_fs/tree.c:4124
+#, c-format
+msgid ""
+"Querying mergeinfo requires version %d of the FSFS filesystem schema; "
+"filesystem '%s' uses only version %d"
+msgstr ""
+
+#: ../libsvn_fs_util/fs-util.c:154
+msgid "Filesystem object has not been opened yet"
+msgstr ""
+
+#: ../libsvn_fs_util/fs-util.c:157
+msgid "Filesystem object already open"
+msgstr ""
+
+#: ../libsvn_ra/compat.c:182
+#, c-format
+msgid "Missing changed-path information for '%s' in revision %ld"
+msgstr ""
+
+#: ../libsvn_ra/compat.c:326 ../libsvn_ra/compat.c:570
+#, c-format
+msgid "Path '%s' doesn't exist in revision %ld"
+msgstr ""
+
+#: ../libsvn_ra/compat.c:403
+#, c-format
+msgid "'%s' in revision %ld is an unrelated object"
+msgstr ""
+
+#: ../libsvn_ra/compat.c:843 ../libsvn_ra/ra_loader.c:1291
+#, c-format
+msgid "Invalid peg revision %ld"
+msgstr ""
+
+#: ../libsvn_ra/compat.c:846 ../libsvn_ra/ra_loader.c:1294
+#: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329
+#, c-format
+msgid "Invalid end revision %ld"
+msgstr ""
+
+#: ../libsvn_ra/compat.c:849 ../libsvn_ra/ra_loader.c:1297
+msgid "Peg revision must precede end revision"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:215
+#, c-format
+msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:292 ../libsvn_ra_serf/serf.c:594
+#, c-format
+msgid "Illegal repository URL '%s'"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:399
+#, c-format
+msgid "Invalid config: unknown HTTP library '%s'"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:468
+#, c-format
+msgid "Unrecognized URL scheme for '%s'"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:519
+#, c-format
+msgid "Repository UUID '%s' doesn't match expected UUID '%s'"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:540
+#, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:564
+#, c-format
+msgid "'%s' isn't a child of session URL '%s'"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:580 ../libsvn_ra_svn/client.c:2465
+#, c-format
+msgid "'%s' isn't a child of repository root URL '%s'"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:624
+#, c-format
+msgid ""
+"Specifying 'old_value_p' is not allowed when the '%s' capability is not "
+"advertised, and could indicate a bug in your client"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:1445
+#, c-format
+msgid " - handles '%s' scheme\n"
+msgstr ""
+
+#: ../libsvn_ra/ra_loader.c:1538
+#, c-format
+msgid "Unrecognized URL scheme '%s'"
+msgstr ""
+
+#: ../libsvn_ra/util.c:55
+msgid "<repository>"
+msgstr ""
+
+#: ../libsvn_ra/util.c:73
+#, c-format
+msgid "Retrieval of mergeinfo unsupported by '%s'"
+msgstr ""
+
+#: ../libsvn_ra/util.c:99
+#, c-format
+msgid "The '%s' feature is not supported by '%s'"
+msgstr ""
+
+#: ../libsvn_ra/util.c:142
+#, c-format
+msgid "Lock was stolen by '%s'; unable to remove it"
+msgstr ""
+
+#: ../libsvn_ra/util.c:183
+#, c-format
+msgid "Unable to determine local hostname"
+msgstr ""
+
+#: ../libsvn_ra/util.c:278
+#, c-format
+msgid "Couldn't get lock on destination repos after %d attempts"
+msgstr ""
+
+#: ../libsvn_ra_local/ra_plugin.c:162
+msgid "memory-cache-size invalid"
+msgstr ""
+
+#. ----------------------------------------------------------------
+#. ** The RA vtable routines **
+#: ../libsvn_ra_local/ra_plugin.c:503
+msgid "Module for accessing a repository on local disk."
+msgstr ""
+
+#: ../libsvn_ra_local/ra_plugin.c:579
+msgid "Unable to open an ra_local session to URL"
+msgstr ""
+
+#: ../libsvn_ra_local/ra_plugin.c:612 ../libsvn_ra_serf/serf.c:586
+#, c-format
+msgid "URL '%s' is not a child of the session's repository root URL '%s'"
+msgstr ""
+
+#: ../libsvn_ra_local/ra_plugin.c:1140 ../libsvn_ra_local/ra_plugin.c:1597
+#: ../libsvn_ra_serf/util.c:2604
+#, c-format
+msgid "'%s' path not found"
+msgstr ""
+
+#: ../libsvn_ra_local/ra_plugin.c:1539 ../libsvn_ra_serf/options.c:675
+#: ../libsvn_ra_svn/client.c:2666
+#, c-format
+msgid "Don't know anything about capability '%s'"
+msgstr ""
+
+#: ../libsvn_ra_local/ra_plugin.c:1745
+#, c-format
+msgid "Unsupported RA loader version (%d) for ra_local"
+msgstr ""
+
+#: ../libsvn_ra_local/split_url.c:50 ../libsvn_ra_local/split_url.c:56
+#, c-format
+msgid "Unable to open repository '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:215
+#, c-format
+msgid "%s of '%s': %d %s"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:315
+msgid "No Location header received"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:325
+msgid "Error parsing Location header value"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:435
+#, c-format
+msgid "Directory '%s' is out of date; try updating"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:523 ../libsvn_repos/commit.c:512
+#, c-format
+msgid "Path '%s' not present"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:573
+#, c-format
+msgid "File '%s' is out of date; try updating"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:975
+msgid "At least one property change failed; repository is unchanged"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:1233
+#, c-format
+msgid "Failed writing updated file"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:1421 ../libsvn_ra_serf/commit.c:1511
+#, c-format
+msgid "%s of '%s': %d %s (%s://%s)"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:1431
+#, c-format
+msgid "POST request did not return transaction information"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:1475
+msgid ""
+"The OPTIONS response did not include the requested activity-collection-set "
+"value"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:1718 ../libsvn_ra_serf/commit.c:2127
+#: ../libsvn_ra_serf/update.c:2619
+#, c-format
+msgid "Unable to parse URL '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:1746 ../libsvn_ra_serf/util.c:2600
+#, c-format
+msgid "Access to '%s' forbidden"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:1750
+#, c-format
+msgid "Adding directory failed: %s on %s (%d %s)"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:1979
+#, c-format
+msgid "File '%s' already exists"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:2250
+#, c-format
+msgid "MERGE request failed: returned %d (during commit)"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:2324
+#, c-format
+msgid "DELETE returned unexpected status: %d"
+msgstr ""
+
+#: ../libsvn_ra_serf/commit.c:2518
+msgid ""
+"DAV request failed; it's possible that the repository's pre-revprop-change "
+"hook either failed or is non-existent"
+msgstr ""
+
+#: ../libsvn_ra_serf/get_deleted_rev.c:173
+#, c-format
+msgid "'%s' REPORT not implemented"
+msgstr ""
+
+#: ../libsvn_ra_serf/inherited_props.c:171 ../libsvn_ra_serf/property.c:279
+#: ../libsvn_ra_serf/update.c:2468
+#, c-format
+msgid "Got unrecognized encoding '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/locks.c:171
+#, c-format
+msgid "Invalid LOCK timeout value '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/locks.c:243
+#, c-format
+msgid "Lock request failed: %d %s"
+msgstr ""
+
+#: ../libsvn_ra_serf/locks.c:424
+msgid "Malformed URL for repository"
+msgstr ""
+
+#: ../libsvn_ra_serf/locks.c:430
+msgid "Server does not support locking features"
+msgstr ""
+
+#: ../libsvn_ra_serf/locks.c:596
+#, c-format
+msgid "'%s' is not locked in the repository"
+msgstr ""
+
+#: ../libsvn_ra_serf/locks.c:647 ../libsvn_ra_serf/locks.c:653
+#, c-format
+msgid "Unlock request failed: %d %s"
+msgstr ""
+
+#: ../libsvn_ra_serf/log.c:169
+#, c-format
+msgid "Unsupported encoding '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/log.c:568 ../libsvn_ra_svn/client.c:1577
+msgid "Server does not support custom revprops via log"
+msgstr ""
+
+#: ../libsvn_ra_serf/merge.c:200
+#, c-format
+msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
+msgstr ""
+
+#: ../libsvn_ra_serf/options.c:658
+#, c-format
+msgid "Don't know how to handle '%s' for capability '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/options.c:682
+#, c-format
+msgid "Attempt to fetch capability '%s' resulted in '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/property.c:700
+msgid "The PROPFIND response did not include the requested properties"
+msgstr ""
+
+#: ../libsvn_ra_serf/property.c:993
+msgid ""
+"The PROPFIND response did not include the requested baseline-collection value"
+msgstr ""
+
+#: ../libsvn_ra_serf/property.c:1005
+msgid "The PROPFIND response did not include the requested version-name value"
+msgstr ""
+
+#: ../libsvn_ra_serf/property.c:1043
+msgid "The OPTIONS response did not include the requested checked-in value"
+msgstr ""
+
+#: ../libsvn_ra_serf/property.c:1125
+msgid "The OPTIONS response did not include the youngest revision"
+msgstr ""
+
+#: ../libsvn_ra_serf/property.c:1218
+msgid "The PROPFIND response did not include the requested resourcetype value"
+msgstr ""
+
+#: ../libsvn_ra_serf/property.c:1253
+msgid "The PROPFIND response did not include the requested 'DAV:' properties"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:222 ../libsvn_ra_serf/update.c:1657
+msgid "Missing revision attr in target-revision element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:240
+msgid "Missing revision attr in open-root element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:260 ../libsvn_ra_serf/update.c:1885
+msgid "Missing name attr in delete-entry element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:266
+msgid "Missing revision attr in delete-entry element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:286 ../libsvn_ra_serf/update.c:1724
+msgid "Missing name attr in open-directory element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:292 ../libsvn_ra_serf/update.c:1675
+#: ../libsvn_ra_serf/update.c:1715
+msgid "Missing revision attr in open-directory element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:312 ../libsvn_ra_serf/update.c:1762
+msgid "Missing name attr in add-directory element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:349 ../libsvn_ra_serf/update.c:1806
+msgid "Missing name attr in open-file element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:355 ../libsvn_ra_serf/update.c:1815
+msgid "Missing revision attr in open-file element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:375 ../libsvn_ra_serf/update.c:1840
+msgid "Missing name attr in add-file element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:443 ../libsvn_ra_serf/update.c:1981
+#: ../libsvn_ra_serf/update.c:2068
+#, c-format
+msgid "Missing name attr in %s element"
+msgstr ""
+
+#: ../libsvn_ra_serf/replay.c:578
+msgid "Error writing stream: unexpected EOF"
+msgstr ""
+
+#: ../libsvn_ra_serf/sb_bucket.c:65
+msgid "Failed to read the request"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:62
+msgid "Module for accessing a repository via WebDAV protocol using serf."
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:65
+#, c-format
+msgid ""
+"Module for accessing a repository via WebDAV protocol using serf.\n"
+" - using serf %d.%d.%d"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:129
+#, c-format
+msgid "Invalid config: unknown %s '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:327
+msgid "Invalid config: illegal character in timeout value"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:331
+msgid "Invalid config: negative timeout value"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:344
+msgid "Invalid URL: illegal character in proxy port number"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:348
+msgid "Invalid URL: negative proxy port number"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:351
+msgid ""
+"Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:371
+#, c-format
+msgid "Could not resolve proxy server '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:474
+#, c-format
+msgid "Illegal URL '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:546
+#, c-format
+msgid "Connection to '%s' failed"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:1216
+msgid "The UUID property was not found on the resource or any of its parents"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:1290
+#, c-format
+msgid "Unsupported RA loader version (%d) for ra_serf"
+msgstr ""
+
+#: ../libsvn_ra_serf/serf.c:1304
+#, c-format
+msgid ""
+"ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d "
+"library"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:1115
+#, c-format
+msgid "GET request returned unexpected delta base: %s"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:1133
+#, c-format
+msgid "GET request failed: %d %s"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:1919
+msgid "Missing name attr in absent-directory element"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:1944
+msgid "Missing name attr in absent-file element"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:2012 ../libsvn_ra_serf/update.c:2119
+#, c-format
+msgid "Unknown tag '%s' while at state %d"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:2187 ../libsvn_ra_serf/update.c:2309
+#: ../libsvn_ra_serf/update.c:2346
+msgid ""
+"The REPORT or PROPFIND response did not include the requested checked-in "
+"value"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:2528
+#, c-format
+msgid "Error writing to '%s': unexpected EOF"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:2884
+msgid "Error retrieving REPORT"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:3093
+msgid "Missing update-report close tag"
+msgstr ""
+
+#: ../libsvn_ra_serf/update.c:3562
+msgid "Can't get text contents of a directory"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:249
+msgid ": "
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:251
+msgid ", "
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:462
+msgid "Server SSL certificate verification failed"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:467
+msgid "certificate is not yet valid"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:470
+msgid "certificate has expired"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:474
+msgid "certificate issued for a different hostname"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:478
+msgid "issuer is not trusted"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:481
+msgid "and other reason(s)"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:528
+#, c-format
+msgid "Invalid config: unable to load certificate file '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:960 ../libsvn_ra_serf/util.c:963
+msgid "Error running context"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:1297 ../libsvn_ra_serf/util.c:1302
+#, c-format
+msgid "Malformed DAV:status CDATA '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:1599 ../libsvn_ra_serf/util.c:1702
+#, c-format
+msgid "XML parsing failed"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:1602
+#, c-format
+msgid "XML parsing failed: (%d %s)"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:1889
+msgid "The XML response contains invalid XML"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:1954
+msgid ""
+"No more credentials or we tried too many times.\n"
+"Authentication failed"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:1976
+msgid "Proxy authentication failed"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2029
+#, c-format
+msgid "%s request on '%s' failed"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2101
+#, c-format
+msgid "Premature EOF seen from server (http status=%d)"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2170
+#, c-format
+msgid "%s request on '%s' failed: %d %s"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2492
+msgid ""
+"The PROPFIND response did not include the requested version-controlled-"
+"configuration value"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2594
+#, c-format
+msgid "Repository moved permanently to '%s'; please relocate"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2596
+#, c-format
+msgid "Repository moved temporarily to '%s'; please relocate"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2607
+#, c-format
+msgid "'%s': no lock token available"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2611
+#, c-format
+msgid ""
+"DAV request failed: 411 Content length required. The server or an "
+"intermediate proxy does not accept chunked encoding. Try setting 'http-"
+"chunked-requests' to 'auto' or 'no' in your client configuration."
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2617
+#, c-format
+msgid "The requested feature is not supported by '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2623
+#, c-format
+msgid "Unexpected HTTP status %d '%s' on '%s'\n"
+msgstr ""
+
+#: ../libsvn_ra_serf/util.c:2767
+#, c-format
+msgid "The %s response contains invalid XML (%d %s)"
+msgstr ""
+
+#: ../libsvn_ra_serf/xml.c:622
+#, c-format
+msgid "XML Parsing failed: Unexpected root element '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/xml.c:682
+#, c-format
+msgid "Missing XML attribute: '%s'"
+msgstr ""
+
+#: ../libsvn_ra_serf/xml.c:757
+msgid "The response contains invalid XML"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:142
+#, c-format
+msgid "Unknown hostname '%s'"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:167
+#, c-format
+msgid "Can't connect to host '%s'"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:205
+msgid "Prop diffs element not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:403
+#, c-format
+msgid "Undefined tunnel scheme '%s'"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:420
+#, c-format
+msgid "Tunnel scheme %s requires environment variable %s to be defined"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:431
+#, c-format
+msgid "Can't tokenize command '%s'"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:464
+#, c-format
+msgid "Error in child process: %s"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:539
+msgid ""
+"To better debug SSH connection problems, remove the -q option from 'ssh' in "
+"the [tunnels] section of your Subversion configuration file."
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:557
+#, c-format
+msgid "Illegal svn repository URL '%s'"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:637
+#, c-format
+msgid "Server requires minimum version %d"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:641
+#, c-format
+msgid "Server only supports versions up to %d"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:649
+msgid "Server does not support edit pipelining"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:686
+msgid "Impossibly long repository root from server"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:698
+msgid ""
+"Module for accessing a repository using the svn network protocol.\n"
+" - with Cyrus SASL authentication"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:702
+msgid "Module for accessing a repository using the svn network protocol."
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:912
+msgid "Server did not send repository root"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:985
+#, c-format
+msgid ""
+"ra_svn does not support not specifying a log message with pre-1.5 servers; "
+"consider passing an empty one, or upgrading the server"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1008
+msgid ""
+"Server doesn't support setting arbitrary revision properties during commit"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1111
+msgid "Inherited proplist element not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1186
+msgid "Non-string as part of file contents"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1272
+msgid "Dirlist element not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1357
+msgid "Mergeinfo element is not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1565
+msgid "Log entry not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1612
+msgid "Changed-path entry not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1778
+msgid "'stat' not implemented"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1837
+msgid "'get-locations' not implemented"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1852
+msgid "Location entry not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1891
+msgid "'get-location-segments' not implemented"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1908
+msgid "Location segment entry not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1918
+msgid "Expected valid revision range"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1959
+msgid "'get-file-revs' not implemented"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:1983
+msgid "Revision entry not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2000 ../libsvn_ra_svn/client.c:2030
+msgid "Text delta chunk not a string"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2042
+msgid "The get-file-revs command didn't return any revisions"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2089
+msgid "Server doesn't support the lock command"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2153
+msgid "Server doesn't support the unlock command"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2251
+msgid "Lock response not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2265
+msgid "Unknown status for lock command"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2289
+msgid "Didn't receive end marker for lock responses"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2379
+msgid "Unlock response not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2393
+msgid "Unknown status for unlock command"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2416
+msgid "Didn't receive end marker for unlock responses"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2440 ../libsvn_ra_svn/client.c:2492
+msgid "Server doesn't support the get-lock command"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2506
+msgid "Lock element not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2549
+msgid "Server doesn't support the replay command"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2580
+msgid "Server doesn't support the replay-range command"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2598
+#, c-format
+msgid "Expected 'revprops', found '%s'"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2615
+msgid "Error while replaying commit"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2688
+msgid "'get-deleted-rev' not implemented"
+msgstr ""
+
+#: ../libsvn_ra_svn/client.c:2787
+#, c-format
+msgid "Unsupported RA loader version (%d) for ra_svn"
+msgstr ""
+
+#: ../libsvn_ra_svn/cram.c:199 ../libsvn_ra_svn/cram.c:217
+#: ../libsvn_ra_svn/cyrus_auth.c:526 ../libsvn_ra_svn/cyrus_auth.c:582
+#: ../libsvn_ra_svn/internal_auth.c:66
+msgid "Unexpected server response to authentication"
+msgstr ""
+
+#: ../libsvn_ra_svn/cyrus_auth.c:225
+#, c-format
+msgid "SASL authentication error: %s%s"
+msgstr ""
+
+#: ../libsvn_ra_svn/cyrus_auth.c:242
+#, c-format
+msgid "Could not initialized the SASL library: %s%s"
+msgstr ""
+
+#: ../libsvn_ra_svn/cyrus_auth.c:415
+#, c-format
+msgid "Could not create SASL context: %s%s"
+msgstr ""
+
+#: ../libsvn_ra_svn/cyrus_auth.c:921 ../libsvn_ra_svn/internal_auth.c:63
+#: ../libsvn_ra_svn/internal_auth.c:114
+#, c-format
+msgid "Authentication error from server: %s"
+msgstr ""
+
+#: ../libsvn_ra_svn/cyrus_auth.c:925
+msgid "Can't get username or password"
+msgstr ""
+
+#: ../libsvn_ra_svn/editorp.c:145
+msgid "Successful edit status returned too soon"
+msgstr ""
+
+#: ../libsvn_ra_svn/editorp.c:487
+msgid "Invalid file or dir token during edit"
+msgstr ""
+
+#: ../libsvn_ra_svn/editorp.c:715
+msgid "Apply-textdelta already active"
+msgstr ""
+
+#: ../libsvn_ra_svn/editorp.c:737 ../libsvn_ra_svn/editorp.c:755
+msgid "Apply-textdelta not active"
+msgstr ""
+
+#: ../libsvn_ra_svn/editorp.c:850
+#, c-format
+msgid "Command 'finish-replay' invalid outside of replays"
+msgstr ""
+
+#: ../libsvn_ra_svn/editorp.c:954 ../libsvn_ra_svn/marshal.c:1498
+#, c-format
+msgid "Unknown editor command '%s'"
+msgstr ""
+
+#: ../libsvn_ra_svn/internal_auth.c:101
+msgid "Can't get password"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:151
+msgid "Capability entry is not a word"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:941
+msgid "String length larger than maximum"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:1007
+msgid "Too many nested items"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:1027 ../libsvn_ra_svn/marshal.c:1105
+msgid "Number is larger than maximum"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:1133
+msgid "Word too long"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:1351
+msgid "Proplist element not a list"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:1390
+msgid "Empty error list"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:1399 ../libsvn_ra_svn/marshal.c:1425
+msgid "Malformed error list"
+msgstr ""
+
+#: ../libsvn_ra_svn/marshal.c:1454
+#, c-format
+msgid "Unknown status '%s' in command response"
+msgstr ""
+
+#: ../libsvn_ra_svn/streams.c:78 ../libsvn_ra_svn/streams.c:157
+#, c-format
+msgid "Can't read from connection"
+msgstr ""
+
+#: ../libsvn_ra_svn/streams.c:91 ../libsvn_ra_svn/streams.c:170
+#, c-format
+msgid "Can't write to connection"
+msgstr ""
+
+#: ../libsvn_ra_svn/streams.c:144
+#, c-format
+msgid "Can't get socket timeout"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:170
+#, c-format
+msgid "'%s' is out of date"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:291
+#, c-format
+msgid "Got source path but no source revision for '%s'"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:324
+#, c-format
+msgid "Source url '%s' is from different repository"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:640
+#, c-format
+msgid ""
+"Checksum mismatch for resulting fulltext\n"
+"(%s)"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:685
+msgid "(no error)"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:716 ../libsvn_repos/commit.c:722
+msgid "post-commit hook failed with no error message."
+msgstr ""
+
+#: ../libsvn_repos/commit.c:725
+#, c-format
+msgid ""
+"post commit FS processing had error:\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:726 ../libsvn_repos/commit.c:735
+msgid "(no error message)"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:733
+#, c-format
+msgid ""
+"post commit FS processing had error:\n"
+"%s"
+msgstr ""
+
+#: ../libsvn_repos/commit.c:1266 ../libsvn_repos/fs-wrap.c:98
+#: ../libsvn_repos/load-fs-vtable.c:978
+msgid "Commit succeeded, but post-commit hook failed"
+msgstr ""
+
+#: ../libsvn_repos/delta.c:192
+msgid "Unable to open root of edit"
+msgstr ""
+
+#: ../libsvn_repos/delta.c:247
+msgid "Invalid target path"
+msgstr ""
+
+#: ../libsvn_repos/delta.c:251
+msgid "Delta depth 'exclude' not supported"
+msgstr ""
+
+#: ../libsvn_repos/delta.c:277
+msgid ""
+"Invalid editor anchoring; at least one of the input paths is not a directory "
+"and there was no source entry"
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:614 ../svnadmin/svnadmin.c:780
+#, c-format
+msgid "* Dumped revision %ld.\n"
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:620 ../svnadmin/svnadmin.c:786
+#, c-format
+msgid "* Verified revision %ld.\n"
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:628 ../svnadmin/svnadmin.c:834
+#, c-format
+msgid ""
+"\n"
+"------- Committed revision %ld >>>\n"
+"\n"
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:634 ../svnadmin/svnadmin.c:840
+#, c-format
+msgid ""
+"\n"
+"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
+"\n"
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:853
+#, c-format
+msgid " * editing path : %s ..."
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:859
+#, c-format
+msgid " * deleting path : %s ..."
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:659 ../svnadmin/svnadmin.c:865
+#, c-format
+msgid " * adding path : %s ..."
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:665 ../svnadmin/svnadmin.c:871
+#, c-format
+msgid " * replacing path : %s ..."
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:675 ../svnadmin/svnadmin.c:881
+msgid " done.\n"
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:685 ../svnadmin/svnadmin.c:891
+#, c-format
+msgid "<<< Started new transaction, based on original revision %ld\n"
+msgstr ""
+
+#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:904
+#, c-format
+msgid " removing '\\r' from %s ..."
+msgstr ""
+
+#: ../libsvn_repos/dump.c:248
+#, c-format
+msgid ""
+"Mergeinfo referencing revision(s) prior to the oldest dumped revision (r"
+"%ld). Loading this dump may result in invalid mergeinfo."
+msgstr ""
+
+#: ../libsvn_repos/dump.c:310
+#, c-format
+msgid "E%06d: While validating fspath '%s': %s"
+msgstr ""
+
+#: ../libsvn_repos/dump.c:432
+#, c-format
+msgid ""
+"Referencing data in revision %ld, which is older than the oldest dumped "
+"revision (r%ld). Loading this dump into an empty repository will fail."
+msgstr ""
+
+#: ../libsvn_repos/dump.c:1148 ../libsvn_repos/dump.c:1440
+#, c-format
+msgid "Start revision %ld is greater than end revision %ld"
+msgstr ""
+
+#: ../libsvn_repos/dump.c:1153 ../libsvn_repos/dump.c:1445
+#, c-format
+msgid "End revision %ld is invalid (youngest revision is %ld)"
+msgstr ""
+
+#: ../libsvn_repos/dump.c:1291
+msgid ""
+"The range of revisions dumped contained references to copy sources outside "
+"that range."
+msgstr ""
+
+#: ../libsvn_repos/dump.c:1305
+msgid ""
+"The range of revisions dumped contained mergeinfo which reference revisions "
+"outside that range."
+msgstr ""
+
+#: ../libsvn_repos/dump.c:1364
+#, c-format
+msgid "Unexpected node kind %d for '%s'"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:194
+#, c-format
+msgid ""
+"Storage of non-regular property '%s' is disallowed through the repository "
+"interface, and could indicate a bug in your client"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:209
+#, c-format
+msgid "Cannot accept '%s' property because it is not encoded in UTF-8"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:219
+#, c-format
+msgid "Cannot accept non-LF line endings in '%s' property"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:260
+#, c-format
+msgid ""
+"Commit rejected because mergeinfo on '%s' contains unexpected string "
+"terminator"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:267
+#, c-format
+msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:397
+#, c-format
+msgid "Write denied: not authorized to read all of revision %ld"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:581
+#, c-format
+msgid "Cannot unlock path '%s', no authenticated username available"
+msgstr ""
+
+#: ../libsvn_repos/fs-wrap.c:597
+msgid "Unlock succeeded, but post-unlock hook failed"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:92
+#, c-format
+msgid "'%s' hook succeeded, but error output could not be read"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:107
+msgid "[Error output could not be translated from the native locale to UTF-8.]"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:112
+msgid "[Error output could not be read.]"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:121
+#, c-format
+msgid ""
+"'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was "
+"%d). "
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:130
+msgid "Commit"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:132
+msgid "Revprop change"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:134
+msgid "Lock"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:136
+msgid "Unlock"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:141
+#, c-format
+msgid "%s hook failed (exit code %d)"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:145
+#, c-format
+msgid "%s blocked by %s hook (exit code %d)"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:152
+msgid " with output:\n"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:158
+msgid " with no output."
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:233
+#, c-format
+msgid "Can't create null stdout for hook '%s'"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:260
+#, c-format
+msgid "Failed to start '%s' hook"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:282
+#, c-format
+msgid "Error closing null file"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:446
+#, c-format
+msgid "Failed to run '%s' hook; broken symlink"
+msgstr ""
+
+#: ../libsvn_repos/hooks.c:664
+msgid ""
+"Repository has not been enabled to accept revision propchanges;\n"
+"ask the administrator to create a pre-revprop-change hook"
+msgstr ""
+
+#: ../libsvn_repos/load-fs-vtable.c:565 ../svnrdump/load_editor.c:766
+#, c-format
+msgid "Relative source revision %ld is not available in current repository"
+msgstr ""
+
+#: ../libsvn_repos/load-fs-vtable.c:579
+#, c-format
+msgid ""
+"Copy source checksum mismatch on copy from '%s'@%ld\n"
+"to '%s' in rev based on r%ld"
+msgstr ""
+
+#: ../libsvn_repos/load-fs-vtable.c:638
+msgid "Malformed dumpstream: Revision 0 must not contain node records"
+msgstr ""
+
+#: ../libsvn_repos/load-fs-vtable.c:654
+#, c-format
+msgid "Unrecognized node-action on node '%s'"
+msgstr ""
+
+#: ../libsvn_repos/load.c:54
+msgid "Premature end of content data in dumpstream"
+msgstr ""
+
+#: ../libsvn_repos/load.c:61
+msgid "Dumpstream data appears to be malformed"
+msgstr ""
+
+#: ../libsvn_repos/load.c:110
+#, c-format
+msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
+msgstr ""
+
+#: ../libsvn_repos/load.c:123
+#, c-format
+msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
+msgstr ""
+
+#: ../libsvn_repos/load.c:212
+msgid "Incomplete or unterminated property block"
+msgstr ""
+
+#: ../libsvn_repos/load.c:360
+msgid "Unexpected EOF writing contents"
+msgstr ""
+
+#: ../libsvn_repos/load.c:390
+#, c-format
+msgid "Malformed dumpfile header '%s'"
+msgstr ""
+
+#: ../libsvn_repos/load.c:397
+#, c-format
+msgid "Unsupported dumpfile version: %d"
+msgstr ""
+
+#: ../libsvn_repos/load.c:538
+msgid "Unrecognized record type in stream"
+msgstr ""
+
+#: ../libsvn_repos/load.c:645
+msgid "Sum of subblock sizes larger than total block content length"
+msgstr ""
+
+#: ../libsvn_repos/node_tree.c:244
+#, c-format
+msgid "'%s' not found in filesystem"
+msgstr ""
+
+#: ../libsvn_repos/replay.c:546 ../libsvn_repos/replay.c:1267
+#, c-format
+msgid "Filesystem path '%s' is neither a file nor a directory"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:205
+#, c-format
+msgid "Invalid length (%%%s) when about to read a string"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:270
+#, c-format
+msgid "Invalid depth (%c) for path '%s'"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:951
+#, c-format
+msgid "Working copy path '%s' does not exist in repository"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1355
+msgid "Not authorized to open root of edit operation"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1372
+#, c-format
+msgid "Target path '%s' does not exist"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1380
+msgid "Cannot replace a directory from within"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1420
+msgid "Invalid report for top level of working copy"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1435
+msgid "Two top-level reports with no target"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1497
+#, c-format
+msgid "Unsupported report depth '%s'"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1527
+msgid "Depth 'exclude' not supported for link"
+msgstr ""
+
+#: ../libsvn_repos/reporter.c:1584
+msgid "Request depth 'exclude' not supported"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:188
+#, c-format
+msgid "'%s' exists and is non-empty"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:234
+msgid "Creating db logs lock file"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:252
+msgid "Creating db lock file"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:262
+msgid "Creating lock dir"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:291
+msgid "Creating hook directory"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:373
+msgid "Creating start-commit hook"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:465
+msgid "Creating pre-commit hook"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:543
+msgid "Creating pre-revprop-change hook"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:783
+msgid "Creating post-commit hook"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:975
+msgid "Creating post-revprop-change hook"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:987
+msgid "Creating conf directory"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1071
+msgid "Creating svnserve.conf file"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1089
+msgid "Creating passwd file"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1131
+msgid "Creating authz file"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1161
+msgid "Creating hooks-env file"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1217
+msgid "Could not create top-level directory"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1227
+msgid "Creating DAV sandbox dir"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1296
+msgid "Error opening db lockfile"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1333
+#, c-format
+msgid "'%s' is an existing repository"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1337
+#, c-format
+msgid "'%s' is a subdirectory of an existing repository rooted at '%s'"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1345
+msgid "Repository creation failed"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1430
+#, c-format
+msgid "Expected repository format '%d' or '%d'; found format '%d'"
+msgstr ""
+
+#: ../libsvn_repos/repos.c:1674
+#, c-format
+msgid "unknown capability '%s'"
+msgstr ""
+
+#: ../libsvn_repos/rev_hunt.c:71
+#, c-format
+msgid "Failed to find time on revision %ld"
+msgstr ""
+
+#: ../libsvn_repos/rev_hunt.c:210 ../libsvn_repos/rev_hunt.c:325
+#, c-format
+msgid "Invalid start revision %ld"
+msgstr ""
+
+#: ../libsvn_repos/rev_hunt.c:518
+msgid "Unreadable path encountered; access denied"
+msgstr ""
+
+#: ../libsvn_repos/rev_hunt.c:1156 ../libsvn_repos/rev_hunt.c:1495
+#, c-format
+msgid "'%s' is not a file in revision %ld"
+msgstr ""
+
+#: ../libsvn_subr/auth.c:223
+#, c-format
+msgid "No provider registered for '%s' credentials"
+msgstr ""
+
+#: ../libsvn_subr/cache-membuffer.c:496
+#, c-format
+msgid "Can't lock cache mutex"
+msgstr ""
+
+#: ../libsvn_subr/cache-membuffer.c:527 ../libsvn_subr/cache-membuffer.c:543
+#, c-format
+msgid "Can't write-lock cache mutex"
+msgstr ""
+
+#: ../libsvn_subr/cache-membuffer.c:562
+#, c-format
+msgid "Can't unlock cache mutex"
+msgstr ""
+
+#: ../libsvn_subr/cache-membuffer.c:1299
+#, c-format
+msgid "Can't create cache mutex"
+msgstr ""
+
+#: ../libsvn_subr/cache-membuffer.c:2034
+msgid "Can't iterate a membuffer-based cache"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:170
+#, c-format
+msgid "Unknown memcached error while reading"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:238
+#, c-format
+msgid "Unknown memcached error while writing"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:344
+msgid "Can't iterate a memcached cache"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:444
+#, c-format
+msgid "Error parsing memcache server '%s'"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:452
+#, c-format
+msgid "Scope not allowed in memcache server '%s'"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:460
+#, c-format
+msgid "Must specify host and port for memcache server '%s'"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:480
+#, c-format
+msgid "Unknown error creating memcache server"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:488
+#, c-format
+msgid "Unknown error adding server to memcache"
+msgstr ""
+
+#: ../libsvn_subr/cache-memcache.c:561
+#, c-format
+msgid "Unknown error creating apr_memcache_t"
+msgstr ""
+
+#: ../libsvn_subr/checksum.c:470
+#, c-format
+msgid ""
+"%s:\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:655
+#, c-format
+msgid "Error initializing command line arguments"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:744
+msgid "Invalid syntax of argument of --config-option"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:771
+#, c-format
+msgid "Unrecognized file in argument of %s"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1017
+msgid ""
+"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
+"time configuration option is empty or consists solely of whitespace. "
+"Expected a shell command."
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1024
+msgid ""
+"None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and "
+"no 'editor-cmd' run-time configuration option was found"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1049 ../libsvn_subr/cmdline.c:1133
+#, c-format
+msgid "Can't get working directory"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1060 ../libsvn_subr/cmdline.c:1144
+#: ../libsvn_subr/cmdline.c:1169
+#, c-format
+msgid "Can't change working directory to '%s'"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1068 ../libsvn_subr/cmdline.c:1316
+#, c-format
+msgid "Can't restore working directory"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1075 ../libsvn_subr/cmdline.c:1251
+#, c-format
+msgid "system('%s') returned %d"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1196
+#, c-format
+msgid "Can't write to '%s'"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1211 ../libsvn_subr/cmdline.c:1226
+#: ../libsvn_subr/cmdline.c:1260 ../libsvn_subr/io.c:3616
+#, c-format
+msgid "Can't stat '%s'"
+msgstr ""
+
+#: ../libsvn_subr/cmdline.c:1285
+msgid "Error normalizing edited contents to internal format"
+msgstr ""
+
+#: ../libsvn_subr/config.c:739
+#, c-format
+msgid "Config error: invalid boolean value '%s' for '[%s] %s'"
+msgstr ""
+
+#: ../libsvn_subr/config.c:744
+#, c-format
+msgid "Config error: invalid boolean value '%s' for '%s'"
+msgstr ""
+
+#: ../libsvn_subr/config.c:1173
+#, c-format
+msgid "Config error: invalid integer value '%s'"
+msgstr ""
+
+#: ../libsvn_subr/config_auth.c:100
+msgid "Unable to open auth file for reading"
+msgstr ""
+
+#: ../libsvn_subr/config_auth.c:105
+#, c-format
+msgid "Error parsing '%s'"
+msgstr ""
+
+#: ../libsvn_subr/config_auth.c:135
+msgid "Unable to locate auth file"
+msgstr ""
+
+#: ../libsvn_subr/config_auth.c:146
+msgid "Unable to open auth file for writing"
+msgstr ""
+
+#: ../libsvn_subr/config_auth.c:150
+#, c-format
+msgid "Error writing hash to '%s'"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:93
+#, c-format
+msgid "Failed to initialize cryptography subsystem"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:108
+#, c-format
+msgid "code (%d), reason (\"%s\"), msg (\"%s\")"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:134
+#, c-format
+msgid "Fetching error from APR"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:154
+#, c-format
+msgid "Error obtaining random data"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:224
+msgid "OpenSSL crypto driver error"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:228
+msgid "Bad return value while loading crypto driver"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:234
+msgid "Error creating OpenSSL crypto context"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:291 ../libsvn_subr/crypto.c:294
+#: ../libsvn_subr/crypto.c:419 ../libsvn_subr/crypto.c:422
+#: ../libsvn_subr/crypto.c:526 ../libsvn_subr/crypto.c:529
+#: ../libsvn_subr/crypto.c:641 ../libsvn_subr/crypto.c:644
+msgid "Error creating derived key"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:297 ../libsvn_subr/crypto.c:425
+#: ../libsvn_subr/crypto.c:532 ../libsvn_subr/crypto.c:647
+msgid "Unexpected IV length returned"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:308 ../libsvn_subr/crypto.c:543
+msgid "Error initializing block encryption"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:347 ../libsvn_subr/crypto.c:444
+#: ../libsvn_subr/crypto.c:565 ../libsvn_subr/crypto.c:666
+msgid "Error fetching result length"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:360 ../libsvn_subr/crypto.c:578
+msgid "Error during block encryption"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:372 ../libsvn_subr/crypto.c:590
+msgid "Error finalizing block encryption"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:428 ../libsvn_subr/crypto.c:650
+msgid "Provided IV has incorrect length"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:436 ../libsvn_subr/crypto.c:658
+msgid "Error initializing block decryption"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:455 ../libsvn_subr/crypto.c:677
+msgid "Error during block decryption"
+msgstr ""
+
+#: ../libsvn_subr/crypto.c:464 ../libsvn_subr/crypto.c:686
+msgid "Error finalizing block decryption"
+msgstr ""
+
+#: ../libsvn_subr/date.c:307
+#, c-format
+msgid "Can't manipulate current date"
+msgstr ""
+
+#: ../libsvn_subr/date.c:381 ../libsvn_subr/date.c:389
+#, c-format
+msgid "Can't calculate requested date"
+msgstr ""
+
+#: ../libsvn_subr/date.c:384
+#, c-format
+msgid "Can't expand time"
+msgstr ""
+
+#: ../libsvn_subr/deprecated.c:361 ../libsvn_subr/opt.c:302
+msgid ""
+"\n"
+"Valid options:\n"
+msgstr ""
+
+#: ../libsvn_subr/deprecated.c:437 ../libsvn_subr/opt.c:417
+#, c-format
+msgid ""
+"\"%s\": unknown command.\n"
+"\n"
+msgstr ""
+
+#: ../libsvn_subr/deprecated.c:615 ../libsvn_subr/opt.c:1239
+#: ../svnrdump/svnrdump.c:646
+#, c-format
+msgid "Type '%s help' for usage.\n"
+msgstr ""
+
+#: ../libsvn_subr/deprecated.c:1023
+#, c-format
+msgid "'%s' is neither a file nor a directory name"
+msgstr ""
+
+#: ../libsvn_subr/dirent_uri.c:1605
+#, c-format
+msgid "Couldn't determine absolute path of '%s'"
+msgstr ""
+
+#: ../libsvn_subr/dirent_uri.c:2314
+#, c-format
+msgid "Local URL '%s' does not contain 'file://' prefix"
+msgstr ""
+
+#: ../libsvn_subr/dirent_uri.c:2393
+#, c-format
+msgid "Local URL '%s' contains only a hostname, no path"
+msgstr ""
+
+#: ../libsvn_subr/dirent_uri.c:2407
+#, c-format
+msgid "Local URL '%s' contains unsupported hostname"
+msgstr ""
+
+#: ../libsvn_subr/error.c:263
+msgid "Additional errors:"
+msgstr ""
+
+#: ../libsvn_subr/error.c:524
+msgid "Can't recode error string from APR"
+msgstr ""
+
+#: ../libsvn_subr/error.c:624
+#, c-format
+msgid "%swarning: W%06d: %s\n"
+msgstr ""
+
+#: ../libsvn_subr/error.c:706
+#, c-format
+msgid "In file '%s' line %d: assertion failed (%s)"
+msgstr ""
+
+#: ../libsvn_subr/error.c:710
+#, c-format
+msgid "In file '%s' line %d: internal malfunction"
+msgstr ""
+
+#: ../libsvn_subr/error.c:766
+msgid "stream error"
+msgstr ""
+
+#: ../libsvn_subr/error.c:771
+msgid "out of memory"
+msgstr ""
+
+#: ../libsvn_subr/error.c:776
+msgid "buffer error"
+msgstr ""
+
+#: ../libsvn_subr/error.c:781
+msgid "version error"
+msgstr ""
+
+#: ../libsvn_subr/error.c:786
+msgid "corrupt data"
+msgstr ""
+
+#: ../libsvn_subr/error.c:791
+msgid "unknown error"
+msgstr ""
+
+#: ../libsvn_subr/gpg_agent.c:358 ../libsvn_subr/prompt.c:631
+#, c-format
+msgid "Password for '%s': "
+msgstr ""
+
+#: ../libsvn_subr/gpg_agent.c:359
+#, c-format
+msgid "Enter your Subversion password for %s"
+msgstr ""
+
+#: ../libsvn_subr/hash.c:120
+msgid "Serialized hash missing terminator"
+msgstr ""
+
+#: ../libsvn_subr/hash.c:129 ../libsvn_subr/hash.c:142
+#: ../libsvn_subr/hash.c:153 ../libsvn_subr/hash.c:165
+#: ../libsvn_subr/hash.c:173 ../libsvn_subr/hash.c:183
+#: ../libsvn_subr/hash.c:196 ../libsvn_subr/hash.c:204
+msgid "Serialized hash malformed"
+msgstr ""
+
+#: ../libsvn_subr/hash.c:244
+msgid "Cannot serialize negative length"
+msgstr ""
+
+#: ../libsvn_subr/io.c:309
+#, c-format
+msgid "Can't check path '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:537 ../libsvn_subr/io.c:4558
+#, c-format
+msgid "Can't open '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:563 ../libsvn_subr/io.c:649
+#, c-format
+msgid "Unable to make name for '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:636
+#, c-format
+msgid "Can't create symbolic link '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:653 ../libsvn_subr/io.c:686 ../libsvn_subr/io.c:714
+msgid "Symbolic links are not supported on this platform"
+msgstr ""
+
+#: ../libsvn_subr/io.c:676
+#, c-format
+msgid "Can't read contents of link"
+msgstr ""
+
+#: ../libsvn_subr/io.c:734
+#, c-format
+msgid "Can't find a temporary directory"
+msgstr ""
+
+#: ../libsvn_subr/io.c:852
+#, c-format
+msgid "Can't copy '%s' to '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:895 ../libsvn_subr/io.c:917 ../libsvn_subr/io.c:963
+#, c-format
+msgid "Can't set permissions on '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:913 ../libsvn_subr/io.c:1984 ../libsvn_subr/io.c:2043
+#: ../libsvn_subr/io.c:4596
+#, c-format
+msgid "Can't get file name"
+msgstr ""
+
+#: ../libsvn_subr/io.c:987
+#, c-format
+msgid "Can't append '%s' to '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:1033
+#, c-format
+msgid "Destination '%s' already exists"
+msgstr ""
+
+#: ../libsvn_subr/io.c:1137
+#, c-format
+msgid "Can't make directory '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:1206
+#, c-format
+msgid "Can't set access time of '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:1535 ../libsvn_subr/io.c:1637
+#, c-format
+msgid "Can't change perms of file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:1803
+#, c-format
+msgid "Can't set file '%s' read-only"
+msgstr ""
+
+#: ../libsvn_subr/io.c:1835
+#, c-format
+msgid "Can't set file '%s' read-write"
+msgstr ""
+
+#: ../libsvn_subr/io.c:1874 ../libsvn_subr/io.c:1908
+#, c-format
+msgid "Error getting UID of process"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2010
+#, c-format
+msgid "Can't get shared lock on file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2048
+#, c-format
+msgid "Can't unlock file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2103 ../libsvn_subr/io.c:3511
+#, c-format
+msgid "Can't flush file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2104 ../libsvn_subr/io.c:3512
+#, c-format
+msgid "Can't flush stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2116 ../libsvn_subr/io.c:2133
+#, c-format
+msgid "Can't flush file to disk"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2225 ../libsvn_subr/prompt.c:197
+#: ../svnserve/svnserve.c:822
+#, c-format
+msgid "Can't open stdin"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2245
+msgid "Reading from stdin is disallowed"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2312
+#, c-format
+msgid "Can't remove file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2399
+#, c-format
+msgid "Can't remove '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2562
+#, c-format
+msgid "Path '%s' not found, case obstructed by '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2601
+#, c-format
+msgid "Path '%s' not found"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2675
+#, c-format
+msgid "Can't create process '%s' attributes"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2682
+#, c-format
+msgid "Can't set process '%s' cmdtype"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2694
+#, c-format
+msgid "Can't set process '%s' directory"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2708
+#, c-format
+msgid "Can't set process '%s' child input"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2716
+#, c-format
+msgid "Can't set process '%s' child outfile"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2724
+#, c-format
+msgid "Can't set process '%s' child errfile"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2738
+#, c-format
+msgid "Can't set process '%s' stdio pipes"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2746
+#, c-format
+msgid "Can't set process '%s' child errfile for error handler"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2753
+#, c-format
+msgid "Can't set process '%s' error handler"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2776
+#, c-format
+msgid "Can't start process '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2800
+#, c-format
+msgid "Error waiting for process '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2809
+#, c-format
+msgid "Process '%s' failed (signal %d, core dumped)"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2814
+#, c-format
+msgid "Process '%s' failed (signal %d)"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2820
+#, c-format
+msgid "Process '%s' failed (exitwhy %d, exitcode %d)"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2828
+#, c-format
+msgid "Process '%s' returned error exitcode %d"
+msgstr ""
+
+#: ../libsvn_subr/io.c:2935
+#, c-format
+msgid "'%s' returned %d"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3055
+#, c-format
+msgid ""
+"Error running '%s': exitcode was %d, args were:\n"
+"in directory '%s', basenames:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3196
+#, c-format
+msgid "Can't detect MIME type of non-file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3291
+#, c-format
+msgid "Can't open file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3331
+#, c-format
+msgid "Can't close file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3332
+#, c-format
+msgid "Can't close stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3341 ../libsvn_subr/io.c:3377 ../libsvn_subr/io.c:3402
+#, c-format
+msgid "Can't read file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3342 ../libsvn_subr/io.c:3378 ../libsvn_subr/io.c:3403
+#, c-format
+msgid "Can't read stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3351
+#, c-format
+msgid "Can't write file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3352
+#, c-format
+msgid "Can't write stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3366
+#, c-format
+msgid "Can't get attribute information from file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3367
+#, c-format
+msgid "Can't get attribute information from stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3414
+#, c-format
+msgid "Can't set position pointer in file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3415
+#, c-format
+msgid "Can't set position pointer in stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3426 ../libsvn_subr/io.c:3473
+#, c-format
+msgid "Can't write to file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3427 ../libsvn_subr/io.c:3474
+#, c-format
+msgid "Can't write to stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3516
+#, c-format
+msgid "Can't truncate file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3517
+#, c-format
+msgid "Can't truncate stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3590
+#, c-format
+msgid "Can't read length line in file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3594
+msgid "Can't read length line in stream"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3651
+#, c-format
+msgid "Can't move '%s' to '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3732
+#, c-format
+msgid "Can't create directory '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3755
+#, c-format
+msgid "Can't hide directory '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3815 ../libsvn_subr/io.c:3938
+#, c-format
+msgid "Can't open directory '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3850
+#, c-format
+msgid "Can't remove directory '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3868
+#, c-format
+msgid "Can't read directory"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3888
+#, c-format
+msgid "Error closing directory"
+msgstr ""
+
+#: ../libsvn_subr/io.c:3957
+#, c-format
+msgid "Can't read directory entry in '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:4083
+#, c-format
+msgid "Can't check directory '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:4145
+#, c-format
+msgid "Reading '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:4164
+#, c-format
+msgid "First line of '%s' contains non-digit"
+msgstr ""
+
+#: ../libsvn_subr/io.c:4479
+#, c-format
+msgid "Can't create temporary file from template '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:4568
+#, c-format
+msgid "Can't set aside '%s'"
+msgstr ""
+
+#: ../libsvn_subr/io.c:4580
+#, c-format
+msgid "Unable to make name in '%s'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:100 ../libsvn_subr/mergeinfo.c:677
+msgid "Pathname not terminated by ':'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:103
+msgid "No pathname preceding ':'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:521
+#, c-format
+msgid "Invalid character '%c' found in revision list"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:529
+#, c-format
+msgid "Invalid revision number '0' found in range list"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:540
+#, c-format
+msgid "Unable to parse reversed revision range '%ld-%ld'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:545
+#, c-format
+msgid ""
+"Unable to parse revision range '%ld-%ld' with same start and end revisions"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:582 ../libsvn_subr/mergeinfo.c:589
+#, c-format
+msgid "Invalid character '%c' found in range list"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:596
+msgid "Range list parsing ended before hitting newline"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:637
+#, c-format
+msgid ""
+"Unable to parse overlapping revision ranges '%s' and '%s' with different "
+"inheritance types"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:685
+#, c-format
+msgid "Mergeinfo for '%s' maps to an empty revision range"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:689
+#, c-format
+msgid "Could not find end of line in range list line in '%s'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:753
+#, c-format
+msgid "Could not parse mergeinfo string '%s'"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:2301
+msgid "NULL mergeinfo catalog\n"
+msgstr ""
+
+#: ../libsvn_subr/mergeinfo.c:2306
+msgid "empty mergeinfo catalog\n"
+msgstr ""
+
+#: ../libsvn_subr/mutex.c:45
+#, c-format
+msgid "Can't create mutex"
+msgstr ""
+
+#: ../libsvn_subr/mutex.c:62
+#, c-format
+msgid "Can't lock mutex"
+msgstr ""
+
+#: ../libsvn_subr/mutex.c:78
+#, c-format
+msgid "Can't unlock mutex"
+msgstr ""
+
+#: ../libsvn_subr/named_atomic.c:335
+msgid "Not a valid atomic"
+msgstr ""
+
+#: ../libsvn_subr/named_atomic.c:474
+#, c-format
+msgid "MMAP failed for file '%s'"
+msgstr ""
+
+#: ../libsvn_subr/named_atomic.c:486
+msgid "Number of atomics in namespace is too large."
+msgstr ""
+
+#: ../libsvn_subr/named_atomic.c:537
+msgid "Atomic's name is too long."
+msgstr ""
+
+#: ../libsvn_subr/named_atomic.c:543
+msgid "Namespace has not been initialized."
+msgstr ""
+
+#: ../libsvn_subr/named_atomic.c:591
+msgid "Out of slots for named atomic."
+msgstr ""
+
+#: ../libsvn_subr/nls.c:80
+#, c-format
+msgid "Can't convert string to UCS-2: '%s'"
+msgstr ""
+
+#: ../libsvn_subr/nls.c:87
+msgid "Can't get module file name"
+msgstr ""
+
+#: ../libsvn_subr/nls.c:102
+#, c-format
+msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:189
+msgid " ARG"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:324
+msgid ""
+"\n"
+"Global options:\n"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:818
+#, c-format
+msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:824
+#, c-format
+msgid "Syntax error parsing peg revision '%s'"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:961
+msgid "Revision property pair is empty"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:981 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:336
+#: ../svn/propset-cmd.c:68
+#, c-format
+msgid "'%s' is not a valid Subversion property name"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1018
+#, c-format
+msgid "'%s' is just a peg revision. Maybe try '%s@' instead?"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1064
+#, c-format
+msgid "URL '%s' contains a '..' element"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1097
+#, c-format
+msgid "Error resolving case of '%s'"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1119
+#, c-format
+msgid ""
+"%s, version %s\n"
+" compiled %s, %s on %s\n"
+"\n"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1136
+msgid ""
+"System information:\n"
+"\n"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1137
+#, c-format
+msgid "* running on %s\n"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1141
+#, c-format
+msgid " - %s\n"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1151
+msgid "* linked dependencies:\n"
+msgstr ""
+
+#: ../libsvn_subr/opt.c:1176
+msgid "* loaded shared libraries:\n"
+msgstr ""
+
+#: ../libsvn_subr/path.c:1114
+#, c-format
+msgid "Can't determine the native path encoding"
+msgstr ""
+
+#: ../libsvn_subr/path.c:1303
+#, c-format
+msgid "Improper relative URL '%s'"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:147
+msgid "Can't close terminal"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:200
+#, c-format
+msgid "Can't open stderr"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:263
+#, c-format
+msgid "Can't write to terminal"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:385 ../libsvn_subr/prompt.c:472
+#, c-format
+msgid "Can't read from terminal"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:540
+msgid "End of file while reading from terminal"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:602
+#, c-format
+msgid "Authentication realm: %s\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:629 ../libsvn_subr/prompt.c:652
+msgid "Username: "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:674
+#, c-format
+msgid "Error validating server certificate for '%s':\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:680
+msgid ""
+" - The certificate is not issued by a trusted authority. Use the\n"
+" fingerprint to validate the certificate manually!\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:687
+msgid " - The certificate hostname does not match.\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:693
+msgid " - The certificate is not yet valid.\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:699
+msgid " - The certificate has expired.\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:705
+msgid " - The certificate has an unknown error.\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:710
+#, c-format
+msgid ""
+"Certificate information:\n"
+" - Hostname: %s\n"
+" - Valid: from %s until %s\n"
+" - Issuer: %s\n"
+" - Fingerprint: %s\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:725
+msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:729
+msgid "(R)eject or accept (t)emporarily? "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:769
+msgid "Client certificate filename: "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:793
+#, c-format
+msgid "Passphrase for '%s': "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:845
+msgid "yes"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:846
+msgid "y"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:851
+msgid "no"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:852
+msgid "n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:858
+msgid "Please type 'yes' or 'no': "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:872
+msgid "Store password unencrypted (yes/no)? "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:874
+#, c-format
+msgid ""
+"\n"
+"-----------------------------------------------------------------------\n"
+"ATTENTION! Your password for authentication realm:\n"
+"\n"
+" %s\n"
+"\n"
+"can only be stored to disk unencrypted! You are advised to configure\n"
+"your system so that Subversion can store passwords encrypted, if\n"
+"possible. See the documentation for details.\n"
+"\n"
+"You can avoid future appearances of this warning by setting the value\n"
+"of the 'store-plaintext-passwords' option to either 'yes' or 'no' in\n"
+"'%s'.\n"
+"-----------------------------------------------------------------------\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:901
+msgid "Store passphrase unencrypted (yes/no)? "
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:903
+#, c-format
+msgid ""
+"\n"
+"-----------------------------------------------------------------------\n"
+"ATTENTION! Your passphrase for client certificate:\n"
+"\n"
+" %s\n"
+"\n"
+"can only be stored to disk unencrypted! You are advised to configure\n"
+"your system so that Subversion can store passphrase encrypted, if\n"
+"possible. See the documentation for details.\n"
+"\n"
+"You can avoid future appearances of this warning by setting the value\n"
+"of the 'store-ssl-client-cert-pp-plaintext' option to either 'yes' or\n"
+"'no' in '%s'.\n"
+"-----------------------------------------------------------------------\n"
+msgstr ""
+
+#: ../libsvn_subr/prompt.c:949
+#, c-format
+msgid "Password for '%s' GNOME keyring: "
+msgstr ""
+
+#: ../libsvn_subr/simple_providers.c:449
+#: ../libsvn_subr/ssl_client_cert_pw_providers.c:296
+#, c-format
+msgid "Config error: invalid value '%s' for option '%s'"
+msgstr ""
+
+#: ../libsvn_subr/sqlite.c:176
+#, c-format
+msgid "sqlite[S%d]: %s, executing statement '%s'"
+msgstr ""
+
+#: ../libsvn_subr/sqlite.c:265
+msgid "sqlite: Expected database row missing"
+msgstr ""
+
+#: ../libsvn_subr/sqlite.c:266
+msgid "sqlite: Extra database row found"
+msgstr ""
+
+#: ../libsvn_subr/sqlite.c:726
+#, c-format
+msgid "SQLite compiled for %s, but running with %s"
+msgstr ""
+
+#: ../libsvn_subr/sqlite.c:738
+msgid "SQLite is required to be compiled and run in thread-safe mode"
+msgstr ""
+
+#: ../libsvn_subr/sqlite.c:747
+#, c-format
+msgid "Could not configure SQLite [S%d]"
+msgstr ""
+
+#: ../libsvn_subr/sqlite.c:749
+msgid "Could not initialize SQLite"
+msgstr ""
+
+#: ../libsvn_subr/sqlite.c:1219
+#, c-format
+msgid "SQLite hotcopy failed for %s"
+msgstr ""
+
+#: ../libsvn_subr/string.c:943 ../libsvn_subr/string.c:987
+#, c-format
+msgid "Could not convert '%s' into a number"
+msgstr ""
+
+#: ../libsvn_subr/subst.c:1803 ../libsvn_wc/props.c:1660
+#, c-format
+msgid "File '%s' has inconsistent newlines"
+msgstr ""
+
+#: ../libsvn_subr/sysinfo.c:1106
+msgid "Intel"
+msgstr ""
+
+#: ../libsvn_subr/sysinfo.c:1107
+msgid "Intel 64-bit"
+msgstr ""
+
+#: ../libsvn_subr/sysinfo.c:1108
+msgid "PowerPC"
+msgstr ""
+
+#: ../libsvn_subr/sysinfo.c:1109
+msgid "PowerPC 64-bit"
+msgstr ""
+
+#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
+#: ../libsvn_subr/time.c:85
+msgid " (%a, %d %b %Y)"
+msgstr ""
+
+#: ../libsvn_subr/token.c:66
+#, c-format
+msgid "Token '%s' is unrecognized"
+msgstr ""
+
+#: ../libsvn_subr/types.c:48
+#, c-format
+msgid "Invalid revision number found parsing '%s'"
+msgstr ""
+
+#: ../libsvn_subr/types.c:60
+#, c-format
+msgid "Negative revision number found parsing '%s'"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:245
+#, c-format
+msgid "Can't create a character converter from native encoding to '%s'"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:249
+#, c-format
+msgid "Can't create a character converter from '%s' to native encoding"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:253
+#, c-format
+msgid "Can't create a character converter from '%s' to '%s'"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:601
+#, c-format
+msgid "Can't convert string from native encoding to '%s':"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:605
+#, c-format
+msgid "Can't convert string from '%s' to native encoding:"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:609
+#, c-format
+msgid "Can't convert string from '%s' to '%s':"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:654
+#, c-format
+msgid ""
+"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
+"UTF-8"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:662
+#, c-format
+msgid ""
+"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
+msgstr ""
+
+#: ../libsvn_subr/utf.c:707
+#, c-format
+msgid ""
+"Valid UTF-8 data\n"
+"(hex:%s)\n"
+"followed by invalid UTF-8 sequence\n"
+"(hex:%s)"
+msgstr ""
+
+#: ../libsvn_subr/validate.c:56
+#, c-format
+msgid "MIME type '%s' has empty media type"
+msgstr ""
+
+#: ../libsvn_subr/validate.c:61
+#, c-format
+msgid "MIME type '%s' does not contain '/'"
+msgstr ""
+
+#: ../libsvn_subr/validate.c:73
+#, c-format
+msgid "MIME type '%s' contains invalid character '%c' in media type"
+msgstr ""
+
+#: ../libsvn_subr/validate.c:84
+#, c-format
+msgid "MIME type '%s' contains invalid character '0x%02x' in postfix"
+msgstr ""
+
+#: ../libsvn_subr/version.c:91
+#, c-format
+msgid "Version mismatch in '%s'%s: found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr ""
+
+#: ../libsvn_subr/version.c:96
+msgid " (expecting equality)"
+msgstr ""
+
+#: ../libsvn_subr/version.c:98
+msgid " (expecting compatibility)"
+msgstr ""
+
+#: ../libsvn_subr/version.c:139
+msgid ""
+"Copyright (C) 2014 The Apache Software Foundation.\n"
+"This software consists of contributions made by many people;\n"
+"see the NOTICE file for more information.\n"
+"Subversion is open source software, see http://subversion.apache.org/\n"
+msgstr ""
+
+#: ../libsvn_subr/version.c:217 ../libsvn_subr/version.c:228
+#: ../libsvn_subr/version.c:234 ../libsvn_subr/version.c:251
+#: ../libsvn_subr/version.c:258
+#, c-format
+msgid "Failed to parse version number string '%s'"
+msgstr ""
+
+#: ../libsvn_subr/xml.c:416
+#, c-format
+msgid "Malformed XML: %s at line %ld"
+msgstr ""
+
+#: ../libsvn_wc/adm_crawler.c:114
+#, c-format
+msgid "The existing node '%s' can not be restored."
+msgstr ""
+
+#: ../libsvn_wc/adm_crawler.c:133
+#, c-format
+msgid "The node '%s' can not be restored."
+msgstr ""
+
+#: ../libsvn_wc/adm_crawler.c:851
+msgid "Error aborting report"
+msgstr ""
+
+#: ../libsvn_wc/adm_crawler.c:963
+#, c-format
+msgid "Pristine checksum for file '%s' is missing"
+msgstr ""
+
+#: ../libsvn_wc/adm_crawler.c:1128
+#, c-format
+msgid "Checksum mismatch for text base of '%s'"
+msgstr ""
+
+#: ../libsvn_wc/adm_crawler.c:1139
+#, c-format
+msgid "While preparing '%s' for commit"
+msgstr ""
+
+#: ../libsvn_wc/adm_files.c:105
+#, c-format
+msgid "'%s' is not a valid administrative directory name"
+msgstr ""
+
+#: ../libsvn_wc/adm_files.c:185 ../libsvn_wc/adm_files.c:241
+#, c-format
+msgid "Can only get the pristine contents of files; '%s' is not a file"
+msgstr ""
+
+#: ../libsvn_wc/adm_files.c:194 ../libsvn_wc/adm_files.c:256
+#, c-format
+msgid ""
+"Cannot get the pristine contents of '%s' because its delete is already "
+"committed"
+msgstr ""
+
+#: ../libsvn_wc/adm_files.c:202 ../libsvn_wc/adm_files.c:264
+#, c-format
+msgid ""
+"Cannot get the pristine contents of '%s' because it has an unexpected status"
+msgstr ""
+
+#: ../libsvn_wc/adm_files.c:209
+#, c-format
+msgid "Node '%s' has no pristine text"
+msgstr ""
+
+#: ../libsvn_wc/adm_files.c:452
+#, c-format
+msgid "Revision %ld doesn't match existing revision %ld in '%s'"
+msgstr ""
+
+#: ../libsvn_wc/adm_files.c:489
+#, c-format
+msgid ""
+"URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'"
+msgstr ""
+
+#: ../libsvn_wc/adm_ops.c:602 ../libsvn_wc/update_editor.c:5281
+#, c-format
+msgid "Can't find parent directory's node while trying to add '%s'"
+msgstr ""
+
+#: ../libsvn_wc/adm_ops.c:611 ../libsvn_wc/update_editor.c:5275
+#, c-format
+msgid "Can't add '%s' to a parent directory scheduled for deletion"
+msgstr ""
+
+#: ../libsvn_wc/adm_ops.c:618 ../libsvn_wc/update_editor.c:5288
+#, c-format
+msgid "Can't schedule an addition of '%s' below a not-directory node"
+msgstr ""
+
+#: ../libsvn_wc/adm_ops.c:677
+#, c-format
+msgid "Can't create an entry with a reserved name while trying to add '%s'"
+msgstr ""
+
+#: ../libsvn_wc/adm_ops.c:881
+#, c-format
+msgid "The URL '%s' has a different repository root than its parent"
+msgstr ""
+
+#: ../libsvn_wc/adm_ops.c:899
+#, c-format
+msgid ""
+"Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' "
+"for addition under a working copy from repository '%s' with uuid '%s'."
+msgstr ""
+
+#: ../libsvn_wc/adm_ops.c:913
+#, c-format
+msgid "Can't add '%s' with URL '%s', but with the data from '%s'"
+msgstr ""
+
+#: ../libsvn_wc/cleanup.c:58
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr ""
+
+#: ../libsvn_wc/cleanup.c:64
+msgid "Log format too old, please use Subversion 1.6 or earlier"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:83
+msgid "Not a conflict skel"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:610 ../libsvn_wc/conflicts.c:707
+msgid "Not a completed conflict skel"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:788 ../libsvn_wc/conflicts.c:861
+#: ../libsvn_wc/conflicts.c:951
+msgid "Conflict not set"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:1438 ../libsvn_wc/conflicts.c:1790
+msgid "Conflict callback violated API: returned no results"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:1482
+msgid "Conflict callback violated API: returned no merged file"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:2468 ../libsvn_wc/conflicts.c:2644
+msgid "Invalid 'conflict_result' argument"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:2767 ../libsvn_wc/conflicts.c:2807
+#, c-format
+msgid ""
+"Tree conflict can only be resolved to 'working' or 'mine-conflict' state; "
+"'%s' not resolved"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:2822
+#, c-format
+msgid ""
+"Tree conflict can only be resolved to 'working' state; '%s' not resolved"
+msgstr ""
+
+#: ../libsvn_wc/conflicts.c:2924
+msgid "No conflict-callback and no pre-defined conflict-choice provided"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:86
+#, c-format
+msgid "Source '%s' is unexpected kind"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:410
+#, c-format
+msgid "cannot handle node kind for '%s'"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:432 ../libsvn_wc/wc_db.c:4507 ../libsvn_wc/wc_db.c:5082
+#, c-format
+msgid "Cannot handle status of '%s'"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:441 ../libsvn_wc/wc_db.c:4498 ../libsvn_wc/wc_db.c:5076
+#: ../libsvn_wc/wc_db.c:5321
+#, c-format
+msgid "Cannot copy '%s' excluded by server"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:578
+#, c-format
+msgid "Deleted node '%s' can't be copied."
+msgstr ""
+
+#: ../libsvn_wc/copy.c:596
+#, c-format
+msgid "'%s' is the root of a working copy and cannot be moved"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:604
+#, c-format
+msgid "'%s' represents the repository root and cannot be moved"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:673
+#, c-format
+msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:681
+#, c-format
+msgid "Cannot copy to '%s' as it is scheduled for deletion"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:709
+#, c-format
+msgid "'%s' is already under version control but is excluded."
+msgstr ""
+
+#: ../libsvn_wc/copy.c:724
+#, c-format
+msgid "There is already a versioned item '%s'"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:740
+#, c-format
+msgid "'%s' already exists and is in the way"
+msgstr ""
+
+#: ../libsvn_wc/copy.c:791
+#, c-format
+msgid ""
+"Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first"
+msgstr ""
+
+#: ../libsvn_wc/crop.c:208
+#, c-format
+msgid "Cannot exclude '%s': it is a working copy root"
+msgstr ""
+
+#: ../libsvn_wc/crop.c:216
+#, c-format
+msgid "Cannot exclude '%s': it is a switched path"
+msgstr ""
+
+#: ../libsvn_wc/crop.c:243
+#, c-format
+msgid ""
+"Cannot exclude '%s': it is to be added to the repository. Try commit instead"
+msgstr ""
+
+#: ../libsvn_wc/crop.c:250
+#, c-format
+msgid ""
+"Cannot exclude '%s': it is to be deleted from the repository. Try commit "
+"instead"
+msgstr ""
+
+#: ../libsvn_wc/crop.c:309
+msgid "Can only crop a working copy with a restrictive depth"
+msgstr ""
+
+#: ../libsvn_wc/crop.c:320
+msgid "Can only crop directories"
+msgstr ""
+
+#: ../libsvn_wc/crop.c:333
+#, c-format
+msgid ""
+"Cannot crop '%s': it is going to be removed from repository. Try commit "
+"instead"
+msgstr ""
+
+#: ../libsvn_wc/crop.c:340
+#, c-format
+msgid ""
+"Cannot crop '%s': it is to be added to the repository. Try commit instead"
+msgstr ""
+
+#: ../libsvn_wc/delete.c:237 ../libsvn_wc/delete.c:357
+#, c-format
+msgid "'%s' cannot be deleted"
+msgstr ""
+
+#: ../libsvn_wc/delete.c:255 ../libsvn_wc/delete.c:373
+#, c-format
+msgid "'%s' is the root of a working copy and cannot be deleted"
+msgstr ""
+
+#: ../libsvn_wc/delete.c:262 ../libsvn_wc/delete.c:379
+#, c-format
+msgid "'%s' represents the repository root and cannot be deleted"
+msgstr ""
+
+#: ../libsvn_wc/delete.c:476
+#, c-format
+msgid "File '%s' has local modifications"
+msgstr ""
+
+#: ../libsvn_wc/deprecated.c:2284
+#, c-format
+msgid "Unexpectedly found '%s': path is marked 'missing'"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:1044
+#, c-format
+msgid "'%s' is not a versioned working copy"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:1290
+#, c-format
+msgid "Admin area of '%s' is missing"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:1310
+#, c-format
+msgid "'%s' is not of the right kind"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:1507
+#, c-format
+msgid "The file '%s' has no checksum"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:1619
+#, c-format
+msgid "Unable to upgrade '%s' at line %d"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:1837
+#, c-format
+msgid "No copyfrom URL for '%s'"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:2051
+#, c-format
+msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; "
+msgstr ""
+
+#: ../libsvn_wc/entries.c:2398
+#, c-format
+msgid "No default entry in directory '%s'"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:2554
+#, c-format
+msgid "Directory '%s' has no THIS_DIR entry"
+msgstr ""
+
+#: ../libsvn_wc/entries.c:2735 ../libsvn_wc/node.c:528
+#, c-format
+msgid "'%s' has an unrecognized node kind"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:154 ../libsvn_wc/externals.c:232
+#, c-format
+msgid "Error parsing %s property on '%s': '%s'"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:202
+#, c-format
+msgid "Can't split line into components: '%s'"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:257
+#, c-format
+msgid ""
+"Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in "
+"an external; one must be a path where an absolute or relative URL is checked "
+"out to"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:266 ../libsvn_wc/externals.c:274
+#, c-format
+msgid ""
+"Invalid %s property on '%s': cannot use a URL '%s' as the target directory "
+"for an external definition"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:316
+#, c-format
+msgid ""
+"Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:491 ../libsvn_wc/externals.c:514
+#, c-format
+msgid "This editor can only update '%s'"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:529
+#, c-format
+msgid "Node '%s' is no existing file external"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:1517
+#, c-format
+msgid "URL '%s' does not begin with a scheme"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:1572
+#, c-format
+msgid "Illegal parent directory URL '%s'"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:1611
+#, c-format
+msgid "Illegal repository root URL '%s'"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:1656
+#, c-format
+msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
+msgstr ""
+
+#: ../libsvn_wc/externals.c:1684
+#, c-format
+msgid "Unrecognized format for the relative external URL '%s'"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:529
+#, c-format
+msgid "Path '%s' ends in '%s', which is unsupported for this operation"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:773 ../libsvn_wc/wc_db.c:14134
+#, c-format
+msgid "Working copy '%s' locked"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:918
+#, c-format
+msgid "Unable to check path existence for '%s'"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:941
+#, c-format
+msgid "Expected '%s' to be a directory but found a file"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:951
+#, c-format
+msgid "Can't retrieve an access baton for non-directory '%s'"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:960
+#, c-format
+msgid "Directory '%s' is missing"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:968
+#, c-format
+msgid "Working copy '%s' is not locked"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:1382
+#, c-format
+msgid "No write-lock in '%s'"
+msgstr ""
+
+#: ../libsvn_wc/lock.c:1496
+#, c-format
+msgid "Can't obtain lock on non-directory '%s'."
+msgstr ""
+
+#: ../libsvn_wc/merge.c:1281 ../libsvn_wc/props.c:257
+#, c-format
+msgid "Can't merge into conflicted node '%s'"
+msgstr ""
+
+#: ../libsvn_wc/merge.c:1324 ../libsvn_wc/props.c:273
+#, c-format
+msgid "The property '%s' may not be merged into '%s'."
+msgstr ""
+
+#: ../libsvn_wc/node.c:1047
+#, c-format
+msgid "Incomplete copy information on path '%s'."
+msgstr ""
+
+#: ../libsvn_wc/node.c:1211
+#, c-format
+msgid "'%s' is not the root of the working copy '%s'"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:123
+msgid "Invalid escape sequence"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:130
+msgid "Invalid escaped character"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:148 ../libsvn_wc/old-and-busted.c:177
+#: ../libsvn_wc/old-and-busted.c:241 ../libsvn_wc/old-and-busted.c:253
+msgid "Unexpected end of entry"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:203
+#, c-format
+msgid "Entry contains non-canonical path '%s'"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:275
+#, c-format
+msgid "Invalid value for field '%s'"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:347
+#, c-format
+msgid "Found an unexpected \\0 in the file external '%s'"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:391
+#, c-format
+msgid "Illegal file external revision kind %d for path '%s'"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:847
+#, c-format
+msgid "Entry '%s' has invalid node kind"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:827
+#, c-format
+msgid "Entry for '%s' has invalid repository root"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:872
+#, c-format
+msgid "Entry '%s' has invalid 'schedule' value"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:681
+#, c-format
+msgid "Entry '%s' has invalid 'depth' value"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:732
+#, c-format
+msgid "Entry '%s' has invalid '%s' value"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:1085
+#, c-format
+msgid "XML parser failed in '%s'"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:1141
+msgid "Missing default entry"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:1146
+msgid "Default entry has no revision number"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:1151
+msgid "Default entry is missing URL"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:1230
+#, c-format
+msgid "Invalid version line in entries file of '%s'"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:1247
+msgid "Missing entry terminator"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:1250
+msgid "Invalid entry terminator"
+msgstr ""
+
+#: ../libsvn_wc/old-and-busted.c:1254
+#, c-format
+msgid "Error at entry %d in entries file for '%s':"
+msgstr ""
+
+#: ../libsvn_wc/props.c:236
+#, c-format
+msgid "The node '%s' does not have properties in this state."
+msgstr ""
+
+#: ../libsvn_wc/props.c:401
+#, c-format
+msgid ""
+"Trying to add new property '%s'\n"
+"but the property already exists.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:410
+#, c-format
+msgid ""
+"Trying to add new property '%s'\n"
+"but the property has been locally deleted.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:424
+#, c-format
+msgid ""
+"Trying to delete property '%s'\n"
+"but the property has been locally added.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:440
+#, c-format
+msgid ""
+"Trying to delete property '%s'\n"
+"but the property has been locally modified.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:450
+#, c-format
+msgid ""
+"Trying to delete property '%s'\n"
+"but the property has been locally deleted and had a different value.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:462
+#, c-format
+msgid ""
+"Trying to delete property '%s'\n"
+"but the local property value is different.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:481
+#, c-format
+msgid ""
+"Trying to change property '%s'\n"
+"but the local property value conflicts with the incoming change.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:489
+#, c-format
+msgid ""
+"Trying to change property '%s'\n"
+"but the property has already been locally changed to a different value.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:496
+#, c-format
+msgid ""
+"Trying to change property '%s'\n"
+"but the property has been locally deleted.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:502
+#, c-format
+msgid ""
+"Trying to change property '%s'\n"
+"but the property has been locally added with a different value.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:508
+#, c-format
+msgid ""
+"Trying to change property '%s'\n"
+"but the property does not exist locally.\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:612
+msgid "<<<<<<< (local property value)"
+msgstr ""
+
+#: ../libsvn_wc/props.c:613
+msgid ">>>>>>> (incoming property value)"
+msgstr ""
+
+#: ../libsvn_wc/props.c:648
+msgid "Local property value:\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:650 ../libsvn_wc/props.c:661
+msgid "Cannot display: property value is binary data\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:659
+msgid "Incoming property value:\n"
+msgstr ""
+
+#: ../libsvn_wc/props.c:1475 ../libsvn_wc/props.c:1884
+#: ../libsvn_wc/props.c:1985
+#, c-format
+msgid "Property '%s' is an entry property"
+msgstr ""
+
+#: ../libsvn_wc/props.c:1512 ../libsvn_wc/props.c:1519
+msgid "Failed to load properties"
+msgstr ""
+
+#: ../libsvn_wc/props.c:1555
+#, c-format
+msgid "Cannot set '%s' on a directory ('%s')"
+msgstr ""
+
+#: ../libsvn_wc/props.c:1562
+#, c-format
+msgid "Cannot set '%s' on a file ('%s')"
+msgstr ""
+
+#: ../libsvn_wc/props.c:1641
+#, c-format
+msgid "Can't set '%s': file '%s' has binary mime type property"
+msgstr ""
+
+#: ../libsvn_wc/props.c:1686
+msgid "Failed to load current properties"
+msgstr ""
+
+#: ../libsvn_wc/props.c:1906
+#, c-format
+msgid "Can't set properties on '%s': invalid status for updating properties."
+msgstr ""
+
+#: ../libsvn_wc/props.c:1990
+#, c-format
+msgid "Property '%s' is a WC property, not a regular property"
+msgstr ""
+
+#: ../libsvn_wc/props.c:2084
+#, c-format
+msgid "Unrecognized line ending style '%s' for '%s'"
+msgstr ""
+
+#. scratch_
+#: ../libsvn_wc/props.c:2135
+#, c-format
+msgid " (%d more duplicate targets found)"
+msgstr ""
+
+#: ../libsvn_wc/props.c:2140
+#, c-format
+msgid "Invalid %s property on '%s': target '%s' appears more than once%s"
+msgstr ""
+
+#: ../libsvn_wc/props.c:2171
+#, c-format
+msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')"
+msgstr ""
+
+#: ../libsvn_wc/relocate.c:111
+#, c-format
+msgid "Cannot relocate '%s' as it is not the root of a working copy"
+msgstr ""
+
+#: ../libsvn_wc/relocate.c:118
+#, c-format
+msgid ""
+"Cannot relocate '%s' as it is not the root of a working copy; try relocating "
+"'%s' instead"
+msgstr ""
+
+#: ../libsvn_wc/relocate.c:136
+msgid "Cannot relocate a single file"
+msgstr ""
+
+#: ../libsvn_wc/relocate.c:144
+#, c-format
+msgid "Invalid source URL prefix: '%s' (does not overlap target's URL '%s')"
+msgstr ""
+
+#: ../libsvn_wc/relocate.c:154
+#, c-format
+msgid "Invalid relocation destination: '%s' (not a URL)"
+msgstr ""
+
+#: ../libsvn_wc/relocate.c:161
+#, c-format
+msgid "Invalid relocation destination: '%s' (does not point to target)"
+msgstr ""
+
+#: ../libsvn_wc/tree_conflicts.c:136
+msgid "Unknown enumeration value in tree conflict description"
+msgstr ""
+
+#: ../libsvn_wc/tree_conflicts.c:160
+msgid "Invalid version info in tree conflict description"
+msgstr ""
+
+#: ../libsvn_wc/tree_conflicts.c:218
+#, c-format
+msgid "Invalid conflict info '%s' in tree conflict description"
+msgstr ""
+
+#: ../libsvn_wc/tree_conflicts.c:229
+msgid "Empty 'victim' field in tree conflict description"
+msgstr ""
+
+#: ../libsvn_wc/tree_conflicts.c:237
+msgid "Invalid 'node_kind' field in tree conflict description"
+msgstr ""
+
+#: ../libsvn_wc/tree_conflicts.c:430
+#, c-format
+msgid "Attempt to add tree conflict that already exists at '%s'"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:999
+#, c-format
+msgid ""
+"Checksum mismatch while updating '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:1134
+#, c-format
+msgid "'%s' is not valid as filename in directory '%s'"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:1611
+#, c-format
+msgid "Unexpected attempt to add a node at path '%s'"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:1622
+#, c-format
+msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:2036
+#, c-format
+msgid ""
+"Failed to add directory '%s': object of the same name as the administrative "
+"directory"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:2694
+msgid "Couldn't do property merge"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:3087
+#, c-format
+msgid ""
+"Failed to mark '%s' absent: item of the same name is already scheduled for "
+"addition"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:3175
+#, c-format
+msgid ""
+"Failed to add file '%s': object of the same name as the administrative "
+"directory"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:3697
+#, c-format
+msgid ""
+"Checksum mismatch for '%s':\n"
+" expected: %s\n"
+" recorded: %s\n"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:5256
+#, c-format
+msgid "Node '%s' exists."
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:5316
+#, c-format
+msgid "Copyfrom-url '%s' has different repository root than '%s'"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:5514
+#, c-format
+msgid "'%s' is not an unmodified copied directory"
+msgstr ""
+
+#: ../libsvn_wc/update_editor.c:5525
+#, c-format
+msgid "Copyfrom '%s' doesn't match original location of '%s'"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:255
+#, c-format
+msgid "Missing end of line in wcprops file for '%s'"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:631
+#, c-format
+msgid ""
+"Working copy '%s' can't be upgraded because the repository root is not "
+"available and can't be retrieved"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:638
+#, c-format
+msgid ""
+"Working copy '%s' can't be upgraded because the repository uuid is not "
+"available and can't be retrieved"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:645
+#, c-format
+msgid "Working copy '%s' can't be upgraded because it doesn't have a url"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:690
+msgid "Error parsing tree conflict skel"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:1173
+#, c-format
+msgid ""
+"The working copy at '%s' is format 22 with WORKING nodes; use a format 22 "
+"client to diff/revert before using this client"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:1217
+#, c-format
+msgid ""
+"The working copy at '%s' is format 26 with conflicts; use a format 26 client "
+"to resolve before using this client"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:1723
+msgid ""
+"Cannot upgrade with existing logs; run a cleanup operation on this working "
+"copy using a client version which is compatible with this working copy's "
+"format (such as the version you are upgrading from), then retry the upgrade "
+"with the current version"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:1792
+msgid ""
+"This working copy is corrupt and cannot be upgraded. Please check out a new "
+"working copy."
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:1837
+msgid "(unreleased development version)"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:1853
+#, c-format
+msgid "Working copy '%s' is too old (format %d, created by Subversion %s)"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:1863
+#, c-format
+msgid ""
+"Working copy '%s' is an old development version (format %d); to upgrade it, "
+"use a format 18 client, then use 'tools/dev/wc-ng/bump-to-19.py', then use "
+"the current client"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:2092
+#, c-format
+msgid "Can't upgrade '%s' as it is not a working copy"
+msgstr ""
+
+#: ../libsvn_wc/upgrade.c:2141
+#, c-format
+msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:452
+#, c-format
+msgid "No REPOSITORY table entry for id '%ld'"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:768
+#, c-format
+msgid "The file '%s' has no checksum."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:2535 ../libsvn_wc/wc_db.c:2916
+#: ../libsvn_wc/wc_db.c:9372
+#, c-format
+msgid "The node '%s' has a corrupt checksum value."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:2720
+#, c-format
+msgid "The node '%s' has a BASE status that has no properties."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:3546
+#, c-format
+msgid "The node '%s' is not an external."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:3960
+#, c-format
+msgid "Expected node '%s' to be deleted."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:6473 ../libsvn_wc/wc_db.c:6552
+#, c-format
+msgid "Can't revert '%s' without reverting children"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:6649
+#, c-format
+msgid "Can't revert '%s' without reverting parent"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:6768
+#, c-format
+msgid "Unsupported depth for revert of '%s'"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:7740
+#, c-format
+msgid "Cannot delete '%s' as '%s' is excluded by server"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:7751
+#, c-format
+msgid "Cannot delete '%s' as it is excluded by server"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:7758
+#, c-format
+msgid "Cannot delete '%s' as it is excluded"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:8210
+#, c-format
+msgid "Cannot move '%s' to '%s' because they are not in the same working copy"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:8568
+#, c-format
+msgid "Corrupt data for '%s'"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:8872
+#, c-format
+msgid ""
+"The node '%s' comes from unexpected repository '%s', expected '%s'; if this "
+"node is a file external using the correct URL in the external definition can "
+"fix the problem, see issue #4087"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:9497
+#, c-format
+msgid "The node '%s' is not in working copy '%s'"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:9534
+#, c-format
+msgid "The node '%s' is not installable"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:9963 ../libsvn_wc/wc_db.c:10222
+#, c-format
+msgid "The node '%s' has a status that has no properties."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:12062
+#, c-format
+msgid "Expected node '%s' to be added."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:12408
+#, c-format
+msgid "Path '%s' was not moved here"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:12477
+#, c-format
+msgid "The base node '%s' was not found."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:12909
+#, c-format
+msgid ""
+"The properties of '%s' are in an indeterminate state and cannot be upgraded. "
+"See issue #2530."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:12921
+#, c-format
+msgid "Insufficient NODES rows for '%s'"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:13068
+#, c-format
+msgid "Repository '%s' not found in the database"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:14055 ../libsvn_wc/wc_db.c:14103
+#, c-format
+msgid "'%s' is already locked."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:14060 ../libsvn_wc/wc_db.c:14111
+#, c-format
+msgid "Working copy '%s' locked."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:14183
+#, c-format
+msgid "'%s' is already locked via '%s'."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:14357
+#, c-format
+msgid "Working copy not locked at '%s'."
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:14740
+#, c-format
+msgid "Modification of '%s' already exists"
+msgstr ""
+
+#. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT
+#. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message.
+#: ../libsvn_wc/wc_db.c:15382
+#, c-format
+msgid "database inconsistency at local_relpath='%s' verifying expression '%s'"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:15506
+#, c-format
+msgid "Can't upgrade '%s' as it is not a working copy root"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:15512
+#, c-format
+msgid ""
+"Working copy '%s' is too old and must be upgraded to at least format %d, as "
+"created by Subversion %s"
+msgstr ""
+
+#: ../libsvn_wc/wc_db.c:15530
+msgid "Working copy upgrade failed"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_pristine.c:125 ../libsvn_wc/wc_db_pristine.c:457
+#, c-format
+msgid "The pristine text with checksum '%s' was not found"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_pristine.c:191
+#, c-format
+msgid "Pristine text '%s' not present"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_pristine.c:224
+#, c-format
+msgid "Can't read '%s' from pristine store because no checksum supplied"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_pristine.c:328
+#, c-format
+msgid "New pristine text '%s' has different size: %ld versus %ld"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_pristine.c:496
+#, c-format
+msgid "The pristine text with MD5 checksum '%s' was not found"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:282 ../libsvn_wc/wc_db_update_move.c:306
+#, c-format
+msgid "'%s' already in conflict"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1382
+#, c-format
+msgid "'%s' is not in conflict"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1395
+#, c-format
+msgid "'%s' is not a tree-conflict victim"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1754
+#, c-format
+msgid "Cannot auto-resolve tree-conflict on '%s'"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1817
+#, c-format
+msgid ""
+"Cannot apply update because move source %s' is a mixed-revision working copy"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1828
+#, c-format
+msgid "Cannot apply update because move source '%s' is a switched subtree"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1879
+#, c-format
+msgid "The node '%s' has not been moved away"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_update_move.c:1908
+#, c-format
+msgid "'%s' is not deleted"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_util.c:69
+#, c-format
+msgid "Missing a row in WCROOT."
+msgstr ""
+
+#: ../libsvn_wc/wc_db_util.c:135
+#, c-format
+msgid "Working copy database '%s' not found"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:276
+#, c-format
+msgid ""
+"Working copy format of '%s' is too old (%d); please check out your working "
+"copy again"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:286
+#, c-format
+msgid ""
+"This client is too old to work with the working copy at\n"
+"'%s' (format %d).\n"
+"You need to get a newer Subversion client. For more details, see\n"
+" http://subversion.apache.org/faq.html#working-copy-format-change\n"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:307
+msgid "Cleanup with an older 1.7 client before upgrading with this client"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:318
+#, c-format
+msgid ""
+"The working copy at '%s'\n"
+"is too old (format %d) to work with client version '%s' (expects format %d). "
+"You need to upgrade the working copy first.\n"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:396
+#, c-format
+msgid "The symlink at '%s' points nowhere"
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:665
+#, c-format
+msgid "Missing a row in WCROOT for '%s'."
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:720
+#, c-format
+msgid "The working copy at '%s' is corrupt."
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:736
+#, c-format
+msgid "The working copy database at '%s' is missing."
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:745
+#, c-format
+msgid "The working copy database at '%s' is corrupt."
+msgstr ""
+
+#: ../libsvn_wc/wc_db_wcroot.c:903
+#, c-format
+msgid "'%s' is not a working copy root"
+msgstr ""
+
+#: ../libsvn_wc/workqueue.c:518
+#, c-format
+msgid ""
+"Can't install '%s' from pristine store, because no checksum is recorded for "
+"this file"
+msgstr ""
+
+#: ../libsvn_wc/workqueue.c:1499
+#, c-format
+msgid "Unrecognized work item in the queue"
+msgstr ""
+
+#: ../libsvn_wc/workqueue.c:1579
+#, c-format
+msgid ""
+"Failed to run the WC DB work queue associated with '%s', work item %d %s"
+msgstr ""
+
+#: ../svn/add-cmd.c:101
+msgid "Could not add all targets because some targets don't exist"
+msgstr ""
+
+#: ../svn/add-cmd.c:105
+msgid "Could not add all targets because some targets are already versioned"
+msgstr ""
+
+#: ../svn/blame-cmd.c:303 ../svn/list-cmd.c:300
+msgid "'verbose' option invalid in XML mode"
+msgstr ""
+
+#: ../svn/blame-cmd.c:315 ../svn/info-cmd.c:613 ../svn/list-cmd.c:312
+#: ../svn/status-cmd.c:308
+msgid "'incremental' option only valid in XML mode"
+msgstr ""
+
+#: ../svn/blame-cmd.c:378
+#, c-format
+msgid "Skipping binary file (use --force to treat as text): '%s'\n"
+msgstr ""
+
+#: ../svn/blame-cmd.c:415
+msgid "Could not perform blame on all targets because some targets don't exist"
+msgstr ""
+
+#: ../svn/cat-cmd.c:102
+msgid "Could not cat all targets because some targets don't exist"
+msgstr ""
+
+#: ../svn/cat-cmd.c:106
+msgid "Could not cat all targets because some targets are not versioned"
+msgstr ""
+
+#: ../svn/cat-cmd.c:110
+msgid "Could not cat all targets because some targets are directories"
+msgstr ""
+
+#: ../svn/changelist-cmd.c:135
+msgid ""
+"Could not set changelists on all targets because some targets don't exist"
+msgstr ""
+
+#: ../svn/changelist-cmd.c:140
+msgid ""
+"Could not set changelists on all targets because some targets are not "
+"versioned"
+msgstr ""
+
+#: ../svn/checkout-cmd.c:133 ../svn/switch-cmd.c:138
+#, c-format
+msgid "'%s' does not appear to be a URL"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:80
+msgid "local file edit"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:82
+msgid "local file obstruction"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:84
+msgid "local file delete"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:86
+msgid "local file missing"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:88
+msgid "local file unversioned"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:90
+msgid "local file add"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:92
+msgid "local file replace"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:94
+msgid "local file moved away"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:96
+msgid "local file moved here"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:103
+msgid "local dir edit"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:105
+msgid "local dir obstruction"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:107
+msgid "local dir delete"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:109
+msgid "local dir missing"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:111
+msgid "local dir unversioned"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:113
+msgid "local dir add"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:115
+msgid "local dir replace"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:117
+msgid "local dir moved away"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:119
+msgid "local dir moved here"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:141
+msgid "incoming file edit"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:143
+msgid "incoming file add"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:145
+msgid "incoming file delete"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:147
+msgid "incoming file replace"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:154
+msgid "incoming dir edit"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:156
+msgid "incoming dir add"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:158
+msgid "incoming dir delete"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:160
+msgid "incoming dir replace"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:178
+msgid "upon update"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:179
+msgid "upon switch"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:180
+msgid "upon merge"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:181
+msgid "upon none"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:200
+msgid "local edit"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:203
+msgid "local add"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:206
+msgid "local delete"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:209
+msgid "local obstruction"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:212
+#, c-format
+msgid "local %s"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:220
+msgid "incoming edit"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:223
+msgid "incoming add"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:226
+msgid "incoming delete"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:229
+#, c-format
+msgid "incoming %s"
+msgstr ""
+
+#: ../svn/cl-conflicts.c:235 ../svn/cl-conflicts.c:277
+#, c-format
+msgid "%s, %s %s"
+msgstr ""
+
+#. A catch-all message for very rare or nominally impossible cases.
+#. It will not be pretty, but is closer to an internal error than
+#. an ordinary user-facing string.
+#: ../svn/cl-conflicts.c:285
+#, c-format
+msgid "local: %s %s incoming: %s %s %s"
+msgstr ""
+
+#: ../svn/cleanup-cmd.c:92
+#, c-format
+msgid ""
+"Working copy locked; try running 'svn cleanup' on the root of the working "
+"copy ('%s') instead."
+msgstr ""
+
+#: ../svn/commit-cmd.c:80
+#, c-format
+msgid ""
+"svn: The depth of this commit is '%s', but copies are always performed "
+"recursively in the repository.\n"
+msgstr ""
+
+#: ../svn/commit-cmd.c:116
+msgid "Commit targets must be local paths"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:155 ../svn/conflict-callbacks.c:172
+msgid "MINE"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:160 ../svn/conflict-callbacks.c:170
+msgid "THEIRS"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:163
+msgid "MERGED"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:220 ../svn/conflict-callbacks.c:276
+msgid "||||||| ORIGINAL"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:221
+msgid "<<<<<<< MINE (select with 'mc')"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:222
+msgid ">>>>>>> THEIRS (select with 'tc')"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:277
+msgid "<<<<<<< MINE"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:278
+msgid ">>>>>>> THEIRS"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:333 ../svn/file-merge.c:503
+msgid "No editor found."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:342 ../svn/file-merge.c:515
+msgid "Error running editor."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:352
+#, c-format
+msgid ""
+"Invalid option; there's no merged version to edit.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:411
+msgid "No merge tool found, try '(m) merge' instead.\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:419
+msgid "Error running merge tool, try '(m) merge' instead."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:451
+msgid "change merged file in an editor [edit]"
+msgstr ""
+
+#. Translators: keep long_desc below 70 characters (wrap with a left
+#. margin of 9 spaces if needed); don't translate the words within square
+#. brackets.
+#: ../svn/conflict-callbacks.c:451
+msgid "edit file"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:454
+msgid "show all changes made to merged file"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:454
+msgid "show diff"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:456
+msgid "accept merged version of file"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:456 ../svn/conflict-callbacks.c:501
+#: ../svn/conflict-callbacks.c:533
+msgid "mark resolved"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:459 ../svn/conflict-callbacks.c:498
+msgid "display conflict"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:459
+msgid "show all conflicts (ignoring merged version)"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:461
+msgid "accept my version for all conflicts (same) [mine-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:461
+msgid "my side of conflict"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:464
+msgid "accept their version for all conflicts (same) [theirs-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:464
+msgid "their side of conflict"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:469
+msgid "accept my version of entire file (even non-conflicts) [mine-full]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:469 ../svn/conflict-callbacks.c:492
+#: ../svn/conflict-callbacks.c:515
+msgid "my version"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:472
+msgid "accept their version of entire file (same) [theirs-full]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:472 ../svn/conflict-callbacks.c:495
+#: ../svn/conflict-callbacks.c:518
+msgid "their version"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:476 ../svn/util.c:774
+msgid "merge"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:476
+msgid "use internal merge tool to resolve conflict"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:478
+msgid "launch external tool to resolve conflict [launch]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:478
+msgid "launch tool"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:480 ../svn/conflict-callbacks.c:503
+#: ../svn/conflict-callbacks.c:521
+msgid "mark the conflict to be resolved later [postpone]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:480 ../svn/conflict-callbacks.c:503
+#: ../svn/conflict-callbacks.c:521 ../svn/conflict-callbacks.c:535
+#: ../svn/conflict-callbacks.c:553 ../svn/conflict-callbacks.c:567
+#: ../svn/conflict-callbacks.c:583 ../svn/conflict-callbacks.c:599
+msgid "postpone"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506
+#: ../svn/conflict-callbacks.c:524 ../svn/conflict-callbacks.c:537
+#: ../svn/conflict-callbacks.c:555 ../svn/conflict-callbacks.c:569
+#: ../svn/conflict-callbacks.c:585 ../svn/conflict-callbacks.c:601
+msgid "postpone all remaining conflicts"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506
+#: ../svn/conflict-callbacks.c:524 ../svn/conflict-callbacks.c:537
+#: ../svn/conflict-callbacks.c:555 ../svn/conflict-callbacks.c:569
+#: ../svn/conflict-callbacks.c:585 ../svn/conflict-callbacks.c:601
+msgid "quit resolution"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:485
+msgid "show all options"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:485
+msgid "show this list (also 'h', '?')"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:492
+msgid "accept my version of entire property (even non-conflicts) [mine-full]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:495
+msgid "accept their version of entire property (same) [theirs-full]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:498
+msgid "show conflicts in this property"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:499
+msgid "change merged property value in an editor [edit]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:499
+msgid "edit property"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:501
+msgid "accept edited version of property"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:526
+#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:557
+#: ../svn/conflict-callbacks.c:571 ../svn/conflict-callbacks.c:587
+#: ../svn/conflict-callbacks.c:603
+msgid "help"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:526
+#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:557
+#: ../svn/conflict-callbacks.c:571 ../svn/conflict-callbacks.c:587
+#: ../svn/conflict-callbacks.c:603
+msgid "show this help (also '?')"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:515
+msgid "accept pre-existing item (ignore upstream addition) [mine-full]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:518
+msgid "accept incoming item (overwrite pre-existing item) [theirs-full]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:533
+msgid "accept current working copy state"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:535 ../svn/conflict-callbacks.c:553
+#: ../svn/conflict-callbacks.c:567 ../svn/conflict-callbacks.c:583
+#: ../svn/conflict-callbacks.c:599
+msgid "resolve the conflict later [postpone]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:545
+msgid "apply update (recommended)"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:546
+msgid "apply update to the move destination [mine-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:549
+msgid "discard update (breaks move)"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:549
+msgid "discard update, mark resolved, the move will will become a copy"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:563
+msgid "apply update to move destination"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:564
+msgid "apply incoming update to move destination [mine-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:577 ../svn/conflict-callbacks.c:593
+msgid "keep affected local moves"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:577
+msgid "keep any local moves affected by this deletion [mine-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:580 ../svn/conflict-callbacks.c:596
+msgid "mark resolved (breaks moves)"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:580
+msgid "mark resolved, any affected moves will become copies"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:593
+msgid "keep any moves affected by this replacement [mine-conflict]"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:596
+msgid "mark resolved (any affected moves will become copies)"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:632
+msgid "Select:"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:659
+#, c-format
+msgid " (%s) %s"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:699
+msgid ""
+"Words in square brackets are the corresponding --accept option arguments.\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:738
+#, c-format
+msgid ""
+"Unrecognized option.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:766
+#, c-format
+msgid "Conflict discovered in file '%s'.\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:836
+#, c-format
+msgid ""
+"Invalid option; cannot display conflicts for a binary file.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:845
+#, c-format
+msgid ""
+"Invalid option; original files not available.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:857
+#, c-format
+msgid ""
+"Invalid option; there's no merged version to diff.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:877
+#, c-format
+msgid ""
+"Invalid option; can only resolve text conflicts with the internal merge "
+"tool.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:903 ../svn/conflict-callbacks.c:920
+#, c-format
+msgid ""
+"Invalid option.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:929
+#, c-format
+msgid ""
+"Invalid option; cannot choose based on conflicts in a binary file.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:943
+#, c-format
+msgid ""
+"Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:984
+#, c-format
+msgid "Conflict for property '%s' discovered on '%s'.\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:1042
+#, c-format
+msgid ""
+"Invalid option; please edit the property first.\n"
+"\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:1079
+#, c-format
+msgid ""
+"Tree conflict on '%s'\n"
+" > %s\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:1149
+#, c-format
+msgid ""
+"Conflict discovered when trying to add '%s'.\n"
+"An object of the same name already exists.\n"
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:1247
+msgid "No editor found; leaving all conflicts."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:1256
+msgid "Error running editor; leaving all conflicts."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:1292
+msgid "No merge tool found; leaving all conflicts."
+msgstr ""
+
+#: ../svn/conflict-callbacks.c:1301
+msgid "Error running merge tool; leaving all conflicts."
+msgstr ""
+
+#: ../svn/copy-cmd.c:123 ../svn/util.c:957
+#, c-format
+msgid "'%s': a peg revision is not allowed here"
+msgstr ""
+
+#: ../svn/copy-cmd.c:163 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68
+#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:260
+msgid ""
+"Local, non-commit operations do not take a log message or revision properties"
+msgstr ""
+
+#: ../svn/diff-cmd.c:208
+msgid "'--xml' option only valid with '--summarize' option"
+msgstr ""
+
+#: ../svn/diff-cmd.c:299
+msgid "'--new' option only valid with '--old' option"
+msgstr ""
+
+#: ../svn/diff-cmd.c:317
+msgid ""
+"'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. "
+"Try using the --old and --new options or one of the shorthand invocations "
+"listed in 'svn help diff'."
+msgstr ""
+
+#: ../svn/diff-cmd.c:355
+#, c-format
+msgid "Path '%s' not relative to base URLs"
+msgstr ""
+
+#: ../svn/export-cmd.c:113
+msgid ""
+"Destination directory exists; please remove the directory or use --force to "
+"overwrite"
+msgstr ""
+
+#: ../svn/export-cmd.c:122 ../svn/list-cmd.c:412 ../svn/switch-cmd.c:188
+#: ../svn/update-cmd.c:177
+msgid "Failure occurred processing one or more externals definitions"
+msgstr ""
+
+#: ../svn/file-merge.c:135 ../svn/file-merge.c:805
+msgid "Could not write data to merged file"
+msgstr ""
+
+#: ../svn/file-merge.c:491
+msgid "Could not write data to temporary file"
+msgstr ""
+
+#: ../svn/file-merge.c:600
+msgid "Conflicting section found during merge:"
+msgstr ""
+
+#: ../svn/file-merge.c:603
+#, c-format
+msgid "(1) their version (at line %lu)"
+msgstr ""
+
+#: ../svn/file-merge.c:608
+#, c-format
+msgid "(2) your version (at line %lu)"
+msgstr ""
+
+#: ../svn/file-merge.c:657
+msgid ""
+"Select: (1) use their version, (2) use your version,\n"
+" (12) their version first, then yours,\n"
+" (21) your version first, then theirs,\n"
+" (e1) edit their version and use the result,\n"
+" (e2) edit your version and use the result,\n"
+" (eb) edit both versions and use the result,\n"
+" (p) postpone this conflicting section leaving conflict markers,\n"
+" (a) abort file merge and return to main menu: "
+msgstr ""
+
+#: ../svn/file-merge.c:888
+#, c-format
+msgid "Merging '%s'.\n"
+msgstr ""
+
+#: ../svn/file-merge.c:935
+#, c-format
+msgid "Merge of '%s' aborted.\n"
+msgstr ""
+
+#: ../svn/file-merge.c:953
+#, c-format
+msgid ""
+"Could not write merged result to '%s', saved instead at '%s'.\n"
+"'%s' remains in conflict.\n"
+msgstr ""
+
+#: ../svn/file-merge.c:971
+#, c-format
+msgid "Merge of '%s' completed (remains in conflict).\n"
+msgstr ""
+
+#: ../svn/file-merge.c:975
+#, c-format
+msgid "Merge of '%s' completed.\n"
+msgstr ""
+
+#: ../svn/help-cmd.c:53
+#, c-format
+msgid ""
+"usage: svn <subcommand> [options] [args]\n"
+"Subversion command-line client, version %s.\n"
+"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svn --version' to see the program version and RA modules\n"
+" or 'svn --version --quiet' to see just the version number.\n"
+"\n"
+"Most subcommands take file and/or directory arguments, recursing\n"
+"on the directories. If no arguments are supplied to such a\n"
+"command, it recurses on the current directory (inclusive) by default.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+
+#: ../svn/help-cmd.c:66
+msgid ""
+"Subversion is a tool for version control.\n"
+"For additional information, see http://subversion.apache.org/\n"
+msgstr ""
+
+#: ../svn/help-cmd.c:73 ../svnrdump/svnrdump.c:659 ../svnsync/svnsync.c:1857
+msgid ""
+"The following repository access (RA) modules are available:\n"
+"\n"
+msgstr ""
+
+#: ../svn/help-cmd.c:127
+msgid ""
+"WARNING: Plaintext password storage is enabled!\n"
+"\n"
+msgstr ""
+
+#: ../svn/import-cmd.c:87
+msgid "Repository URL required when importing"
+msgstr ""
+
+#: ../svn/import-cmd.c:91
+msgid "Too many arguments to import command"
+msgstr ""
+
+#: ../svn/import-cmd.c:107
+#, c-format
+msgid "Invalid URL '%s'"
+msgstr ""
+
+#: ../svn/info-cmd.c:95
+msgid "Resource is not under version control."
+msgstr ""
+
+#: ../svn/info-cmd.c:266 ../svnadmin/svnadmin.c:1744
+#, c-format
+msgid "Path: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:273
+#, c-format
+msgid "Name: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:277
+#, c-format
+msgid "Working Copy Root Path: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:283
+#, c-format
+msgid "URL: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:286
+#, c-format
+msgid "Relative URL: ^/%s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:293
+#, c-format
+msgid "Repository Root: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:297
+#, c-format
+msgid "Repository UUID: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:301
+#, c-format
+msgid "Revision: %ld\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:306
+#, c-format
+msgid "Node Kind: file\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:310
+#, c-format
+msgid "Node Kind: directory\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:314
+#, c-format
+msgid "Node Kind: none\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:319
+#, c-format
+msgid "Node Kind: unknown\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:328
+#, c-format
+msgid "Schedule: normal\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:332
+#, c-format
+msgid "Schedule: add\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:336
+#, c-format
+msgid "Schedule: delete\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:340
+#, c-format
+msgid "Schedule: replace\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:356
+#, c-format
+msgid "Depth: empty\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:360
+#, c-format
+msgid "Depth: files\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:364
+#, c-format
+msgid "Depth: immediates\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:368
+#, c-format
+msgid "Depth: exclude\n"
+msgstr ""
+
+#. Other depths should never happen here.
+#: ../svn/info-cmd.c:379
+#, c-format
+msgid "Depth: INVALID\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:383
+#, c-format
+msgid "Copied From URL: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:387
+#, c-format
+msgid "Copied From Rev: %ld\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:396 ../svn/info-cmd.c:398
+#, c-format
+msgid "Moved From: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:409 ../svn/info-cmd.c:411
+#, c-format
+msgid "Moved To: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:417
+#, c-format
+msgid "Last Changed Author: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:421
+#, c-format
+msgid "Last Changed Rev: %ld\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:426
+msgid "Last Changed Date"
+msgstr ""
+
+#: ../svn/info-cmd.c:432
+msgid "Text Last Updated"
+msgstr ""
+
+#: ../svn/info-cmd.c:435
+#, c-format
+msgid "Checksum: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:456
+#, c-format
+msgid "Conflict Previous Base File: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:463
+#, c-format
+msgid "Conflict Previous Working File: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:470
+#, c-format
+msgid "Conflict Current Base File: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:479
+#, c-format
+msgid "Conflict Properties File: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:491
+msgid "Tree conflict"
+msgstr ""
+
+#: ../svn/info-cmd.c:517
+msgid "Source left"
+msgstr ""
+
+#: ../svn/info-cmd.c:526
+msgid "Source right"
+msgstr ""
+
+#: ../svn/info-cmd.c:535
+#, c-format
+msgid "Lock Token: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:539
+#, c-format
+msgid "Lock Owner: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:544
+msgid "Lock Created"
+msgstr ""
+
+#: ../svn/info-cmd.c:548
+msgid "Lock Expires"
+msgstr ""
+
+#: ../svn/info-cmd.c:556
+#, c-format
+msgid ""
+"Lock Comment (%i line):\n"
+"%s\n"
+msgid_plural ""
+"Lock Comment (%i lines):\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../svn/info-cmd.c:565
+#, c-format
+msgid "Changelist: %s\n"
+msgstr ""
+
+#: ../svn/info-cmd.c:679
+msgid "Could not display info for all targets because some targets don't exist"
+msgstr ""
+
+#: ../svn/list-cmd.c:73
+msgid "%b %d %H:%M"
+msgstr ""
+
+#: ../svn/list-cmd.c:75
+msgid "%b %d %Y"
+msgstr ""
+
+#: ../svn/list-cmd.c:101
+#, c-format
+msgid "Listing external '%s' defined on '%s':\n"
+msgstr ""
+
+#: ../svn/list-cmd.c:421
+msgid "Could not list all targets because some targets don't exist"
+msgstr ""
+
+#: ../svn/lock-cmd.c:58
+msgid "Lock comment contains a zero byte"
+msgstr ""
+
+#: ../svn/log-cmd.c:144
+msgid "\n"
+msgstr ""
+
+#: ../svn/log-cmd.c:354
+msgid "(no author)"
+msgstr ""
+
+#: ../svn/log-cmd.c:360
+msgid "(no date)"
+msgstr ""
+
+#: ../svn/log-cmd.c:385
+#, c-format
+msgid " | %d line"
+msgid_plural " | %d lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../svn/log-cmd.c:401
+#, c-format
+msgid "Changed paths:\n"
+msgstr ""
+
+#: ../svn/log-cmd.c:418
+#, c-format
+msgid " (from %s:%ld)"
+msgstr ""
+
+#: ../svn/log-cmd.c:434
+#, c-format
+msgid "Reverse merged via:"
+msgstr ""
+
+#: ../svn/log-cmd.c:436
+#, c-format
+msgid "Merged via:"
+msgstr ""
+
+#: ../svn/log-cmd.c:689
+msgid "'with-all-revprops' option only valid in XML mode"
+msgstr ""
+
+#: ../svn/log-cmd.c:693
+msgid "'with-no-revprops' option only valid in XML mode"
+msgstr ""
+
+#: ../svn/log-cmd.c:697
+msgid "'with-revprop' option only valid in XML mode"
+msgstr ""
+
+#: ../svn/log-cmd.c:704
+msgid "'diff' option is not supported in XML mode"
+msgstr ""
+
+#: ../svn/log-cmd.c:710
+msgid "'quiet' and 'diff' options are mutually exclusive"
+msgstr ""
+
+#: ../svn/log-cmd.c:714
+msgid "'diff-cmd' option requires 'diff' option"
+msgstr ""
+
+#: ../svn/log-cmd.c:718
+msgid "'internal-diff' option requires 'diff' option"
+msgstr ""
+
+#: ../svn/log-cmd.c:722
+msgid "'extensions' option requires 'diff' option"
+msgstr ""
+
+#: ../svn/log-cmd.c:727
+msgid "'depth' option requires 'diff' option"
+msgstr ""
+
+#: ../svn/log-cmd.c:743
+msgid "-c and -r are mutually exclusive"
+msgstr ""
+
+#: ../svn/log-cmd.c:775
+#, c-format
+msgid ""
+"Only relative paths can be specified after a URL for 'svn log', but '%s' is "
+"not a relative path"
+msgstr ""
+
+#: ../svn/log-cmd.c:821
+#, c-format
+msgid "cannot assign with 'with-revprop' option (drop the '=')"
+msgstr ""
+
+#: ../svn/merge-cmd.c:107 ../svn/merge-cmd.c:131
+#, c-format
+msgid "--- Merging\n"
+msgstr ""
+
+#: ../svn/merge-cmd.c:175
+msgid "-r and -c can't be used with --reintegrate"
+msgstr ""
+
+#: ../svn/merge-cmd.c:230
+msgid "Merge source required"
+msgstr ""
+
+#: ../svn/merge-cmd.c:276
+msgid "Second revision required"
+msgstr ""
+
+#: ../svn/merge-cmd.c:285 ../svn/merge-cmd.c:312 ../svn/mergeinfo-cmd.c:267
+#: ../svnadmin/svnadmin.c:1719 ../svnlook/svnlook.c:2061
+#: ../svnlook/svnlook.c:2254 ../svnlook/svnlook.c:2358
+#: ../svnlook/svnlook.c:2393
+msgid "Too many arguments given"
+msgstr ""
+
+#: ../svn/merge-cmd.c:302
+msgid "Cannot specify a revision range with two URLs"
+msgstr ""
+
+#: ../svn/merge-cmd.c:406
+msgid "--reintegrate cannot be used with --ignore-ancestry"
+msgstr ""
+
+#: ../svn/merge-cmd.c:411
+msgid "--reintegrate cannot be used with --record-only"
+msgstr ""
+
+#: ../svn/merge-cmd.c:416
+msgid "--depth cannot be used with --reintegrate"
+msgstr ""
+
+#: ../svn/merge-cmd.c:421
+msgid "--force cannot be used with --reintegrate"
+msgstr ""
+
+#: ../svn/merge-cmd.c:426
+msgid "--reintegrate can only be used with a single merge source"
+msgstr ""
+
+#: ../svn/merge-cmd.c:430
+msgid "--allow-mixed-revisions cannot be used with --reintegrate"
+msgstr ""
+
+#: ../svn/merge-cmd.c:445
+msgid ""
+"Merge tracking not possible, use --ignore-ancestry or\n"
+"fix invalid mergeinfo in target with 'svn propset'"
+msgstr ""
+
+#: ../svn/mergeinfo-cmd.c:171
+msgid "last full merge"
+msgstr ""
+
+#: ../svn/mergeinfo-cmd.c:171
+msgid "youngest common ancestor"
+msgstr ""
+
+#: ../svn/mergeinfo-cmd.c:172
+msgid "repository path"
+msgstr ""
+
+#: ../svn/mergeinfo-cmd.c:172
+msgid "tip of branch"
+msgstr ""
+
+#: ../svn/mergeinfo-cmd.c:264
+msgid "Not enough arguments given"
+msgstr ""
+
+#: ../svn/mergeinfo-cmd.c:342
+msgid "--revision (-r) option valid only with --show-revs option"
+msgstr ""
+
+#: ../svn/mergeinfo-cmd.c:346
+msgid "Depth specification options valid only with --show-revs option"
+msgstr ""
+
+#: ../svn/mkdir-cmd.c:92
+msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
+msgstr ""
+
+#: ../svn/mkdir-cmd.c:98
+msgid "Try 'svn mkdir --parents' instead?"
+msgstr ""
+
+#: ../svn/notify.c:132
+#, c-format
+msgid "%d remaining"
+msgid_plural "%d remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../svn/notify.c:141
+#, c-format
+msgid "and %d already resolved"
+msgid_plural "and %d already resolved"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../svn/notify.c:163 ../svn/status-cmd.c:93
+#, c-format
+msgid "Summary of conflicts:\n"
+msgstr ""
+
+#: ../svn/notify.c:169
+#, c-format
+msgid " Text conflicts: %d\n"
+msgstr ""
+
+#: ../svn/notify.c:173
+#, c-format
+msgid " Property conflicts: %d\n"
+msgstr ""
+
+#: ../svn/notify.c:177
+#, c-format
+msgid " Tree conflicts: %d\n"
+msgstr ""
+
+#: ../svn/notify.c:184
+#, c-format
+msgid " Text conflicts: %s (%s)\n"
+msgstr ""
+
+#: ../svn/notify.c:189
+#, c-format
+msgid " Property conflicts: %s (%s)\n"
+msgstr ""
+
+#: ../svn/notify.c:194
+#, c-format
+msgid " Tree conflicts: %s (%s)\n"
+msgstr ""
+
+#: ../svn/notify.c:200
+#, c-format
+msgid " Skipped paths: %d\n"
+msgstr ""
+
+#: ../svn/notify.c:235
+#, c-format
+msgid "Skipped missing target: '%s'\n"
+msgstr ""
+
+#: ../svn/notify.c:242
+#, c-format
+msgid "Skipped target: '%s' -- copy-source is missing\n"
+msgstr ""
+
+#: ../svn/notify.c:249
+#, c-format
+msgid "Skipped '%s'\n"
+msgstr ""
+
+#: ../svn/notify.c:256
+#, c-format
+msgid "Skipped '%s' -- An obstructing working copy was found\n"
+msgstr ""
+
+#: ../svn/notify.c:263
+#, c-format
+msgid "Skipped '%s' -- Has no versioned parent\n"
+msgstr ""
+
+#: ../svn/notify.c:270
+#, c-format
+msgid "Skipped '%s' -- Access denied\n"
+msgstr ""
+
+#: ../svn/notify.c:277
+#, c-format
+msgid "Skipped '%s' -- Node remains in conflict\n"
+msgstr ""
+
+#: ../svn/notify.c:358
+#, c-format
+msgid "Restored '%s'\n"
+msgstr ""
+
+#: ../svn/notify.c:364
+#, c-format
+msgid "Reverted '%s'\n"
+msgstr ""
+
+#: ../svn/notify.c:370
+#, c-format
+msgid "Failed to revert '%s' -- try updating instead.\n"
+msgstr ""
+
+#: ../svn/notify.c:378
+#, c-format
+msgid "Resolved conflicted state of '%s'\n"
+msgstr ""
+
+#: ../svn/notify.c:473 ../svn/notify.c:513
+#, c-format
+msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s"
+msgstr ""
+
+#: ../svn/notify.c:490 ../svn/notify.c:527
+#, c-format
+msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s"
+msgstr ""
+
+#: ../svn/notify.c:548
+#, c-format
+msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n"
+msgstr ""
+
+#: ../svn/notify.c:558
+#, c-format
+msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n"
+msgstr ""
+
+#: ../svn/notify.c:576
+#, c-format
+msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n"
+msgstr ""
+
+#: ../svn/notify.c:585
+#, c-format
+msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n"
+msgstr ""
+
+#: ../svn/notify.c:599
+#, c-format
+msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n"
+msgstr ""
+
+#: ../svn/notify.c:609
+#, c-format
+msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n"
+msgstr ""
+
+#: ../svn/notify.c:669
+#, c-format
+msgid ""
+"\n"
+"Fetching external item into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:695
+#, c-format
+msgid "Error handling externals definition for '%s':"
+msgstr ""
+
+#: ../svn/notify.c:708
+#, c-format
+msgid "Updating '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:722
+#, c-format
+msgid "Exported external at revision %ld.\n"
+msgstr ""
+
+#: ../svn/notify.c:723
+#, c-format
+msgid "Exported revision %ld.\n"
+msgstr ""
+
+#: ../svn/notify.c:731
+#, c-format
+msgid "Checked out external at revision %ld.\n"
+msgstr ""
+
+#: ../svn/notify.c:732
+#, c-format
+msgid "Checked out revision %ld.\n"
+msgstr ""
+
+#: ../svn/notify.c:743
+#, c-format
+msgid "Updated external to revision %ld.\n"
+msgstr ""
+
+#: ../svn/notify.c:744
+#, c-format
+msgid "Updated to revision %ld.\n"
+msgstr ""
+
+#: ../svn/notify.c:752
+#, c-format
+msgid "External at revision %ld.\n"
+msgstr ""
+
+#: ../svn/notify.c:753
+#, c-format
+msgid "At revision %ld.\n"
+msgstr ""
+
+#: ../svn/notify.c:765
+#, c-format
+msgid "External export complete.\n"
+msgstr ""
+
+#: ../svn/notify.c:766
+#, c-format
+msgid "Export complete.\n"
+msgstr ""
+
+#: ../svn/notify.c:773
+#, c-format
+msgid "External checkout complete.\n"
+msgstr ""
+
+#: ../svn/notify.c:774
+#, c-format
+msgid "Checkout complete.\n"
+msgstr ""
+
+#: ../svn/notify.c:781
+#, c-format
+msgid "External update complete.\n"
+msgstr ""
+
+#: ../svn/notify.c:782
+#, c-format
+msgid "Update complete.\n"
+msgstr ""
+
+#: ../svn/notify.c:798
+#, c-format
+msgid ""
+"\n"
+"Performing status on external item at '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:806
+#, c-format
+msgid "Status against revision: %6ld\n"
+msgstr ""
+
+#: ../svn/notify.c:815
+#, c-format
+msgid "Sending copy of %s\n"
+msgstr ""
+
+#: ../svn/notify.c:816
+#, c-format
+msgid "Sending %s\n"
+msgstr ""
+
+#: ../svn/notify.c:827
+#, c-format
+msgid "Adding copy of (bin) %s\n"
+msgstr ""
+
+#: ../svn/notify.c:828
+#, c-format
+msgid "Adding (bin) %s\n"
+msgstr ""
+
+#: ../svn/notify.c:836
+#, c-format
+msgid "Adding copy of %s\n"
+msgstr ""
+
+#: ../svn/notify.c:837
+#, c-format
+msgid "Adding %s\n"
+msgstr ""
+
+#: ../svn/notify.c:846
+#, c-format
+msgid "Deleting copy of %s\n"
+msgstr ""
+
+#: ../svn/notify.c:847
+#, c-format
+msgid "Deleting %s\n"
+msgstr ""
+
+#: ../svn/notify.c:856
+#, c-format
+msgid "Replacing copy of %s\n"
+msgstr ""
+
+#: ../svn/notify.c:857
+#, c-format
+msgid "Replacing %s\n"
+msgstr ""
+
+#: ../svn/notify.c:867 ../svnsync/sync.c:327
+#, c-format
+msgid "Transmitting file data "
+msgstr ""
+
+#: ../svn/notify.c:876 ../svnadmin/svnadmin.c:1698
+#, c-format
+msgid "'%s' locked by user '%s'.\n"
+msgstr ""
+
+#: ../svn/notify.c:882
+#, c-format
+msgid "'%s' unlocked.\n"
+msgstr ""
+
+#: ../svn/notify.c:909
+#, c-format
+msgid "--- Merging differences between repository URLs into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:914
+#, c-format
+msgid "--- Merging r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:918
+#, c-format
+msgid "--- Reverse-merging r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:922
+#, c-format
+msgid "--- Merging r%ld through r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:928
+#, c-format
+msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:940
+#, c-format
+msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:950
+#, c-format
+msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:955
+#, c-format
+msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:960
+#, c-format
+msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:965
+#, c-format
+msgid ""
+"--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:975
+#, c-format
+msgid "--- Eliding mergeinfo from '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:983
+#, c-format
+msgid "--- Merging differences between foreign repository URLs into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:989
+#, c-format
+msgid "--- Merging (from foreign repository) r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:994
+#, c-format
+msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:999
+#, c-format
+msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:1005
+#, c-format
+msgid ""
+"--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:1041
+#, c-format
+msgid "property '%s' set on '%s'\n"
+msgstr ""
+
+#: ../svn/notify.c:1049
+#, c-format
+msgid "property '%s' deleted from '%s'.\n"
+msgstr ""
+
+#: ../svn/notify.c:1057
+#, c-format
+msgid "Attempting to delete nonexistent property '%s' on '%s'\n"
+msgstr ""
+
+#: ../svn/notify.c:1066
+#, c-format
+msgid "property '%s' set on repository revision %ld\n"
+msgstr ""
+
+#: ../svn/notify.c:1074
+#, c-format
+msgid "property '%s' deleted from repository revision %ld\n"
+msgstr ""
+
+#: ../svn/notify.c:1081
+#, c-format
+msgid "Upgraded '%s'\n"
+msgstr ""
+
+#: ../svn/notify.c:1087
+#, c-format
+msgid "Redirecting to URL '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:1115
+#, c-format
+msgid "--- Copying from foreign repository URL '%s':\n"
+msgstr ""
+
+#: ../svn/notify.c:1124
+#, c-format
+msgid "Breaking move with source path '%s'\n"
+msgstr ""
+
+#: ../svn/propdel-cmd.c:88
+#, c-format
+msgid "Cannot specify revision for deleting versioned property '%s'"
+msgstr ""
+
+#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:341
+#, c-format
+msgid "Set new value for property '%s' on '%s'\n"
+msgstr ""
+
+#: ../svn/propedit-cmd.c:96 ../svn/propset-cmd.c:97
+msgid ""
+"--encoding option applies only to textual Subversion-controlled properties"
+msgstr ""
+
+#: ../svn/propedit-cmd.c:162
+#, c-format
+msgid "Set new value for property '%s' on revision %ld\n"
+msgstr ""
+
+#: ../svn/propedit-cmd.c:168
+#, c-format
+msgid "No changes to property '%s' on revision %ld\n"
+msgstr ""
+
+#: ../svn/propedit-cmd.c:176
+#, c-format
+msgid "Cannot specify revision for editing versioned property '%s'"
+msgstr ""
+
+#: ../svn/propedit-cmd.c:204 ../svn/propset-cmd.c:172
+msgid "Explicit target argument required"
+msgstr ""
+
+#: ../svn/propedit-cmd.c:271
+#, c-format
+msgid "'%s' does not appear to be a working copy path"
+msgstr ""
+
+#: ../svn/propedit-cmd.c:348
+#, c-format
+msgid "No changes to property '%s' on '%s'\n"
+msgstr ""
+
+#: ../svn/propget-cmd.c:66
+msgid "Error writing to stream"
+msgstr ""
+
+#: ../svn/propget-cmd.c:186 ../svn/proplist-cmd.c:156
+#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1754
+#: ../svnlook/svnlook.c:1908
+#, c-format
+msgid ""
+"Inherited properties on '%s',\n"
+"from '%s':\n"
+msgstr ""
+
+#. Not a --revprop
+#: ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:175
+#: ../svnlook/svnlook.c:1790 ../svnlook/svnlook.c:1943
+#, c-format
+msgid "Properties on '%s':\n"
+msgstr ""
+
+#: ../svn/propget-cmd.c:326
+msgid "--verbose cannot be used with --revprop or --strict or --xml"
+msgstr ""
+
+#: ../svn/propget-cmd.c:358 ../svn/proplist-cmd.c:214
+msgid "--show-inherited-props can't be used with --revprop"
+msgstr ""
+
+#: ../svn/propget-cmd.c:425
+msgid ""
+"Strict output of property values only available for single-target, non-"
+"recursive propget operations"
+msgstr ""
+
+#: ../svn/proplist-cmd.c:246
+#, c-format
+msgid "Unversioned properties on revision %ld:\n"
+msgstr ""
+
+#: ../svn/proplist-cmd.c:321
+msgid ""
+"Could not display properties of all targets because some targets don't exist"
+msgstr ""
+
+#: ../svn/proplist-cmd.c:326
+msgid ""
+"Could not display properties of all targets because some targets are not "
+"versioned"
+msgstr ""
+
+#: ../svn/props.c:66
+msgid ""
+"Must specify the revision as a number, a date or 'HEAD' when operating on a "
+"revision property"
+msgstr ""
+
+#: ../svn/props.c:73
+msgid "Wrong number of targets specified"
+msgstr ""
+
+#: ../svn/props.c:82
+msgid "Either a URL or versioned item is required"
+msgstr ""
+
+#: ../svn/props.c:107
+#, c-format
+msgid ""
+"To turn off the %s property, use 'svn propdel';\n"
+"setting the property to '%s' will not turn it off."
+msgstr ""
+
+#: ../svn/props.c:177
+#, c-format
+msgid "(To set the '%s' property, re-run with '--force'.)"
+msgstr ""
+
+#: ../svn/props.c:182
+#, c-format
+msgid "(To edit the '%s' property, re-run with '--force'.)"
+msgstr ""
+
+#: ../svn/props.c:188
+#, c-format
+msgid "(To use the '%s' property, re-run with '--force'.)"
+msgstr ""
+
+#: ../svn/props.c:202
+#, c-format
+msgid "'%s' is not a valid %s property name; re-run with '--force' to set it"
+msgstr ""
+
+#: ../svn/props.c:208
+#, c-format
+msgid "'%s' is not a valid %s property name; re-run with '--force' to edit it"
+msgstr ""
+
+#: ../svn/props.c:215
+#, c-format
+msgid "'%s' is not a valid %s property name; re-run with '--force' to use it"
+msgstr ""
+
+#: ../svn/props.c:281 ../svn/props.c:332
+#, c-format
+msgid ""
+"'%s' is not a valid %s property name; did you mean '%s'?\n"
+"%s"
+msgstr ""
+
+#: ../svn/props.c:340
+#, c-format
+msgid ""
+"'%s' is not a valid %s property name\n"
+"Did you mean '%s' or '%s'?\n"
+"%s"
+msgstr ""
+
+#: ../svn/props.c:350
+#, c-format
+msgid ""
+"'%s' is not a valid %s property name\n"
+"Did you mean '%s', '%s' or '%s'?\n"
+"%s"
+msgstr ""
+
+#: ../svn/propset-cmd.c:132
+#, c-format
+msgid "Cannot specify revision for setting versioned property '%s'"
+msgstr ""
+
+#: ../svn/propset-cmd.c:165
+#, c-format
+msgid "Explicit target required ('%s' interpreted as prop value)"
+msgstr ""
+
+#: ../svn/resolve-cmd.c:79
+msgid "missing --accept option"
+msgstr ""
+
+#: ../svn/resolve-cmd.c:84
+msgid "invalid 'accept' ARG"
+msgstr ""
+
+#: ../svn/resolve-cmd.c:127
+msgid "Failure occurred resolving one or more conflicts"
+msgstr ""
+
+#: ../svn/revert-cmd.c:77
+msgid "Try 'svn revert --depth infinity' instead?"
+msgstr ""
+
+#: ../svn/status-cmd.c:97
+#, c-format
+msgid " Text conflicts: %u\n"
+msgstr ""
+
+#: ../svn/status-cmd.c:101
+#, c-format
+msgid " Property conflicts: %u\n"
+msgstr ""
+
+#: ../svn/status-cmd.c:105
+#, c-format
+msgid " Tree conflicts: %u\n"
+msgstr ""
+
+#: ../svn/status-cmd.c:398
+#, c-format
+msgid ""
+"\n"
+"--- Changelist '%s':\n"
+msgstr ""
+
+#: ../svn/status.c:318
+#, c-format
+msgid "swapped places with %s"
+msgstr ""
+
+#: ../svn/status.c:333
+#, c-format
+msgid "moved from %s"
+msgstr ""
+
+#: ../svn/status.c:345
+#, c-format
+msgid "moved to %s"
+msgstr ""
+
+#: ../svn/svn.c:147
+msgid "force operation to run"
+msgstr ""
+
+#: ../svn/svn.c:149
+msgid "force validity of log message source"
+msgstr ""
+
+#: ../svn/svn.c:150 ../svn/svn.c:151 ../svnadmin/svnadmin.c:208
+#: ../svnadmin/svnadmin.c:211 ../svndumpfilter/svndumpfilter.c:1048
+#: ../svndumpfilter/svndumpfilter.c:1051 ../svnlook/svnlook.c:114
+#: ../svnlook/svnlook.c:126 ../svnsync/svnsync.c:244 ../svnsync/svnsync.c:246
+msgid "show help on a subcommand"
+msgstr ""
+
+#: ../svn/svn.c:152
+msgid "specify log message ARG"
+msgstr ""
+
+#: ../svn/svn.c:153
+msgid "print nothing, or only summary information"
+msgstr ""
+
+#: ../svn/svn.c:154
+msgid "descend recursively, same as --depth=infinity"
+msgstr ""
+
+#: ../svn/svn.c:155
+msgid "obsolete; try --depth=files or --depth=immediates"
+msgstr ""
+
+#: ../svn/svn.c:157
+msgid ""
+"the change made by revision ARG (like -r ARG-1:ARG)\n"
+" If ARG is negative this is like -r ARG:ARG-1\n"
+" If ARG is of the form ARG1-ARG2 then this is "
+"like\n"
+" ARG1:ARG2, where ARG1 is inclusive"
+msgstr ""
+
+#: ../svn/svn.c:165
+msgid ""
+"ARG (some commands also take ARG1:ARG2 range)\n"
+" A revision argument can be one of:\n"
+" NUMBER revision number\n"
+" '{' DATE '}' revision at start of the date\n"
+" 'HEAD' latest in repository\n"
+" 'BASE' base rev of item's working "
+"copy\n"
+" 'COMMITTED' last commit at or before BASE\n"
+" 'PREV' revision just before COMMITTED"
+msgstr ""
+
+#: ../svn/svn.c:180
+msgid "read log message from file ARG"
+msgstr ""
+
+#: ../svn/svn.c:182
+msgid "give output suitable for concatenation"
+msgstr ""
+
+#: ../svn/svn.c:184
+msgid "treat value as being in charset encoding ARG"
+msgstr ""
+
+#: ../svn/svn.c:185 ../svnadmin/svnadmin.c:214
+#: ../svndumpfilter/svndumpfilter.c:1054 ../svnlook/svnlook.c:168
+#: ../svnrdump/svnrdump.c:144 ../svnserve/svnserve.c:287
+#: ../svnsync/svnsync.c:242 ../svnversion/svnversion.c:141
+msgid "show program version information"
+msgstr ""
+
+#: ../svn/svn.c:186
+msgid "print extra information"
+msgstr ""
+
+#: ../svn/svn.c:187
+msgid "display update information"
+msgstr ""
+
+#: ../svn/svn.c:188 ../svnrdump/svnrdump.c:128
+msgid "specify a username ARG"
+msgstr ""
+
+#: ../svn/svn.c:189 ../svnrdump/svnrdump.c:130
+msgid "specify a password ARG"
+msgstr ""
+
+#: ../svn/svn.c:191
+msgid ""
+"Specify differencing options for external diff or\n"
+" internal diff or blame. Default: '-u'. Options "
+"are\n"
+" separated by spaces. Internal diff and blame "
+"take:\n"
+" -u, --unified: Show 3 lines of unified "
+"context\n"
+" -b, --ignore-space-change: Ignore changes in\n"
+" amount of white space\n"
+" -w, --ignore-all-space: Ignore all white "
+"space\n"
+" --ignore-eol-style: Ignore changes in EOL "
+"style\n"
+" -p, --show-c-function: Show C function name"
+msgstr ""
+
+#: ../svn/svn.c:209
+msgid "pass contents of file ARG as additional args"
+msgstr ""
+
+#: ../svn/svn.c:211
+msgid ""
+"limit operation by depth ARG ('empty', 'files',\n"
+" 'immediates', or 'infinity')"
+msgstr ""
+
+#: ../svn/svn.c:215
+msgid ""
+"set new working copy depth to ARG ('exclude',\n"
+" 'empty', 'files', 'immediates', or 'infinity')"
+msgstr ""
+
+#: ../svn/svn.c:218 ../svnlook/svnlook.c:171
+msgid "output in XML"
+msgstr ""
+
+#: ../svn/svn.c:219
+msgid "use strict semantics"
+msgstr ""
+
+#: ../svn/svn.c:221
+msgid "do not cross copies while traversing history"
+msgstr ""
+
+#: ../svn/svn.c:223
+msgid ""
+"disregard default and svn:ignore and\n"
+" svn:global-ignores property ignores"
+msgstr ""
+
+#: ../svn/svn.c:227 ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:188
+msgid "do not cache authentication tokens"
+msgstr ""
+
+#: ../svn/svn.c:229 ../svnrdump/svnrdump.c:154 ../svnsync/svnsync.c:198
+msgid ""
+"accept SSL server certificates from unknown\n"
+" certificate authorities without prompting (but "
+"only\n"
+" with '--non-interactive')"
+msgstr ""
+
+#: ../svn/svn.c:235 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:180
+msgid ""
+"do no interactive prompting (default is to prompt\n"
+" only if standard input is a terminal device)"
+msgstr ""
+
+#: ../svn/svn.c:239 ../svnrdump/svnrdump.c:136 ../svnsync/svnsync.c:184
+msgid ""
+"do interactive prompting even if standard input\n"
+" is not a terminal device"
+msgstr ""
+
+#: ../svn/svn.c:243
+msgid "try operation but make no changes"
+msgstr ""
+
+#: ../svn/svn.c:245
+msgid "disable merge tracking; diff nodes as if related"
+msgstr ""
+
+#: ../svn/svn.c:247
+msgid "ignore externals definitions"
+msgstr ""
+
+#: ../svn/svn.c:248
+msgid "use ARG as merge command"
+msgstr ""
+
+#: ../svn/svn.c:249
+msgid "use ARG as external editor"
+msgstr ""
+
+#: ../svn/svn.c:251
+msgid "merge only mergeinfo differences"
+msgstr ""
+
+#: ../svn/svn.c:252
+msgid "use ARG as the older target"
+msgstr ""
+
+#: ../svn/svn.c:253
+msgid "use ARG as the newer target"
+msgstr ""
+
+#: ../svn/svn.c:255
+msgid "operate on a revision property (use with -r)"
+msgstr ""
+
+#: ../svn/svn.c:256
+msgid "relocate via URL-rewriting"
+msgstr ""
+
+#: ../svn/svn.c:258 ../svnadmin/svnadmin.c:256 ../svnrdump/svnrdump.c:126
+#: ../svnsync/svnsync.c:212
+msgid "read user configuration files from directory ARG"
+msgstr ""
+
+#: ../svn/svn.c:260 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:214
+msgid ""
+"set user configuration option in the format:\n"
+" FILE:SECTION:OPTION=[VALUE]\n"
+" For example:\n"
+" servers:global:http-library=serf"
+msgstr ""
+
+#: ../svn/svn.c:267
+msgid "enable automatic properties"
+msgstr ""
+
+#: ../svn/svn.c:268
+msgid "disable automatic properties"
+msgstr ""
+
+#: ../svn/svn.c:270
+msgid ""
+"use a different EOL marker than the standard\n"
+" system marker for files with the svn:eol-style\n"
+" property set to 'native'.\n"
+" ARG may be one of 'LF', 'CR', 'CRLF'"
+msgstr ""
+
+#: ../svn/svn.c:277
+msgid "maximum number of log entries"
+msgstr ""
+
+#: ../svn/svn.c:278
+msgid "don't unlock the targets"
+msgstr ""
+
+#: ../svn/svn.c:279
+msgid "remove changelist association"
+msgstr ""
+
+#: ../svn/svn.c:281
+msgid "operate only on members of changelist ARG"
+msgstr ""
+
+#: ../svn/svn.c:283
+msgid "don't delete changelists after commit"
+msgstr ""
+
+#: ../svn/svn.c:284
+msgid "keep path in working copy"
+msgstr ""
+
+#: ../svn/svn.c:286
+msgid "retrieve all revision properties"
+msgstr ""
+
+#: ../svn/svn.c:288
+msgid "retrieve no revision properties"
+msgstr ""
+
+#: ../svn/svn.c:290
+msgid ""
+"set revision property ARG in new revision\n"
+" using the name[=value] format"
+msgstr ""
+
+#: ../svn/svn.c:293
+msgid "make intermediate directories"
+msgstr ""
+
+#: ../svn/svn.c:295
+msgid ""
+"use/display additional information from merge\n"
+" history"
+msgstr ""
+
+#: ../svn/svn.c:299
+msgid ""
+"specify automatic conflict resolution action\n"
+" ('postpone', 'working', 'base', 'mine-"
+"conflict',\n"
+" 'theirs-conflict', 'mine-full', 'theirs-full',\n"
+" 'edit', 'launch')\n"
+" (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', "
+"'l')"
+msgstr ""
+
+#: ../svn/svn.c:310
+msgid ""
+"specify which collection of revisions to display\n"
+" ('merged', 'eligible')"
+msgstr ""
+
+#: ../svn/svn.c:314
+msgid "deprecated"
+msgstr ""
+
+#: ../svn/svn.c:316
+msgid ""
+"number of leading path components to strip from\n"
+" paths parsed from the patch file. --strip 0\n"
+" is the default and leaves paths unmodified.\n"
+" --strip 1 would change the path\n"
+" 'doc/fudge/crunchy.html' to 'fudge/crunchy."
+"html'.\n"
+" --strip 2 would leave just 'crunchy.html'\n"
+" The expected component separator is '/' on all\n"
+" platforms. A leading '/' counts as one "
+"component."
+msgstr ""
+
+#: ../svn/svn.c:332
+msgid "don't expand keywords"
+msgstr ""
+
+#: ../svn/svn.c:334
+msgid "apply the unidiff in reverse"
+msgstr ""
+
+#: ../svn/svn.c:336
+msgid "ignore whitespace during pattern matching"
+msgstr ""
+
+#: ../svn/svn.c:337
+msgid "produce diff output"
+msgstr ""
+
+#. maps to show_diff
+#. diff options
+#: ../svn/svn.c:339 ../svnlook/svnlook.c:138
+msgid "use ARG as diff command"
+msgstr ""
+
+#: ../svn/svn.c:341
+msgid "override diff-cmd specified in config file"
+msgstr ""
+
+#: ../svn/svn.c:343 ../svnlook/svnlook.c:132
+msgid "do not print differences for added files"
+msgstr ""
+
+#: ../svn/svn.c:345 ../svnlook/svnlook.c:135
+msgid "do not print differences for deleted files"
+msgstr ""
+
+#: ../svn/svn.c:347
+msgid "don't diff copied or moved files with their source"
+msgstr ""
+
+#: ../svn/svn.c:349
+msgid "diff unrelated nodes as delete and add"
+msgstr ""
+
+#: ../svn/svn.c:350
+msgid "show a summary of the results"
+msgstr ""
+
+#: ../svn/svn.c:352
+msgid "use git's extended diff format"
+msgstr ""
+
+#: ../svn/svn.c:354 ../svnlook/svnlook.c:141
+msgid "ignore properties during the operation"
+msgstr ""
+
+#: ../svn/svn.c:356 ../svnlook/svnlook.c:144
+msgid "show only properties during the operation"
+msgstr ""
+
+#: ../svn/svn.c:358
+msgid ""
+"generate diff suitable for generic third-party\n"
+" patch tools; currently the same as\n"
+" --show-copies-as-adds --ignore-properties"
+msgstr ""
+
+#: ../svn/svn.c:366
+msgid ""
+"Allow operation on mixed-revision working copy.\n"
+" Use of this option is not recommended!\n"
+" Please run 'svn update' instead."
+msgstr ""
+
+#: ../svn/svn.c:372
+msgid ""
+"Also commit file and dir externals reached by\n"
+" recursion. This does not include externals with "
+"a\n"
+" fixed revision. (See the svn:externals property)"
+msgstr ""
+
+#: ../svn/svn.c:378
+msgid "retrieve target's inherited properties"
+msgstr ""
+
+#: ../svn/svn.c:380
+msgid "use ARG as search pattern (glob syntax)"
+msgstr ""
+
+#: ../svn/svn.c:382
+msgid "combine ARG with the previous search pattern"
+msgstr ""
+
+#: ../svn/svn.c:430
+msgid ""
+"Put files and directories under version control, scheduling\n"
+"them for addition to repository. They will be added in next commit.\n"
+"usage: add PATH...\n"
+msgstr ""
+
+#: ../svn/svn.c:435
+msgid "add intermediate parents"
+msgstr ""
+
+#: ../svn/svn.c:438
+msgid ""
+"Output the content of specified files or\n"
+"URLs with revision and author information in-line.\n"
+"usage: blame TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+
+#: ../svn/svn.c:447
+msgid ""
+"Output the content of specified files or URLs.\n"
+"usage: cat TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+
+#: ../svn/svn.c:455
+msgid ""
+"Associate (or dissociate) changelist CLNAME with the named files.\n"
+"usage: 1. changelist CLNAME PATH...\n"
+" 2. changelist --remove PATH...\n"
+msgstr ""
+
+#: ../svn/svn.c:461
+msgid ""
+"Check out a working copy from a repository.\n"
+"usage: checkout URL[@REV]... [PATH]\n"
+"\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up.\n"
+"\n"
+" If PATH is omitted, the basename of the URL will be used as\n"
+" the destination. If multiple URLs are given each will be checked\n"
+" out into a sub-directory of PATH, with the name of the sub-directory\n"
+" being the basename of the URL.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy destination do not automatically cause the check out to fail.\n"
+" If the obstructing path is the same type (file or directory) as the\n"
+" corresponding path in the repository it becomes versioned but its\n"
+" contents are left 'as-is' in the working copy. This means that an\n"
+" obstructing directory's unversioned children may also obstruct and\n"
+" become versioned. For files, any content differences between the\n"
+" obstruction and the repository are treated like a local modification\n"
+" to the working copy. All properties from the repository are applied\n"
+" to the obstructing path.\n"
+"\n"
+" See also 'svn help update' for a list of possible characters\n"
+" reporting the action taken.\n"
+msgstr ""
+
+#: ../svn/svn.c:488
+msgid ""
+"Recursively clean up the working copy, removing write locks, resuming\n"
+"unfinished operations, etc.\n"
+"usage: cleanup [WCPATH...]\n"
+"\n"
+" Finish any unfinished business in the working copy at WCPATH, and remove\n"
+" write locks (shown as 'L' by the 'svn status' command) from the working\n"
+" copy. Usually, this is only necessary if a Subversion client has crashed\n"
+" while using the working copy, leaving it in an unusable state.\n"
+"\n"
+" WARNING: There is no mechanism that will protect write locks still\n"
+" being used by other Subversion clients. Running this command\n"
+" while another client is using the working copy can corrupt\n"
+" the working copy beyond repair!\n"
+msgstr ""
+
+#: ../svn/svn.c:504
+msgid ""
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
+"\n"
+" A log message must be provided, but it can be empty. If it is not\n"
+" given by a --message or --file option, an editor will be started.\n"
+" If any targets are (or contain) locked items, those will be\n"
+" unlocked after a successful commit.\n"
+msgstr ""
+
+#: ../svn/svn.c:515
+msgid ""
+"Copy files and directories in a working copy or repository.\n"
+"usage: copy SRC[@REV]... DST\n"
+"\n"
+" SRC and DST can each be either a working copy (WC) path or URL:\n"
+" WC -> WC: copy and schedule for addition (with history)\n"
+" WC -> URL: immediately commit a copy of WC to URL\n"
+" URL -> WC: check out URL into WC, schedule for addition\n"
+" URL -> URL: complete server-side copy; used to branch and tag\n"
+" All the SRCs must be of the same type. When copying multiple sources,\n"
+" they will be added as children of DST, which must be a directory.\n"
+"\n"
+" WARNING: For compatibility with previous versions of Subversion,\n"
+" copies performed using two working copy paths (WC -> WC) will not\n"
+" contact the repository. As such, they may not, by default, be able\n"
+" to propagate merge tracking information from the source of the copy\n"
+" to the destination.\n"
+msgstr ""
+
+#: ../svn/svn.c:534
+msgid ""
+"Remove files and directories from version control.\n"
+"usage: 1. delete PATH...\n"
+" 2. delete URL...\n"
+"\n"
+" 1. Each item specified by a PATH is scheduled for deletion upon\n"
+" the next commit. Files, and directories that have not been\n"
+" committed, are immediately removed from the working copy\n"
+" unless the --keep-local option is given.\n"
+" PATHs that are, or contain, unversioned or modified items will\n"
+" not be removed unless the --force or --keep-local option is given.\n"
+"\n"
+" 2. Each item specified by a URL is deleted from the repository\n"
+" via an immediate commit.\n"
+msgstr ""
+
+#: ../svn/svn.c:550
+msgid ""
+"Display local changes or differences between two revisions or paths.\n"
+"usage: 1. diff\n"
+" 2. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
+" 3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
+"\\\n"
+" [PATH...]\n"
+" 4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
+" 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n"
+" 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n"
+"\n"
+" 1. Use just 'svn diff' to display local modifications in a working copy.\n"
+"\n"
+" 2. Display the changes made to TARGETs as they are seen in REV between\n"
+" two revisions. TARGETs may be all working copy paths or all URLs.\n"
+" If TARGETs are working copy paths, N defaults to BASE and M to the\n"
+" working copy; if URLs, N must be specified and M defaults to HEAD.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
+" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
+" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
+" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n"
+" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
+"default\n"
+" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
+" If OLDREV or NEWREV are not specified, they default to WORKING for\n"
+" working copy targets and to HEAD for URL targets.\n"
+"\n"
+" Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n"
+" targets. Revisions cannot be specified for unversioned targets.\n"
+" Both targets must be of the same node kind (file or directory).\n"
+" Diffing unversioned targets against URL targets is not supported.\n"
+"\n"
+" 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
+" 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH"
+"[@NEWREV]'\n"
+" 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL"
+"[@NEWREV]'\n"
+msgstr ""
+
+#: ../svn/svn.c:591
+msgid ""
+"Create an unversioned copy of a tree.\n"
+"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1. Exports a clean directory tree from the repository specified by\n"
+" URL, at revision REV if it is given, otherwise at HEAD, into\n"
+" PATH. If PATH is omitted, the last component of the URL is used\n"
+" for the local directory name.\n"
+"\n"
+" 2. Exports a clean directory tree from the working copy specified by\n"
+" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
+" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
+" for the local directory name. If REV is not specified, all local\n"
+" changes will be preserved. Files not under version control will\n"
+" not be copied.\n"
+"\n"
+" If specified, PEGREV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+
+#: ../svn/svn.c:613
+msgid ""
+"Describe the usage of this program or its subcommands.\n"
+"usage: help [SUBCOMMAND...]\n"
+msgstr ""
+
+#: ../svn/svn.c:619
+msgid ""
+"Commit an unversioned file or tree into the repository.\n"
+"usage: import [PATH] URL\n"
+"\n"
+" Recursively commit a copy of PATH to URL.\n"
+" If PATH is omitted '.' is assumed.\n"
+" Parent directories are created as necessary in the repository.\n"
+" If PATH is a directory, the contents of the directory are added\n"
+" directly under URL.\n"
+" Unversionable items such as device files and pipes are ignored\n"
+" if --force is specified.\n"
+msgstr ""
+
+#: ../svn/svn.c:633
+msgid ""
+"Display information about a local or remote item.\n"
+"usage: info [TARGET[@REV]...]\n"
+"\n"
+" Print information about each TARGET (default: '.').\n"
+" TARGET may be either a working-copy path or URL. If specified, REV\n"
+" determines in which revision the target is first looked up.\n"
+msgstr ""
+
+#: ../svn/svn.c:643
+msgid ""
+"List directory entries in the repository.\n"
+"usage: list [TARGET[@REV]...]\n"
+"\n"
+" List each TARGET file and the contents of each TARGET directory as\n"
+" they exist in the repository. If TARGET is a working copy path, the\n"
+" corresponding repository URL will be used. If specified, REV determines\n"
+" in which revision the target is first looked up.\n"
+"\n"
+" The default TARGET is '.', meaning the repository URL of the current\n"
+" working directory.\n"
+"\n"
+" With --verbose, the following fields will be shown for each item:\n"
+"\n"
+" Revision number of the last commit\n"
+" Author of the last commit\n"
+" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
+" Size (in bytes)\n"
+" Date and time of the last commit\n"
+msgstr ""
+
+#: ../svn/svn.c:663
+msgid "include externals definitions"
+msgstr ""
+
+#: ../svn/svn.c:666
+msgid ""
+"Lock working copy paths or URLs in the repository, so that\n"
+"no other user can commit changes to them.\n"
+"usage: lock TARGET...\n"
+"\n"
+" Use --force to steal the lock from another user or working copy.\n"
+msgstr ""
+
+#: ../svn/svn.c:672
+msgid "read lock comment from file ARG"
+msgstr ""
+
+#: ../svn/svn.c:673
+msgid "specify lock comment ARG"
+msgstr ""
+
+#: ../svn/svn.c:674
+msgid "force validity of lock comment source"
+msgstr ""
+
+#: ../svn/svn.c:677
+msgid ""
+"Show the log messages for a set of revision(s) and/or path(s).\n"
+"usage: 1. log [PATH][@REV]\n"
+" 2. log URL[@REV] [PATH...]\n"
+"\n"
+" 1. Print the log messages for the URL corresponding to PATH\n"
+" (default: '.'). If specified, REV is the revision in which the\n"
+" URL is first looked up, and the default revision range is REV:1.\n"
+" If REV is not specified, the default revision range is BASE:1,\n"
+" since the URL might not exist in the HEAD revision.\n"
+"\n"
+" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
+" If specified, REV is the revision in which the URL is first\n"
+" looked up, and the default revision range is REV:1; otherwise,\n"
+" the URL is looked up in HEAD, and the default revision range is\n"
+" HEAD:1.\n"
+"\n"
+" Multiple '-c' or '-r' options may be specified (but not a\n"
+" combination of '-c' and '-r' options), and mixing of forward and\n"
+" reverse ranges is allowed.\n"
+"\n"
+" With -v, also print all affected paths with each log message.\n"
+" With -q, don't print the log message body itself (note that this is\n"
+" compatible with -v).\n"
+"\n"
+" Each log message is printed just once, even if more than one of the\n"
+" affected paths for that revision were explicitly requested. Logs\n"
+" follow copy history by default. Use --stop-on-copy to disable this\n"
+" behavior, which can be useful for determining branchpoints.\n"
+"\n"
+" The --depth option is only valid in combination with the --diff option\n"
+" and limits the scope of the displayed diff to the specified depth.\n"
+"\n"
+" If the --search option is used, log messages are displayed only if the\n"
+" provided search pattern matches any of the author, date, log message\n"
+" text (unless --quiet is used), or, if the --verbose option is also\n"
+" provided, a changed path.\n"
+" The search pattern may include \"glob syntax\" wildcards:\n"
+" ? matches any single character\n"
+" * matches a sequence of arbitrary characters\n"
+" [abc] matches any of the characters listed inside the brackets\n"
+" If multiple --search options are provided, a log message is shown if\n"
+" it matches any of the provided search patterns. If the --search-and\n"
+" option is used, that option's argument is combined with the pattern\n"
+" from the previous --search or --search-and option, and a log message\n"
+" is shown only if it matches the combined search pattern.\n"
+" If --limit is used in combination with --search, --limit restricts the\n"
+" number of log messages searched, rather than restricting the output\n"
+" to a particular number of matching log messages.\n"
+"\n"
+" Examples:\n"
+"\n"
+" Show the latest 5 log messages for the current working copy\n"
+" directory and display paths changed in each commit:\n"
+" svn log -l 5 -v\n"
+"\n"
+" Show the log for bar.c as of revision 42:\n"
+" svn log bar.c at 42\n"
+"\n"
+" Show log messages and diffs for each commit to foo.c:\n"
+" svn log --diff http://www.example.com/repo/project/foo.c\n"
+" (Because the above command uses a full URL it does not require\n"
+" a working copy.)\n"
+"\n"
+" Show log messages for the children foo.c and bar.c of the directory\n"
+" '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n"
+" svn log ^/trunk at 50 foo.c bar.c\n"
+"\n"
+" Show the log messages for any incoming changes to foo.c during the\n"
+" next 'svn update':\n"
+" svn log -r BASE:HEAD foo.c\n"
+"\n"
+" Show the log message for the revision in which /branches/foo\n"
+" was created:\n"
+" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n"
+msgstr ""
+
+#: ../svn/svn.c:755
+msgid "retrieve revision property ARG"
+msgstr ""
+
+#: ../svn/svn.c:756
+msgid "the change made in revision ARG"
+msgstr ""
+
+#. For this large section, let's keep it unindented for easier
+#. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw'
+#. * (with quotes and newlines removed).
+#: ../svn/svn.c:762
+msgid ""
+"Merge changes into a working copy.\n"
+"usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n"
+" (the 'complete' merge)\n"
+" 2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
+" (the 'cherry-pick' merge)\n"
+" 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
+" (the '2-URL' merge)\n"
+"\n"
+" 1. This form, with one source path and no revision range, is called\n"
+" a 'complete' merge:\n"
+"\n"
+" svn merge SOURCE[@REV] [TARGET_WCPATH]\n"
+"\n"
+" The complete merge is used for the 'sync' and 'reintegrate' merges\n"
+" in the 'feature branch' pattern described below. It finds all the\n"
+" changes on the source branch that have not already been merged to the\n"
+" target branch, and merges them into the working copy. Merge tracking\n"
+" is used to know which changes have already been merged.\n"
+"\n"
+" SOURCE specifies the branch from where the changes will be pulled, and\n"
+" TARGET_WCPATH specifies a working copy of the target branch to which\n"
+" the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n"
+" each correspond to the root of a branch. (If you want to merge only a\n"
+" subtree, then the subtree path must be included in both SOURCE and\n"
+" TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n"
+"\n"
+" SOURCE is usually a URL. The optional '@REV' specifies both the peg\n"
+" revision of the URL and the latest revision that will be considered\n"
+" for merging; if REV is not specified, the HEAD revision is assumed. If\n"
+" SOURCE is a working copy path, the corresponding URL of the path is\n"
+" used, and the default value of 'REV' is the base revision (usually the\n"
+" revision last updated to).\n"
+"\n"
+" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
+" assumed. There are some special cases:\n"
+"\n"
+" - If SOURCE is a URL:\n"
+"\n"
+" - If the basename of the URL and the basename of '.' are the\n"
+" same, then the differences are applied to '.'. Otherwise,\n"
+" if a file with the same basename as that of the URL is found\n"
+" within '.', then the differences are applied to that file.\n"
+" In all other cases, the target defaults to '.'.\n"
+"\n"
+" - If SOURCE is a working copy path:\n"
+"\n"
+" - If the source is a file, then differences are applied to that\n"
+" file (useful for reverse-merging earlier changes). Otherwise,\n"
+" if the source is a directory, then the target defaults to '.'.\n"
+"\n"
+" In normal usage the working copy should be up to date, at a single\n"
+" revision, with no local modifications and no switched subtrees.\n"
+"\n"
+" - The 'Feature Branch' Merging Pattern -\n"
+"\n"
+" In this commonly used work flow, known also as the 'development\n"
+" branch' pattern, a developer creates a branch and commits a series of\n"
+" changes that implement a new feature. The developer periodically\n"
+" merges all the latest changes from the parent branch so as to keep the\n"
+" development branch up to date with those changes. When the feature is\n"
+" complete, the developer performs a merge from the feature branch to\n"
+" the parent branch to re-integrate the changes.\n"
+"\n"
+" parent --+----------o------o-o-------------o--\n"
+" \\ \\ \\ /\n"
+" \\ merge merge merge\n"
+" \\ \\ \\ /\n"
+" feature +--o-o-------o----o-o----o-------\n"
+"\n"
+" A merge from the parent branch to the feature branch is called a\n"
+" 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n"
+" parent branch is called a 'reintegrate' merge.\n"
+"\n"
+" - Sync Merge Example -\n"
+" ............\n"
+" . .\n"
+" trunk --+------------L--------------R------\n"
+" \\ \\\n"
+" \\ |\n"
+" \\ v\n"
+" feature +------------------------o-----\n"
+" r100 r200\n"
+"\n"
+" Subversion will locate all the changes on 'trunk' that have not yet\n"
+" been merged into the 'feature' branch. In this case that is a single\n"
+" range, r100:200. In the diagram above, L marks the left side "
+"(trunk at 100)\n"
+" and R marks the right side (trunk at 200) of the merge source. The\n"
+" difference between L and R will be applied to the target working copy\n"
+" path. In this case, the working copy is a clean checkout of the entire\n"
+" 'feature' branch.\n"
+"\n"
+" To perform this sync merge, have a clean working copy of the feature\n"
+" branch and run the following command in its top-level directory:\n"
+"\n"
+" svn merge ^/trunk\n"
+"\n"
+" Note that the merge is now only in your local working copy and still\n"
+" needs to be committed to the repository so that it can be seen by\n"
+" others. You can review the changes and you may have to resolve\n"
+" conflicts before you commit the merge.\n"
+"\n"
+" - Reintegrate Merge Example -\n"
+"\n"
+" The feature branch was last synced with trunk up to revision X. So the\n"
+" difference between trunk at X and feature at HEAD contains the complete set\n"
+" of changes that implement the feature, and no other changes. These\n"
+" changes are applied to trunk.\n"
+"\n"
+" rW rX\n"
+" trunk ------+--------------------L------------------o\n"
+" \\ . ^\n"
+" \\ ............. /\n"
+" \\ . /\n"
+" feature +--------------------------------R\n"
+"\n"
+" In the diagram above, L marks the left side (trunk at X) and R marks the\n"
+" right side (feature at HEAD) of the merge. The difference between the\n"
+" left and right side is merged into trunk, the target.\n"
+"\n"
+" To perform the merge, have a clean working copy of trunk and run the\n"
+" following command in its top-level directory:\n"
+"\n"
+" svn merge ^/feature\n"
+"\n"
+" To prevent unnecessary merge conflicts, a reintegrate merge requires\n"
+" that TARGET_WCPATH is not a mixed-revision working copy, has no local\n"
+" modifications, and has no switched subtrees.\n"
+"\n"
+" A reintegrate merge also requires that the source branch is coherently\n"
+" synced with the target -- in the above example, this means that all\n"
+" revisions between the branch point W and the last merged revision X\n"
+" are merged to the feature branch, so that there are no unmerged\n"
+" revisions in-between.\n"
+"\n"
+"\n"
+" 2. This form is called a 'cherry-pick' merge:\n"
+"\n"
+" svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
+"\n"
+" A cherry-pick merge is used to merge specific revisions (or revision\n"
+" ranges) from one branch to another. By default, this uses merge\n"
+" tracking to automatically skip any revisions that have already been\n"
+" merged to the target; you can use the --ignore-ancestry option to\n"
+" disable such skipping.\n"
+"\n"
+" SOURCE is usually a URL. The optional '@REV' specifies only the peg\n"
+" revision of the URL and does not affect the merge range; if REV is not\n"
+" specified, the HEAD revision is assumed. If SOURCE is a working copy\n"
+" path, the corresponding URL of the path is used, and the default value\n"
+" of 'REV' is the base revision (usually the revision last updated to).\n"
+"\n"
+" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
+" assumed. The special cases noted above in the 'complete' merge form\n"
+" also apply here.\n"
+"\n"
+" The revision ranges to be merged are specified by the '-r' and/or '-c'\n"
+" options. '-r N:M' refers to the difference in the history of the\n"
+" source branch between revisions N and M. You can use '-c M' to merge\n"
+" single revisions: '-c M' is equivalent to '-r <M-1>:M'. Each such\n"
+" difference is applied to TARGET_WCPATH.\n"
+"\n"
+" If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n"
+" range were already merged, changes made in those revisions are not\n"
+" merged again. If needed, the range is broken into multiple sub-ranges,\n"
+" and each sub-range is merged separately.\n"
+"\n"
+" A 'reverse range' can be used to undo changes. For example, when\n"
+" source and target refer to the same branch, a previously committed\n"
+" revision can be 'undone'. In a reverse range, N is greater than M in\n"
+" '-r N:M', or the '-c' option is used with a negative number: '-c -M'\n"
+" is equivalent to '-r M:<M-1>'. Undoing changes like this is also known\n"
+" as performing a 'reverse merge'.\n"
+"\n"
+" Multiple '-c' and/or '-r' options may be specified and mixing of\n"
+" forward and reverse ranges is allowed.\n"
+"\n"
+" - Cherry-pick Merge Example -\n"
+"\n"
+" A bug has been fixed on trunk in revision 50. This fix needs to\n"
+" be merged from trunk onto the release branch.\n"
+"\n"
+" 1.x-release +-----------------------o-----\n"
+" / ^\n"
+" / |\n"
+" / |\n"
+" trunk ------+--------------------------LR-----\n"
+" r50\n"
+"\n"
+" In the above diagram, L marks the left side (trunk at 49) and R marks the\n"
+" right side (trunk at 50) of the merge. The difference between the left\n"
+" and right side is applied to the target working copy path.\n"
+"\n"
+" Note that the difference between revision 49 and 50 is exactly those\n"
+" changes that were committed in revision 50, not including changes\n"
+" committed in revision 49.\n"
+"\n"
+" To perform the merge, have a clean working copy of the release branch\n"
+" and run the following command in its top-level directory; remember\n"
+" that the default target is '.':\n"
+"\n"
+" svn merge -c50 ^/trunk\n"
+"\n"
+" You can also cherry-pick several revisions and/or revision ranges:\n"
+"\n"
+" svn merge -c50,54,60 -r65:68 ^/trunk\n"
+"\n"
+"\n"
+" 3. This form is called a '2-URL merge':\n"
+"\n"
+" svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
+"\n"
+" You should use this merge variant only if the other variants do not\n"
+" apply to your situation, as this variant can be quite complex to\n"
+" master.\n"
+"\n"
+" Two source URLs are specified, identifying two trees on the same\n"
+" branch or on different branches. The trees are compared and the\n"
+" difference from SOURCE1 at REV1 to SOURCE2 at REV2 is applied to the\n"
+" working copy of the target branch at TARGET_WCPATH. The target\n"
+" branch may be the same as one or both sources, or different again.\n"
+" The three branches involved can be completely unrelated.\n"
+"\n"
+" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
+" assumed. The special cases noted above in the 'complete' merge form\n"
+" also apply here.\n"
+"\n"
+" SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n"
+" in which case the merge source URL is derived from the working copy.\n"
+"\n"
+" - 2-URL Merge Example -\n"
+"\n"
+" Two features have been developed on separate branches called 'foo' and\n"
+" 'bar'. It has since become clear that 'bar' should be combined with\n"
+" the 'foo' branch for further development before reintegration.\n"
+"\n"
+" Although both feature branches originate from trunk, they are not\n"
+" directly related -- one is not a direct copy of the other. A 2-URL\n"
+" merge is necessary.\n"
+"\n"
+" The 'bar' branch has been synced with trunk up to revision 500.\n"
+" (If this revision number is not known, it can be located using the\n"
+" 'svn log' and/or 'svn mergeinfo' commands.)\n"
+" The difference between trunk at 500 and bar at HEAD contains the complete\n"
+" set of changes related to feature 'bar', and no other changes. These\n"
+" changes are applied to the 'foo' branch.\n"
+"\n"
+" foo +-----------------------------------o\n"
+" / ^\n"
+" / /\n"
+" / r500 /\n"
+" trunk ------+------+-----------------L---------> /\n"
+" \\ . /\n"
+" \\ ............ /\n"
+" \\ . /\n"
+" bar +-----------------------------------R\n"
+"\n"
+" In the diagram above, L marks the left side (trunk at 500) and R marks\n"
+" the right side (bar at HEAD) of the merge. The difference between the\n"
+" left and right side is applied to the target working copy path, in\n"
+" this case a working copy of the 'foo' branch.\n"
+"\n"
+" To perform the merge, have a clean working copy of the 'foo' branch\n"
+" and run the following command in its top-level directory:\n"
+"\n"
+" svn merge ^/trunk at 500 ^/bar\n"
+"\n"
+" The exact changes applied by a 2-URL merge can be previewed with svn's\n"
+" diff command, which is a good idea to verify if you do not have the\n"
+" luxury of a clean working copy to merge to. In this case:\n"
+"\n"
+" svn diff ^/trunk at 500 ^/bar at HEAD\n"
+"\n"
+"\n"
+" The following applies to all types of merges:\n"
+"\n"
+" To prevent unnecessary merge conflicts, svn merge requires that\n"
+" TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n"
+" before starting a merge ensures that all items in the working copy are\n"
+" based on the same revision.\n"
+"\n"
+" If possible, you should have no local modifications in the merge's target\n"
+" working copy prior to the merge, to keep things simpler. It will be\n"
+" easier to revert the merge and to understand the branch's history.\n"
+"\n"
+" Switched sub-paths should also be avoided during merging, as they may\n"
+" cause incomplete merges and create subtree mergeinfo.\n"
+"\n"
+" For each merged item a line will be printed with characters reporting the\n"
+" action taken. These characters have the following meaning:\n"
+"\n"
+" A Added\n"
+" D Deleted\n"
+" U Updated\n"
+" C Conflict\n"
+" G Merged\n"
+" E Existed\n"
+" R Replaced\n"
+"\n"
+" Characters in the first column report about the item itself.\n"
+" Characters in the second column report about properties of the item.\n"
+" A 'C' in the third column indicates a tree conflict, while a 'C' in\n"
+" the first and second columns indicate textual conflicts in files\n"
+" and in property values, respectively.\n"
+"\n"
+" - Merge Tracking -\n"
+"\n"
+" Subversion uses the svn:mergeinfo property to track merge history. This\n"
+" property is considered at the start of a merge to determine what to merge\n"
+" and it is updated at the conclusion of the merge to describe the merge\n"
+" that took place. Mergeinfo is used only if the two sources are on the\n"
+" same line of history -- if the first source is an ancestor of the second,\n"
+" or vice-versa (i.e. if one has originally been created by copying the\n"
+" other). This is verified and enforced when using sync merges and\n"
+" reintegrate merges.\n"
+"\n"
+" The --ignore-ancestry option prevents merge tracking and thus ignores\n"
+" mergeinfo, neither considering it nor recording it.\n"
+"\n"
+" - Merging from foreign repositories -\n"
+"\n"
+" Subversion does support merging from foreign repositories.\n"
+" While all merge source URLs must point to the same repository, the merge\n"
+" target working copy may come from a different repository than the source.\n"
+" However, there are some caveats. Most notably, copies made in the\n"
+" merge source will be transformed into plain additions in the merge\n"
+" target. Also, merge-tracking is not supported for merges from foreign\n"
+" repositories.\n"
+msgstr ""
+
+#: ../svn/svn.c:1094
+msgid ""
+"Display merge-related information.\n"
+"usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
+" 2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n"
+"\n"
+" 1. Summarize the history of merging between SOURCE and TARGET. The graph\n"
+" shows, from left to right:\n"
+" the youngest common ancestor of the branches;\n"
+" the latest full merge in either direction, and thus the common base\n"
+" that will be used for the next complete merge;\n"
+" the repository path and revision number of the tip of each branch.\n"
+"\n"
+" 2. Print the revision numbers on SOURCE that have been merged to TARGET\n"
+" (with --show-revs=merged), or that have not been merged to TARGET\n"
+" (with --show-revs=eligible). Print only revisions in which there was\n"
+" at least one change in SOURCE.\n"
+"\n"
+" If --revision (-r) is provided, filter the displayed information to\n"
+" show only that which is associated with the revisions within the\n"
+" specified range. Revision numbers, dates, and the 'HEAD' keyword are\n"
+" valid range values.\n"
+"\n"
+" SOURCE and TARGET are the source and target branch URLs, respectively.\n"
+" (If a WC path is given, the corresponding base URL is used.) The default\n"
+" TARGET is the current working directory ('.'). REV specifies the revision\n"
+" to be considered the tip of the branch; the default for SOURCE is HEAD,\n"
+" and the default for TARGET is HEAD for a URL or BASE for a WC path.\n"
+"\n"
+" The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"
+msgstr ""
+
+#: ../svn/svn.c:1125
+msgid ""
+"Create a new directory under version control.\n"
+"usage: 1. mkdir PATH...\n"
+" 2. mkdir URL...\n"
+"\n"
+" Create version controlled directories.\n"
+"\n"
+" 1. Each directory specified by a working copy PATH is created locally\n"
+" and scheduled for addition upon the next commit.\n"
+"\n"
+" 2. Each directory specified by a URL is created in the repository via\n"
+" an immediate commit.\n"
+"\n"
+" In both cases, all the intermediate directories must already exist,\n"
+" unless the --parents option is given.\n"
+msgstr ""
+
+#: ../svn/svn.c:1142
+msgid ""
+"Move (rename) an item in a working copy or repository.\n"
+"usage: move SRC... DST\n"
+"\n"
+" SRC and DST can both be working copy (WC) paths or URLs:\n"
+" WC -> WC: move an item in a working copy, as a local change to\n"
+" be committed later (with or without further changes)\n"
+" URL -> URL: move an item in the repository directly, immediately\n"
+" creating a new revision in the repository\n"
+" All the SRCs must be of the same type. When moving multiple sources,\n"
+" they will be added as children of DST, which must be a directory.\n"
+"\n"
+" SRC and DST of WC -> WC moves must be committed in the same revision.\n"
+" Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n"
+" To avoid unnecessary conflicts, it is recommended to run 'svn update'\n"
+" to update the subtree to a single revision before moving it.\n"
+" The --allow-mixed-revisions option is provided for backward "
+"compatibility.\n"
+"\n"
+" The --revision option has no use and is deprecated.\n"
+msgstr ""
+
+#: ../svn/svn.c:1164
+msgid ""
+"Apply a patch to a working copy.\n"
+"usage: patch PATCHFILE [WCPATH]\n"
+"\n"
+" Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n"
+" If WCPATH is omitted, '.' is assumed.\n"
+"\n"
+" A unidiff patch suitable for application to a working copy can be\n"
+" produced with the 'svn diff' command or third-party diffing tools.\n"
+" Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n"
+" property diffs as produced by 'svn diff'.\n"
+"\n"
+" Changes listed in the patch will either be applied or rejected.\n"
+" If a change does not match at its exact line offset, it may be applied\n"
+" earlier or later in the file if a match is found elsewhere for the\n"
+" surrounding lines of context provided by the patch.\n"
+" A change may also be applied with fuzz, which means that one\n"
+" or more lines of context are ignored when matching the change.\n"
+" If no matching context can be found for a change, the change conflicts\n"
+" and will be written to a reject file with the extension .svnpatch.rej.\n"
+"\n"
+" For each patched file a line will be printed with characters reporting\n"
+" the action taken. These characters have the following meaning:\n"
+"\n"
+" A Added\n"
+" D Deleted\n"
+" U Updated\n"
+" C Conflict\n"
+" G Merged (with local uncommitted changes)\n"
+"\n"
+" Changes applied with an offset or fuzz are reported on lines starting\n"
+" with the '>' symbol. You should review such changes carefully.\n"
+"\n"
+" If the patch removes all content from a file, that file is scheduled\n"
+" for deletion. If the patch creates a new file, that file is scheduled\n"
+" for addition. Use 'svn revert' to undo deletions and additions you\n"
+" do not agree with.\n"
+"\n"
+" Hint: If the patch file was created with Subversion, it will contain\n"
+" the number of a revision N the patch will cleanly apply to\n"
+" (look for lines like '--- foo/bar.txt (revision N)').\n"
+" To avoid rejects, first update to the revision N using\n"
+" 'svn update -r N', apply the patch, and then update back to the\n"
+" HEAD revision. This way, conflicts can be resolved interactively.\n"
+msgstr ""
+
+#: ../svn/svn.c:1212
+msgid ""
+"Remove a property from files, dirs, or revisions.\n"
+"usage: 1. propdel PROPNAME [PATH...]\n"
+" 2. propdel PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Removes versioned props in working copy.\n"
+" 2. Removes unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+
+#: ../svn/svn.c:1222
+msgid ""
+"Edit a property with an external editor.\n"
+"usage: 1. propedit PROPNAME TARGET...\n"
+" 2. propedit PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Edits versioned prop in working copy or repository.\n"
+" 2. Edits unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" See 'svn help propset' for more on setting properties.\n"
+msgstr ""
+
+#: ../svn/svn.c:1234
+msgid ""
+"Print the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
+" 2. propget PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Prints versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Prints unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" With --verbose, the target path and the property name are printed on\n"
+" separate lines before each value, like 'svn proplist --verbose'.\n"
+" Otherwise, if there is more than one TARGET or a depth other than\n"
+" 'empty', the target path is printed on the same line before each value.\n"
+"\n"
+" By default, an extra newline is printed after the property value so that\n"
+" the output looks pretty. With a single TARGET and depth 'empty', you can\n"
+" use the --strict option to disable this (useful when redirecting a binary\n"
+" property value to a file, for example).\n"
+msgstr ""
+
+#: ../svn/svn.c:1254 ../svn/svn.c:1271
+msgid "print path, name and value on separate lines"
+msgstr ""
+
+#: ../svn/svn.c:1255
+msgid "don't print an extra newline"
+msgstr ""
+
+#: ../svn/svn.c:1258
+msgid ""
+"List all properties on files, dirs, or revisions.\n"
+"usage: 1. proplist [TARGET[@REV]...]\n"
+" 2. proplist --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Lists versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Lists unversioned remote props on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" With --verbose, the property values are printed as well, like 'svn "
+"propget\n"
+" --verbose'. With --quiet, the paths are not printed.\n"
+msgstr ""
+
+#: ../svn/svn.c:1272
+msgid "don't print the path"
+msgstr ""
+
+#: ../svn/svn.c:1275
+msgid ""
+"Set the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propset PROPNAME PROPVAL PATH...\n"
+" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1. Changes a versioned file or directory property in a working copy.\n"
+" 2. Changes an unversioned property on a repository revision.\n"
+" (TARGET only determines which repository to access.)\n"
+"\n"
+" The value may be provided with the --file option instead of PROPVAL.\n"
+"\n"
+" Property names starting with 'svn:' are reserved. Subversion recognizes\n"
+" the following special versioned properties on a file:\n"
+" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
+" URL, HeadURL - The URL for the head version of the file.\n"
+" Author, LastChangedBy - The last person to modify the file.\n"
+" Date, LastChangedDate - The date/time the file was last modified.\n"
+" Rev, Revision, - The last revision the file changed.\n"
+" LastChangedRevision\n"
+" Id - A compressed summary of the previous four.\n"
+" Header - Similar to Id but includes the full URL.\n"
+"\n"
+" Custom keywords can be defined with a format string separated from\n"
+" the keyword name with '='. Valid format substitutions are:\n"
+" %a - The author of the revision given by %r.\n"
+" %b - The basename of the URL of the file.\n"
+" %d - Short format of the date of the revision given by %r.\n"
+" %D - Long format of the date of the revision given by %r.\n"
+" %P - The file's path, relative to the repository root.\n"
+" %r - The number of the revision which last changed the file.\n"
+" %R - The URL to the root of the repository.\n"
+" %u - The URL of the file.\n"
+" %_ - A space (keyword definitions cannot contain a literal "
+"space).\n"
+" %% - A literal '%'.\n"
+" %H - Equivalent to %P%_%r%_%d%_%a.\n"
+" %I - Equivalent to %b%_%r%_%d%_%a.\n"
+" Example custom keyword definition: MyKeyword=%r%_%a%_%P\n"
+" Once a custom keyword has been defined for a file, it can be used\n"
+" within the file like any other keyword: $MyKeyword$\n"
+"\n"
+" svn:executable - If present, make the file executable. Use\n"
+" 'svn propdel svn:executable PATH...' to clear.\n"
+" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
+" svn:mime-type - The mimetype of the file. Used to determine\n"
+" whether to merge the file, and how to serve it from Apache.\n"
+" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
+" treated as text. Anything else is treated as binary.\n"
+" svn:needs-lock - If present, indicates that the file should be locked\n"
+" before it is modified. Makes the working copy file read-only\n"
+" when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n"
+" to clear.\n"
+"\n"
+" Subversion recognizes the following special versioned properties on a\n"
+" directory:\n"
+" svn:ignore - A list of file glob patterns to ignore, one per "
+"line.\n"
+" svn:global-ignores - Like svn:ignore, but inheritable.\n"
+" svn:externals - A list of module specifiers, one per line, in the\n"
+" following format similar to the syntax of 'svn checkout':\n"
+" [-r REV] URL[@PEG] LOCALPATH\n"
+" Example:\n"
+" http://example.com/repos/zig foo/bar\n"
+" The LOCALPATH is relative to the directory having this property.\n"
+" To pin the external to a known revision, specify the optional REV:\n"
+" -r25 http://example.com/repos/zig foo/bar\n"
+" To unambiguously identify an element at a path which may have been\n"
+" subsequently deleted or renamed, specify the optional PEG revision:\n"
+" -r25 http://example.com/repos/zig@42 foo/bar\n"
+" The URL may be a full URL or a relative URL starting with one of:\n"
+" ../ to the parent directory of the extracted external\n"
+" ^/ to the repository root\n"
+" / to the server root\n"
+" // to the URL scheme\n"
+" Use of the following format is discouraged but is supported for\n"
+" interoperability with Subversion 1.4 and earlier clients:\n"
+" LOCALPATH [-r PEG] URL\n"
+" The ambiguous format 'relative_path relative_path' is taken as\n"
+" 'relative_url relative_path' with peg revision support.\n"
+" Lines starting with a '#' character are ignored.\n"
+msgstr ""
+
+#: ../svn/svn.c:1354
+msgid "read property value from file ARG"
+msgstr ""
+
+#: ../svn/svn.c:1357
+msgid ""
+"Relocate the working copy to point to a different repository root URL.\n"
+"usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
+" 2. relocate TO-URL [PATH]\n"
+"\n"
+" Rewrite working copy URL metadata to reflect a syntactic change only.\n"
+" This is used when a repository's root URL changes (such as a scheme\n"
+" or hostname change) but your working copy still reflects the same\n"
+" directory within the same repository.\n"
+"\n"
+" 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n"
+" copy's current and new URLs, respectively. (You may specify the\n"
+" complete old and new URLs if you wish.) Use 'svn info' to determine\n"
+" the current working copy URL.\n"
+"\n"
+" 2. TO-URL is the (complete) new repository URL to use for PATH.\n"
+"\n"
+" Examples:\n"
+" svn relocate http:// svn:// project1 project2\n"
+" svn relocate http://www.example.com/repo/project \\\n"
+" svn://svn.example.com/repo/project\n"
+msgstr ""
+
+#: ../svn/svn.c:1380
+msgid ""
+"Resolve conflicts on working copy files or directories.\n"
+"usage: resolve [PATH...]\n"
+"\n"
+" By default, perform interactive conflict resolution on PATH.\n"
+" In this mode, the command is recursive by default (depth 'infinity').\n"
+"\n"
+" The --accept=ARG option prevents interactive prompting and forces\n"
+" conflicts on PATH to be resolved in the manner specified by ARG.\n"
+" In this mode, the command is not recursive by default (depth 'empty').\n"
+msgstr ""
+
+#: ../svn/svn.c:1390
+msgid ""
+"specify automatic conflict resolution source\n"
+" ('base', 'working', 'mine-conflict',\n"
+" 'theirs-conflict', 'mine-full', 'theirs-full')"
+msgstr ""
+
+#: ../svn/svn.c:1397
+msgid ""
+"Remove 'conflicted' state on working copy files or directories.\n"
+"usage: resolved PATH...\n"
+"\n"
+" Note: this subcommand does not semantically resolve conflicts or\n"
+" remove conflict markers; it merely removes the conflict-related\n"
+" artifact files and allows PATH to be committed again. It has been\n"
+" deprecated in favor of running 'svn resolve --accept working'.\n"
+msgstr ""
+
+#: ../svn/svn.c:1407
+msgid ""
+"Restore pristine working copy state (undo local changes).\n"
+"usage: revert PATH...\n"
+"\n"
+" Revert changes in the working copy at or within PATH, and remove\n"
+" conflict markers as well, if any.\n"
+"\n"
+" This subcommand does not revert already committed changes.\n"
+" For information about undoing already committed changes, search\n"
+" the output of 'svn help merge' for 'undo'.\n"
+msgstr ""
+
+#: ../svn/svn.c:1419
+msgid ""
+"Print the status of working copy files and directories.\n"
+"usage: status [PATH...]\n"
+"\n"
+" With no args, print only locally modified items (no network access).\n"
+" With -q, print only summary information about locally modified items.\n"
+" With -u, add working revision and server out-of-date information.\n"
+" With -v, print full revision information on every item.\n"
+"\n"
+" The first seven columns in the output are each one character wide:\n"
+" First column: Says if item was added, deleted, or otherwise changed\n"
+" ' ' no modifications\n"
+" 'A' Added\n"
+" 'C' Conflicted\n"
+" 'D' Deleted\n"
+" 'I' Ignored\n"
+" 'M' Modified\n"
+" 'R' Replaced\n"
+" 'X' an unversioned directory created by an externals definition\n"
+" '?' item is not under version control\n"
+" '!' item is missing (removed by non-svn command) or incomplete\n"
+" '~' versioned item obstructed by some item of a different kind\n"
+" Second column: Modifications of a file's or directory's properties\n"
+" ' ' no modifications\n"
+" 'C' Conflicted\n"
+" 'M' Modified\n"
+" Third column: Whether the working copy is locked for writing by\n"
+" another Subversion client modifying the working copy\n"
+" ' ' not locked for writing\n"
+" 'L' locked for writing\n"
+" Fourth column: Scheduled commit will contain addition-with-history\n"
+" ' ' no history scheduled with commit\n"
+" '+' history scheduled with commit\n"
+" Fifth column: Whether the item is switched or a file external\n"
+" ' ' normal\n"
+" 'S' the item has a Switched URL relative to the parent\n"
+" 'X' a versioned file created by an eXternals definition\n"
+" Sixth column: Whether the item is locked in repository for exclusive "
+"commit\n"
+" (without -u)\n"
+" ' ' not locked by this working copy\n"
+" 'K' locked by this working copy, but lock might be stolen or broken\n"
+" (with -u)\n"
+" ' ' not locked in repository, not locked by this working copy\n"
+" 'K' locked in repository, lock owned by this working copy\n"
+" 'O' locked in repository, lock owned by another working copy\n"
+" 'T' locked in repository, lock owned by this working copy was stolen\n"
+" 'B' not locked in repository, lock owned by this working copy is "
+"broken\n"
+" Seventh column: Whether the item is the victim of a tree conflict\n"
+" ' ' normal\n"
+" 'C' tree-Conflicted\n"
+" If the item is a tree conflict victim, an additional line is printed\n"
+" after the item's status line, explaining the nature of the conflict.\n"
+"\n"
+" The out-of-date information appears in the ninth column (with -u):\n"
+" '*' a newer revision exists on the server\n"
+" ' ' the working copy is up to date\n"
+"\n"
+" Remaining fields are variable width and delimited by spaces:\n"
+" The working revision (with -u or -v; '-' if the item is copied)\n"
+" The last committed revision and last committed author (with -v)\n"
+" The working copy path is always the final field, so it can\n"
+" include spaces.\n"
+"\n"
+" The presence of a question mark ('?') where a working revision, last\n"
+" committed revision, or last committed author was expected indicates\n"
+" that the information is unknown or irrelevant given the state of the\n"
+" item (for example, when the item is the result of a copy operation).\n"
+" The question mark serves as a visual placeholder to facilitate parsing.\n"
+"\n"
+" Example output:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + - wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + - 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status\n"
+" M wc/bar.c\n"
+" ! C wc/qaz.c\n"
+" > local missing, incoming edit upon update\n"
+" D wc/qax.c\n"
+msgstr ""
+
+#: ../svn/svn.c:1512
+msgid "don't print unversioned items"
+msgstr ""
+
+#: ../svn/svn.c:1515
+msgid ""
+"Update the working copy to a different URL within the same repository.\n"
+"usage: 1. switch URL[@PEGREV] [PATH]\n"
+" 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
+"\n"
+" 1. Update the working copy to mirror a new URL within the repository.\n"
+" This behavior is similar to 'svn update', and is the way to\n"
+" move a working copy to a branch or tag within the same repository.\n"
+" If specified, PEGREV determines in which revision the target is first\n"
+" looked up.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy do not automatically cause a failure if the switch attempts to\n"
+" add the same path. If the obstructing path is the same type (file\n"
+" or directory) as the corresponding path in the repository it becomes\n"
+" versioned but its contents are left 'as-is' in the working copy.\n"
+" This means that an obstructing directory's unversioned children may\n"
+" also obstruct and become versioned. For files, any content "
+"differences\n"
+" between the obstruction and the repository are treated like a local\n"
+" modification to the working copy. All properties from the repository\n"
+" are applied to the obstructing path.\n"
+"\n"
+" Use the --set-depth option to set a new working copy depth on the\n"
+" targets of this operation.\n"
+"\n"
+" By default, Subversion will refuse to switch a working copy path to\n"
+" a new URL with which it shares no common version control ancestry.\n"
+" Use the '--ignore-ancestry' option to override this sanity check.\n"
+"\n"
+" 2. The '--relocate' option is deprecated. This syntax is equivalent to\n"
+" 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n"
+"\n"
+" See also 'svn help update' for a list of possible characters\n"
+" reporting the action taken.\n"
+"\n"
+" Examples:\n"
+" svn switch ^/branches/1.x-release\n"
+" svn switch --relocate http:// svn://\n"
+" svn switch --relocate http://www.example.com/repo/project \\\n"
+" svn://svn.example.com/repo/project\n"
+msgstr ""
+
+#: ../svn/svn.c:1557
+msgid "allow switching to a node with no common ancestor"
+msgstr ""
+
+#: ../svn/svn.c:1561
+msgid ""
+"Unlock working copy paths or URLs.\n"
+"usage: unlock TARGET...\n"
+"\n"
+" Use --force to break the lock.\n"
+msgstr ""
+
+#: ../svn/svn.c:1568
+msgid ""
+"Bring changes from the repository into the working copy.\n"
+"usage: update [PATH...]\n"
+"\n"
+" If no revision is given, bring working copy up-to-date with HEAD rev.\n"
+" Else synchronize working copy to revision given by -r.\n"
+"\n"
+" For each updated item a line will be printed with characters reporting\n"
+" the action taken. These characters have the following meaning:\n"
+"\n"
+" A Added\n"
+" D Deleted\n"
+" U Updated\n"
+" C Conflict\n"
+" G Merged\n"
+" E Existed\n"
+" R Replaced\n"
+"\n"
+" Characters in the first column report about the item itself.\n"
+" Characters in the second column report about properties of the item.\n"
+" A 'B' in the third column signifies that the lock for the file has\n"
+" been broken or stolen.\n"
+" A 'C' in the fourth column indicates a tree conflict, while a 'C' in\n"
+" the first and second columns indicate textual conflicts in files\n"
+" and in property values, respectively.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy do not automatically cause a failure if the update attempts to\n"
+" add the same path. If the obstructing path is the same type (file\n"
+" or directory) as the corresponding path in the repository it becomes\n"
+" versioned but its contents are left 'as-is' in the working copy.\n"
+" This means that an obstructing directory's unversioned children may\n"
+" also obstruct and become versioned. For files, any content differences\n"
+" between the obstruction and the repository are treated like a local\n"
+" modification to the working copy. All properties from the repository\n"
+" are applied to the obstructing path. Obstructing paths are reported\n"
+" in the first column with code 'E'.\n"
+"\n"
+" If the specified update target is missing from the working copy but its\n"
+" immediate parent directory is present, checkout the target into its\n"
+" parent directory at the specified depth. If --parents is specified,\n"
+" create any missing parent directories of the target by checking them\n"
+" out, too, at depth=empty.\n"
+"\n"
+" Use the --set-depth option to set a new working copy depth on the\n"
+" targets of this operation.\n"
+msgstr ""
+
+#: ../svn/svn.c:1618
+msgid ""
+"Upgrade the metadata storage format for a working copy.\n"
+"usage: upgrade [WCPATH...]\n"
+"\n"
+" Local modifications are preserved.\n"
+msgstr ""
+
+#: ../svn/svn.c:1664 ../svnadmin/svnadmin.c:90 ../svnlook/svnlook.c:380
+#: ../svnrdump/svnrdump.c:65 ../svnsync/svnsync.c:297
+msgid "Caught signal"
+msgstr ""
+
+#: ../svn/svn.c:1817 ../svnlook/svnlook.c:2565
+msgid "Non-numeric limit argument given"
+msgstr ""
+
+#: ../svn/svn.c:1823 ../svnlook/svnlook.c:2571
+msgid "Argument to --limit must be positive"
+msgstr ""
+
+#: ../svn/svn.c:1844 ../svn/svn.c:2121
+msgid "Can't specify -c with --old"
+msgstr ""
+
+#: ../svn/svn.c:1875
+#, c-format
+msgid "Negative number in range (%s) not supported with -c"
+msgstr ""
+
+#: ../svn/svn.c:1888
+#, c-format
+msgid "Non-numeric change argument (%s) given to -c"
+msgstr ""
+
+#: ../svn/svn.c:1896
+msgid "There is no change 0"
+msgstr ""
+
+#: ../svn/svn.c:1939 ../svnadmin/svnadmin.c:2037 ../svnrdump/svnrdump.c:937
+#: ../svnsync/svnsync.c:2052
+#, c-format
+msgid "Syntax error in revision argument '%s'"
+msgstr ""
+
+#: ../svn/svn.c:2005 ../svn/svn.c:2024
+#, c-format
+msgid "Error converting depth from locale to UTF-8"
+msgstr ""
+
+#: ../svn/svn.c:2013
+#, c-format
+msgid ""
+"'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
+msgstr ""
+
+#: ../svn/svn.c:2032
+#, c-format
+msgid ""
+"'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or "
+"'infinity'"
+msgstr ""
+
+#: ../svn/svn.c:2161
+#, c-format
+msgid "Syntax error in native-eol argument '%s'"
+msgstr ""
+
+#: ../svn/svn.c:2181
+msgid "Changelist names must not be empty"
+msgstr ""
+
+#: ../svn/svn.c:2215
+#, c-format
+msgid "'%s' is not a valid --accept value"
+msgstr ""
+
+#: ../svn/svn.c:2223
+#, c-format
+msgid "'%s' is not a valid --show-revs value"
+msgstr ""
+
+#: ../svn/svn.c:2235
+#, c-format
+msgid "Invalid strip count '%s'"
+msgstr ""
+
+#: ../svn/svn.c:2241
+msgid "Argument to --strip must be positive"
+msgstr ""
+
+#: ../svn/svn.c:2296 ../svnmucc/svnmucc.c:1208 ../svnrdump/svnrdump.c:993
+#: ../svnsync/svnsync.c:2096
+msgid "--non-interactive and --force-interactive are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2350 ../svndumpfilter/svndumpfilter.c:1539
+#: ../svnlook/svnlook.c:2667
+#, c-format
+msgid "Subcommand argument required\n"
+msgstr ""
+
+#: ../svn/svn.c:2367 ../svnadmin/svnadmin.c:2220
+#: ../svndumpfilter/svndumpfilter.c:1559 ../svnlook/svnlook.c:2686
+#: ../svnrdump/svnrdump.c:1039
+#, c-format
+msgid "Unknown subcommand: '%s'\n"
+msgstr ""
+
+#: ../svn/svn.c:2376
+#, c-format
+msgid ""
+"Undo is done using either the 'svn revert' or the 'svn merge' command.\n"
+msgstr ""
+
+#: ../svn/svn.c:2411
+#, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svn help %s' for usage.\n"
+msgstr ""
+
+#: ../svn/svn.c:2425
+msgid ""
+"Multiple revision arguments encountered; can't specify -c twice, or both -c "
+"and -r"
+msgstr ""
+
+#: ../svn/svn.c:2437
+msgid "--depth and --set-depth are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2447
+msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2457
+msgid "--with-revprop and --with-no-revprops are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2470
+msgid "--message (-m) and --file (-F) are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2479 ../svnmucc/svnmucc.c:1219 ../svnrdump/svnrdump.c:1098
+#: ../svnsync/svnsync.c:2147
+msgid "--trust-server-cert requires --non-interactive"
+msgstr ""
+
+#: ../svn/svn.c:2489
+msgid "--diff-cmd and --internal-diff are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2531
+msgid "--relocate and --depth are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2539
+msgid "--relocate and --non-recursive (-N) are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2661
+msgid "Log message file is a versioned file; use '--force-log' to override"
+msgstr ""
+
+#: ../svn/svn.c:2668
+msgid "Lock comment file is a versioned file; use '--force-log' to override"
+msgstr ""
+
+#: ../svn/svn.c:2689
+msgid ""
+"The log message is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr ""
+
+#: ../svn/svn.c:2696
+msgid ""
+"The lock comment is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr ""
+
+#: ../svn/svn.c:2720
+msgid "--auto-props and --no-auto-props are mutually exclusive"
+msgstr ""
+
+#: ../svn/svn.c:2825 ../svn/svn.c:2832
+#, c-format
+msgid "--accept=%s incompatible with --non-interactive"
+msgstr ""
+
+#: ../svn/svn.c:2888
+#, c-format
+msgid "Try 'svn help %s' for more information"
+msgstr ""
+
+#: ../svn/svn.c:2894
+msgid "Please see the 'svn upgrade' command"
+msgstr ""
+
+#: ../svn/svn.c:2900 ../svnmucc/svnmucc.c:1457 ../svnrdump/svnrdump.c:1175
+msgid ""
+"Authentication failed and interactive prompting is disabled; see the --force-"
+"interactive option"
+msgstr ""
+
+#: ../svn/svn.c:2905
+msgid ""
+"Reading file from standard input because of -F option; this can interfere "
+"with interactive prompting"
+msgstr ""
+
+#: ../svn/svn.c:2916
+msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)"
+msgstr ""
+
+#: ../svn/svn.c:2923
+msgid ""
+"Another process is blocking the working copy database, or the underlying "
+"filesystem does not support file locking; if the working copy is on a "
+"network filesystem, make sure file locking has been enabled on the file "
+"server"
+msgstr ""
+
+#: ../svn/svn.c:2936
+msgid ""
+"When using svn+ssh:// URLs, keep in mind that the --username and --password "
+"options are ignored because authentication is performed by SSH, not "
+"Subversion"
+msgstr ""
+
+#: ../svn/switch-cmd.c:63
+#, c-format
+msgid "'%s' to '%s' is not a valid relocation"
+msgstr ""
+
+#: ../svn/switch-cmd.c:170
+#, c-format
+msgid ""
+"Path '%s' does not share common version control ancestry with the requested "
+"switch location. Use --ignore-ancestry to disable this check."
+msgstr ""
+
+#: ../svn/switch-cmd.c:180
+msgid ""
+"'svn switch' does not support switching a working copy to a different "
+"repository"
+msgstr ""
+
+#: ../svn/update-cmd.c:93
+#, c-format
+msgid "Summary of updates:\n"
+msgstr ""
+
+#: ../svn/update-cmd.c:97
+#, c-format
+msgid " Updated '%s' to r%ld.\n"
+msgstr ""
+
+#: ../svn/util.c:79
+#, c-format
+msgid ""
+"\n"
+"Committed revision %ld%s.\n"
+msgstr ""
+
+#: ../svn/util.c:83
+msgid " (the answer to life, the universe, and everything)"
+msgstr ""
+
+#: ../svn/util.c:92
+#, c-format
+msgid ""
+"\n"
+"Warning: %s\n"
+msgstr ""
+
+#: ../svn/util.c:133
+msgid ""
+"The SVN_MERGE environment variable is empty or consists solely of "
+"whitespace. Expected a shell command.\n"
+msgstr ""
+
+#: ../svn/util.c:139
+msgid ""
+"The environment variable SVN_MERGE and the merge-tool-cmd run-time "
+"configuration option were not set.\n"
+msgstr ""
+
+#: ../svn/util.c:169
+#, c-format
+msgid "The external merge tool exited with exit code %d"
+msgstr ""
+
+#: ../svn/util.c:211
+msgid "Log message contains a zero byte"
+msgstr ""
+
+#: ../svn/util.c:269
+#, c-format
+msgid " '%s'"
+msgstr ""
+
+#: ../svn/util.c:273
+msgid "Your commit message was left in a temporary file:"
+msgstr ""
+
+#: ../svn/util.c:325
+msgid "--This line, and those below, will be ignored--"
+msgstr ""
+
+#: ../svn/util.c:360
+msgid "Error normalizing log message to internal format"
+msgstr ""
+
+#: ../svn/util.c:447 ../svnmucc/svnmucc.c:764
+msgid "Cannot invoke editor to get log message when non-interactive"
+msgstr ""
+
+#: ../svn/util.c:460
+msgid ""
+"Could not use external editor to fetch log message; consider setting the "
+"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
+"options"
+msgstr ""
+
+#: ../svn/util.c:496
+msgid ""
+"\n"
+"Log message unchanged or not specified\n"
+"(a)bort, (c)ontinue, (e)dit:\n"
+msgstr ""
+
+#: ../svn/util.c:549
+msgid ""
+"Use --force to override this restriction (local modifications may be lost)"
+msgstr ""
+
+#: ../svn/util.c:738 ../svn/util.c:771
+msgid "none"
+msgstr ""
+
+#: ../svn/util.c:739
+msgid "file"
+msgstr ""
+
+#: ../svn/util.c:740
+msgid "dir"
+msgstr ""
+
+#: ../svn/util.c:772
+msgid "update"
+msgstr ""
+
+#: ../svn/util.c:773
+msgid "switch"
+msgstr ""
+
+#: ../svn/util.c:896
+msgid "(invalid date)"
+msgstr ""
+
+#: ../svn/util.c:1056
+#, c-format
+msgid ""
+"svn: warning: '%s' is a binary mime-type but file '%s' looks like text; "
+"diff, merge, blame, and other operations will stop working on this file\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:217 ../svnrdump/svnrdump.c:120
+msgid "specify revision number ARG (or X:Y range)"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:220 ../svnlook/svnlook.c:162
+msgid "specify transaction name ARG"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:223
+msgid "dump or hotcopy incrementally"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:226
+msgid "use deltas in dump output"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:229
+msgid "bypass the repository hook system"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:232
+msgid "bypass property validation logic"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:235 ../svnlook/svnlook.c:193
+#: ../svnrdump/svnrdump.c:122 ../svnserve/svnserve.c:289
+#: ../svnversion/svnversion.c:143
+msgid "no progress (only errors) to stderr"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:238
+msgid "ignore any repos UUID found in the stream"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:241
+msgid "set repos UUID to that found in stream, if any"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:244
+msgid "type of repository: 'fsfs' (default) or 'bdb'"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:247
+msgid "load at specified directory in repository"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:250
+msgid "disable fsync at transaction commit [Berkeley DB]"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:253
+msgid "disable automatic log file removal [Berkeley DB]"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:259
+msgid ""
+"remove redundant Berkeley DB log files\n"
+" from source repository [Berkeley DB]"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:263
+msgid "call pre-commit hook before committing revisions"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:266
+msgid "call post-commit hook after committing revisions"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:269
+msgid "call hook before changing revision property"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:272
+msgid "call hook after changing revision property"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:275
+msgid ""
+"wait instead of exit if the repository is in\n"
+" use by another process"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:279 ../svnadmin/svnadmin.c:282
+#: ../svnadmin/svnadmin.c:285
+msgid "deprecated; see --compatible-version"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:288
+msgid ""
+"size of the extra in-memory cache in MB used to\n"
+" minimize redundant operations. Default: 16.\n"
+" [used for FSFS repositories only]"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:293
+msgid ""
+"use repository format compatible with Subversion\n"
+" version ARG (\"1.5.5\", \"1.7\", etc.)"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:296
+msgid "read repository paths from file ARG"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:308
+msgid ""
+"usage: svnadmin crashtest REPOS_PATH\n"
+"\n"
+"Open the repository at REPOS_PATH, then abort, thus simulating\n"
+"a process that crashes while holding an open repository handle.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:314
+msgid ""
+"usage: svnadmin create REPOS_PATH\n"
+"\n"
+"Create a new, empty repository at REPOS_PATH.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:323
+msgid ""
+"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
+"\n"
+"Run over the requested revision range, performing predecessor delti-\n"
+"fication on the paths changed in those revisions. Deltification in\n"
+"essence compresses the repository by only storing the differences or\n"
+"delta from the preceding revision. If no revisions are specified,\n"
+"this will simply deltify the HEAD revision.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:332
+msgid ""
+"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n"
+"\n"
+"Dump the contents of filesystem to stdout in a 'dumpfile'\n"
+"portable format, sending feedback to stderr. Dump revisions\n"
+"LOWER rev through UPPER rev. If no revisions are given, dump all\n"
+"revision trees. If only LOWER is given, dump that one revision tree.\n"
+"If --incremental is passed, the first revision dumped will describe\n"
+"only the paths changed in that revision; otherwise it will describe\n"
+"every path present in the repository as of that revision. (In either\n"
+"case, the second and subsequent revisions, if any, describe only paths\n"
+"changed in those revisions.)\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:345
+msgid ""
+"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n"
+" 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n"
+"\n"
+"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
+"\n"
+"2. Like 1 except all repositories listed in FILE are locked. The file\n"
+" format is repository paths separated by newlines. Repositories are\n"
+" locked in the same order as they are listed in the file.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:355
+msgid ""
+"usage: svnadmin help [SUBCOMMAND...]\n"
+"\n"
+"Describe the usage of this program or its subcommands.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:360
+msgid ""
+"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
+"\n"
+"Make a hot copy of a repository.\n"
+"If --incremental is passed, data which already exists at the destination\n"
+"is not copied again. Incremental mode is implemented for FSFS "
+"repositories.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:367
+msgid ""
+"usage: svnadmin list-dblogs REPOS_PATH\n"
+"\n"
+"List all Berkeley DB log files.\n"
+"\n"
+"WARNING: Modifying or deleting logfiles which are still in use\n"
+"will cause your repository to be corrupted.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:374
+msgid ""
+"usage: svnadmin list-unused-dblogs REPOS_PATH\n"
+"\n"
+"List unused Berkeley DB log files.\n"
+"\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:379
+msgid ""
+"usage: svnadmin load REPOS_PATH\n"
+"\n"
+"Read a 'dumpfile'-formatted stream from stdin, committing\n"
+"new revisions into the repository's filesystem. If the repository\n"
+"was previously empty, its UUID will, by default, be changed to the\n"
+"one specified in the stream. Progress feedback is sent to stdout.\n"
+"If --revision is specified, limit the loaded revisions to only those\n"
+"in the dump stream whose revision numbers match the specified range.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:391
+msgid ""
+"usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n"
+"\n"
+"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n"
+"If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n"
+"triggering the pre-lock and post-lock hook scripts.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:398
+msgid ""
+"usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n"
+"\n"
+"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n"
+"if not provided, is the root of the repository).\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:404
+msgid ""
+"usage: svnadmin lstxns REPOS_PATH\n"
+"\n"
+"Print the names of all uncommitted transactions.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:409
+msgid ""
+"usage: svnadmin pack REPOS_PATH\n"
+"\n"
+"Possibly compact the repository into a more efficient storage model.\n"
+"This may not apply to all repositories, in which case, exit.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:415
+msgid ""
+"usage: svnadmin recover REPOS_PATH\n"
+"\n"
+"Run the recovery procedure on a repository. Do this if you've\n"
+"been getting errors indicating that recovery ought to be run.\n"
+"Berkeley DB recovery requires exclusive access and will\n"
+"exit if the repository is in use by another process.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:423
+msgid ""
+"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
+"\n"
+"Unconditionally remove lock from each LOCKED_PATH.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:428
+msgid ""
+"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
+"\n"
+"Delete the named transaction(s).\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:433
+msgid ""
+"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
+"\n"
+"Set the log-message on revision REVISION to the contents of FILE. Use\n"
+"--bypass-hooks to avoid triggering the revision-property-related hooks\n"
+"(for example, if you do not want an email notification sent\n"
+"from your post-revprop-change hook, or because the modification of\n"
+"revision properties has not been enabled in the pre-revprop-change\n"
+"hook).\n"
+"\n"
+"NOTE: Revision properties are not versioned, so this command will\n"
+"overwrite the previous log message.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:445
+msgid ""
+"usage: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
+"\n"
+"Set the property NAME on revision REVISION to the contents of FILE. Use\n"
+"--use-pre-revprop-change-hook/--use-post-revprop-change-hook to trigger\n"
+"the revision property-related hooks (for example, if you want an email\n"
+"notification sent from your post-revprop-change hook).\n"
+"\n"
+"NOTE: Revision properties are not versioned, so this command will\n"
+"overwrite the previous value of the property.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:456
+msgid ""
+"usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n"
+"\n"
+"Reset the repository UUID for the repository located at REPOS_PATH. If\n"
+"NEW_UUID is provided, use that as the new repository UUID; otherwise,\n"
+"generate a brand new UUID for the repository.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:463
+msgid ""
+"usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n"
+"\n"
+"Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n"
+"associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n"
+"triggering the pre-unlock and post-unlock hook scripts.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:470
+msgid ""
+"usage: svnadmin upgrade REPOS_PATH\n"
+"\n"
+"Upgrade the repository located at REPOS_PATH to the latest supported\n"
+"schema version.\n"
+"\n"
+"This functionality is provided as a convenience for repository\n"
+"administrators who wish to make use of new Subversion functionality\n"
+"without having to undertake a potentially costly full repository dump\n"
+"and load operation. As such, the upgrade performs only the minimum\n"
+"amount of work needed to accomplish this while still maintaining the\n"
+"integrity of the repository. It does not guarantee the most optimized\n"
+"repository state as a dump and subsequent load would.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:483
+msgid ""
+"usage: svnadmin verify REPOS_PATH\n"
+"\n"
+"Verify the data stored in the repository.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:545
+msgid "Invalid revision specifier"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:549
+#, c-format
+msgid "Revisions must not be greater than the youngest revision (%ld)"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:656
+#, c-format
+msgid ""
+"%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s"
+"\" instead.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:696
+msgid "Repositories compatible with 1.0.x must use --fs-type=bdb"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:739 ../svnadmin/svnadmin.c:1011
+#: ../svnadmin/svnadmin.c:1192
+msgid "First revision cannot be higher than second"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:748
+#, c-format
+msgid "Deltifying revision %ld..."
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:752 ../svnadmin/svnadmin.c:812
+#: ../svnadmin/svnadmin.c:827
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:793
+#, c-format
+msgid "* Verifying repository metadata ...\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:796
+#, c-format
+msgid "* Verifying metadata at revision %ld ...\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:806
+#, c-format
+msgid "Packing revisions in shard %s..."
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:821
+#, c-format
+msgid "Packing revprops in shard %s..."
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:898
+#, c-format
+msgid "<<< Skipped original revision %ld\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:915
+#, c-format
+msgid ""
+"Repository lock acquired.\n"
+"Please wait; recovering the repository may take some time...\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:922
+msgid ""
+"Repository lock acquired.\n"
+"Please wait; upgrading the repository may take some time...\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1072
+msgid "No program provided"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1108
+msgid ""
+"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
+"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnadmin --version' to see the program version and FS modules.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1115 ../svnlook/svnlook.c:2226
+#: ../svnserve/svnserve.c:335
+msgid ""
+"The following repository back-end (FS) modules are available:\n"
+"\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1144
+#, c-format
+msgid "Invalid revision number (%ld) specified"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1154
+msgid "Non-numeric revision specified"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1213
+msgid ""
+"Invalid property value found in dumpstream; consider repairing the source or "
+"using --bypass-prop-validation while loading."
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1279 ../svnadmin/svnadmin.c:1911
+msgid ""
+"Failed to get exclusive repository access; perhaps another process\n"
+"such as httpd, svnserve or svn has it open?"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1284 ../svnadmin/svnadmin.c:1916
+#, c-format
+msgid "Waiting on repository lock; perhaps another process has it open?\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1292
+#, c-format
+msgid ""
+"\n"
+"Recovery completed.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1299
+#, c-format
+msgid "The latest repos revision is %ld.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1414
+#, c-format
+msgid "Transaction '%s' removed.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1476 ../svnadmin/svnadmin.c:1521
+#, c-format
+msgid "Missing revision"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1479 ../svnadmin/svnadmin.c:1524
+#, c-format
+msgid "Only one revision allowed"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1578
+#, c-format
+msgid "--revision (-r) and --transaction (-t) are mutually exclusive"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1745 ../svnlook/svnlook.c:2289
+#, c-format
+msgid "UUID Token: %s\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1746 ../svnlook/svnlook.c:2290
+#, c-format
+msgid "Owner: %s\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1747 ../svnlook/svnlook.c:2291
+#, c-format
+msgid "Created: %s\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1748 ../svnlook/svnlook.c:2292
+#, c-format
+msgid "Expires: %s\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1750
+#, c-format
+msgid ""
+"Comment (%i line):\n"
+"%s\n"
+"\n"
+msgid_plural ""
+"Comment (%i lines):\n"
+"%s\n"
+"\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../svnadmin/svnadmin.c:1796
+msgid "No paths to unlock provided"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1814
+#, c-format
+msgid "Path '%s' isn't locked.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1826
+#, c-format
+msgid "Removed lock on '%s'.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1879
+#, c-format
+msgid "'%s' unlocked by user '%s'.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1926
+msgid ""
+"Upgrade of this repository's underlying versioned filesystem is not "
+"supported; consider dumping and loading the data elsewhere"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1933
+msgid ""
+"Upgrade of this repository is not supported; consider dumping and loading "
+"the data elsewhere"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:1939
+#, c-format
+msgid ""
+"\n"
+"Upgrade completed.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2024 ../svnrdump/svnrdump.c:923
+msgid ""
+"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2102
+#, c-format
+msgid "Cannot create pre-1.0-compatible repositories"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2115
+#, c-format
+msgid "Cannot guarantee compatibility beyond the current running version (%s)"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2204
+#, c-format
+msgid "subcommand argument required\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2239
+msgid "Repository argument required"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2252
+#, c-format
+msgid "'%s' is a URL when it should be a local path"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2283
+#, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svnadmin help %s' for usage.\n"
+msgstr ""
+
+#: ../svnadmin/svnadmin.c:2326
+msgid "Try 'svnadmin help' for more info"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:79
+#, c-format
+msgid "Can't open stdio file"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:406
+msgid "This is an empty revision for padding."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:489
+#, c-format
+msgid "Revision %ld committed as %ld.\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:512
+#, c-format
+msgid "Revision %ld skipped.\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:608
+#, c-format
+msgid "Invalid copy source path '%s'"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:649
+#, c-format
+msgid "Missing Node-action for path '%s'"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:692
+#, c-format
+msgid "No valid copyfrom revision in filtered stream"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:817
+#, c-format
+msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:839
+#, c-format
+msgid "No valid revision range 'start' in filtered stream"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:846
+#, c-format
+msgid "No valid revision range 'end' in filtered stream"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:892 ../svndumpfilter/svndumpfilter.c:923
+#, c-format
+msgid ""
+"Delta property block detected, but deltas are not enabled for node '%s' in "
+"original revision %ld"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1056
+msgid "Do not display filtering statistics."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1058
+msgid "Treat the path prefixes as file glob patterns."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1060
+msgid "Remove revisions emptied by filtering."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1062
+msgid ""
+"Remove all empty revisions found in dumpstream\n"
+" except revision 0."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1065
+msgid "Renumber revisions left after filtering."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1068
+msgid "Skip missing merge sources."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1070
+msgid "Don't filter revision properties."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1072
+msgid ""
+"Read additional prefixes, one per line, from\n"
+" file ARG."
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1084
+msgid ""
+"Filter out nodes with given prefixes from dumpstream.\n"
+"usage: svndumpfilter exclude PATH_PREFIX...\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1093
+msgid ""
+"Filter out nodes without given prefixes from dumpstream.\n"
+"usage: svndumpfilter include PATH_PREFIX...\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1102
+msgid ""
+"Describe the usage of this program or its subcommands.\n"
+"usage: svndumpfilter help [SUBCOMMAND...]\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1178
+msgid ""
+"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
+"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svndumpfilter --version' to see the program version.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1236
+#, c-format
+msgid "Excluding (and dropping empty revisions for) prefix patterns:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1238
+#, c-format
+msgid "Excluding prefix patterns:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1241
+#, c-format
+msgid "Including (and dropping empty revisions for) prefix patterns:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1243
+#, c-format
+msgid "Including prefix patterns:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1251
+#, c-format
+msgid "Excluding (and dropping empty revisions for) prefixes:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1253
+#, c-format
+msgid "Excluding prefixes:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1256
+#, c-format
+msgid "Including (and dropping empty revisions for) prefixes:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1258
+#, c-format
+msgid "Including prefixes:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1286
+#, c-format
+msgid ""
+"Dropped %d revision.\n"
+"\n"
+msgid_plural ""
+"Dropped %d revisions.\n"
+"\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../svndumpfilter/svndumpfilter.c:1294
+msgid "Revisions renumbered as follows:\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1322
+#, c-format
+msgid " %ld => (dropped)\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1337
+#, c-format
+msgid "Dropped %d node:\n"
+msgid_plural "Dropped %d nodes:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../svndumpfilter/svndumpfilter.c:1506
+msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1626
+#, c-format
+msgid ""
+"\n"
+"Error: no prefixes supplied.\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1657
+#, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svndumpfilter help %s' for usage.\n"
+msgstr ""
+
+#: ../svndumpfilter/svndumpfilter.c:1675
+msgid "Try 'svndumpfilter help' for more info"
+msgstr ""
+
+#: ../svnlook/svnlook.c:117
+msgid "show details for copies"
+msgstr ""
+
+#: ../svnlook/svnlook.c:120
+msgid "print differences against the copy source"
+msgstr ""
+
+#: ../svnlook/svnlook.c:123
+msgid "show full paths instead of indenting them"
+msgstr ""
+
+#: ../svnlook/svnlook.c:129
+msgid "maximum number of history entries"
+msgstr ""
+
+#: ../svnlook/svnlook.c:147
+msgid "operate on single directory only"
+msgstr ""
+
+#: ../svnlook/svnlook.c:150
+msgid "specify revision number ARG"
+msgstr ""
+
+#: ../svnlook/svnlook.c:153
+msgid "operate on a revision property (use with -r or -t)"
+msgstr ""
+
+#: ../svnlook/svnlook.c:156
+msgid "show node revision ids for each path"
+msgstr ""
+
+#: ../svnlook/svnlook.c:159
+msgid "show path's inherited properties"
+msgstr ""
+
+#: ../svnlook/svnlook.c:165
+msgid "be verbose"
+msgstr ""
+
+#: ../svnlook/svnlook.c:174
+msgid ""
+"Specify differencing options for external diff or\n"
+" internal diff. Default: '-u'. Options are\n"
+" separated by spaces. Internal diff takes:\n"
+" -u, --unified: Show 3 lines of unified "
+"context\n"
+" -b, --ignore-space-change: Ignore changes in\n"
+" amount of white space\n"
+" -w, --ignore-all-space: Ignore all white "
+"space\n"
+" --ignore-eol-style: Ignore changes in EOL "
+"style\n"
+" -p, --show-c-function: Show C function name"
+msgstr ""
+
+#: ../svnlook/svnlook.c:205
+msgid ""
+"usage: svnlook author REPOS_PATH\n"
+"\n"
+"Print the author.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:210
+msgid ""
+"usage: svnlook cat REPOS_PATH FILE_PATH\n"
+"\n"
+"Print the contents of a file. Leading '/' on FILE_PATH is optional.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:215
+msgid ""
+"usage: svnlook changed REPOS_PATH\n"
+"\n"
+"Print the paths that were changed.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:220
+msgid ""
+"usage: svnlook date REPOS_PATH\n"
+"\n"
+"Print the datestamp.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:225
+msgid ""
+"usage: svnlook diff REPOS_PATH\n"
+"\n"
+"Print GNU-style diffs of changed files and properties.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:232
+msgid ""
+"usage: svnlook dirs-changed REPOS_PATH\n"
+"\n"
+"Print the directories that were themselves changed (property edits)\n"
+"or whose file children were changed.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:238
+msgid ""
+"usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
+"\n"
+"Print the size (in bytes) of the file located at PATH_IN_REPOS as\n"
+"it is represented in the repository.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:244
+msgid ""
+"usage: svnlook help [SUBCOMMAND...]\n"
+"\n"
+"Describe the usage of this program or its subcommands.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:249
+msgid ""
+"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
+"\n"
+"Print information about the history of a path in the repository (or\n"
+"the root directory if no path is supplied).\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:255
+msgid ""
+"usage: svnlook info REPOS_PATH\n"
+"\n"
+"Print the author, datestamp, log message size, and log message.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:260
+msgid ""
+"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
+"\n"
+"If a lock exists on a path in the repository, describe it.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:265
+msgid ""
+"usage: svnlook log REPOS_PATH\n"
+"\n"
+"Print the log message.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:270
+msgid ""
+"usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n"
+" 2. svnlook propget --revprop REPOS_PATH PROPNAME\n"
+"\n"
+"Print the raw value of a property on a path in the repository.\n"
+"With --revprop, print the raw value of a revision property.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:279
+msgid ""
+"usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n"
+" 2. svnlook proplist --revprop REPOS_PATH\n"
+"\n"
+"List the properties of a path in the repository, or\n"
+"with the --revprop option, revision properties.\n"
+"With -v, show the property values too.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:290
+msgid ""
+"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
+"\n"
+"Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n"
+"of the tree otherwise), optionally showing node revision ids.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:296
+msgid ""
+"usage: svnlook uuid REPOS_PATH\n"
+"\n"
+"Print the repository's UUID.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:301
+msgid ""
+"usage: svnlook youngest REPOS_PATH\n"
+"\n"
+"Print the youngest revision number.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:861
+#, c-format
+msgid "Copied: %s (from rev %ld, %s)\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:929
+msgid "Added"
+msgstr ""
+
+#: ../svnlook/svnlook.c:930
+msgid "Deleted"
+msgstr ""
+
+#: ../svnlook/svnlook.c:931
+msgid "Modified"
+msgstr ""
+
+#: ../svnlook/svnlook.c:932
+msgid "Index"
+msgstr ""
+
+#: ../svnlook/svnlook.c:943
+msgid ""
+"(Binary files differ)\n"
+"\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1222
+msgid "unknown"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1279
+#, c-format
+msgid "Transaction '%s' is not based on a revision; how odd"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1422
+#, c-format
+msgid "'%s' is a URL, probably should be a path"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1445 ../svnlook/svnlook.c:1468
+#, c-format
+msgid "Path '%s' is not a file"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1604
+msgid "History item limit reached"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1623
+#, c-format
+msgid ""
+"REVISION PATH <ID>\n"
+"-------- ---------\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1628
+#, c-format
+msgid ""
+"REVISION PATH\n"
+"-------- ----\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1700
+#, c-format
+msgid "Property '%s' not found on revision %ld"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1709
+#, c-format
+msgid ""
+"Property '%s' not found on path '%s' or inherited from a parent in revision "
+"%ld"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1715
+#, c-format
+msgid "Property '%s' not found on path '%s' in revision %ld"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1723
+#, c-format
+msgid ""
+"Property '%s' not found on path '%s' or inherited from a parent in "
+"transaction %s"
+msgstr ""
+
+#: ../svnlook/svnlook.c:1729
+#, c-format
+msgid "Property '%s' not found on path '%s' in transaction %s"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2064
+msgid "Missing repository path argument"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2216
+msgid ""
+"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
+"Note: any subcommand which takes the '--revision' and '--transaction'\n"
+" options will, if invoked without one of those options, act on\n"
+" the repository's youngest revision.\n"
+"Type 'svnlook help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnlook --version' to see the program version and FS modules.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2294
+#, c-format
+msgid ""
+"Comment (%i line):\n"
+"%s\n"
+msgid_plural ""
+"Comment (%i lines):\n"
+"%s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../svnlook/svnlook.c:2346
+#, c-format
+msgid "Missing propname argument"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2347
+#, c-format
+msgid "Missing propname and repository path arguments"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2353
+msgid "Missing propname or repository path argument"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2517
+msgid "Invalid revision number supplied"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2629
+msgid ""
+"The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2636
+msgid ""
+"Cannot use the '--show-inherited-props' option with the '--revprop' option"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2695
+#, c-format
+msgid "Try 'svnadmin verify' instead.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2729
+#, c-format
+msgid "Repository argument required\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2738
+#, c-format
+msgid "'%s' is a URL when it should be a path\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2790
+#, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svnlook help %s' for usage.\n"
+msgstr ""
+
+#: ../svnlook/svnlook.c:2833
+msgid "Try 'svnlook help' for more info"
+msgstr ""
+
+#: ../svnmucc/svnmucc.c:927
+msgid ""
+"Subversion multiple URL command client\n"
+"usage: svnmucc ACTION...\n"
+"\n"
+" Perform one or more Subversion repository URL-based ACTIONs, committing\n"
+" the result as a (single) new revision.\n"
+"\n"
+"Actions:\n"
+" cp REV SRC-URL DST-URL : copy SRC-URL at REV to DST-URL\n"
+" mkdir URL : create new directory URL\n"
+" mv SRC-URL DST-URL : move SRC-URL to DST-URL\n"
+" rm URL : delete URL\n"
+" put SRC-FILE URL : add or modify file URL with contents copied from\n"
+" SRC-FILE (use \"-\" to read from standard input)\n"
+" propset NAME VALUE URL : set property NAME on URL to VALUE\n"
+" propsetf NAME FILE URL : set property NAME on URL to value read from FILE\n"
+" propdel NAME URL : delete property NAME from URL\n"
+"\n"
+"Valid options:\n"
+" -h, -? [--help] : display this text\n"
+" -m [--message] ARG : use ARG as a log message\n"
+" -F [--file] ARG : read log message from file ARG\n"
+" -u [--username] ARG : commit the changes as username ARG\n"
+" -p [--password] ARG : use ARG as the password\n"
+" -U [--root-url] ARG : interpret all action URLs relative to ARG\n"
+" -r [--revision] ARG : use revision ARG as baseline for changes\n"
+" --with-revprop ARG : set revision property in the following format:\n"
+" NAME[=VALUE]\n"
+" --non-interactive : do no interactive prompting (default is to\n"
+" prompt only if standard input is a terminal)\n"
+" --force-interactive : do interactive prompting even if standard\n"
+" input is not a terminal\n"
+" --trust-server-cert : accept SSL server certificates from unknown\n"
+" certificate authorities without prompting (but\n"
+" only with '--non-interactive')\n"
+" -X [--extra-args] ARG : append arguments from file ARG (one per line;\n"
+" use \"-\" to read from standard input)\n"
+" --config-dir ARG : use ARG to override the config directory\n"
+" --config-option ARG : use ARG to override a configuration option\n"
+" --no-auth-cache : do not cache authentication tokens\n"
+" --version : print version information\n"
+msgstr ""
+
+#: ../svnmucc/svnmucc.c:1003
+msgid ""
+"--message (-m), --file (-F), and --with-revprop=svn:log are mutually "
+"exclusive"
+msgstr ""
+
+#: ../svnrdump/load_editor.c:382 ../svnsync/svnsync.c:327
+#, c-format
+msgid "Failed to get lock on destination repos, currently held by '%s'\n"
+msgstr ""
+
+#: ../svnrdump/load_editor.c:526
+msgid ""
+"Target server does not support atomic revision property edits; consider "
+"upgrading it to 1.7."
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:101
+msgid ""
+"usage: svnrdump dump URL [-r LOWER[:UPPER]]\n"
+"\n"
+"Dump revisions LOWER to UPPER of repository at remote URL to stdout\n"
+"in a 'dumpfile' portable format. If only LOWER is given, dump that\n"
+"one revision.\n"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:107
+msgid ""
+"usage: svnrdump load URL\n"
+"\n"
+"Load a 'dumpfile' given on stdin to a repository at remote URL.\n"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:111
+msgid ""
+"usage: svnrdump help [SUBCOMMAND...]\n"
+"\n"
+"Describe the usage of this program or its subcommands.\n"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:124
+msgid "dump incrementally"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:142 ../svnserve/svnserve.c:281
+#: ../svnversion/svnversion.c:139
+msgid "display this help"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:731
+msgid ""
+"general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n"
+"Type 'svnrdump help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnrdump --version' to see the program version and RA modules.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:775 ../svnrdump/svnrdump.c:809
+msgid "Unsupported revision specifier used; use only integer values or 'HEAD'"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:783 ../svnrdump/svnrdump.c:817
+#, c-format
+msgid "Revision '%ld' does not exist"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:827
+msgid ""
+"LOWER revision cannot be greater than UPPER revision; consider reversing "
+"your revision range"
+msgstr ""
+
+#: ../svnrdump/svnrdump.c:1072
+#, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svnrdump help %s' for usage.\n"
+msgstr ""
+
+#: ../svnserve/cyrus_auth.c:119
+msgid "Could not initialize the SASL library"
+msgstr ""
+
+#: ../svnserve/cyrus_auth.c:260
+#, c-format
+msgid "Can't get hostname"
+msgstr ""
+
+#: ../svnserve/cyrus_auth.c:325
+msgid "Could not obtain the list of SASL mechanisms"
+msgstr ""
+
+#: ../svnserve/cyrus_auth.c:367
+msgid "Couldn't obtain the authenticated username"
+msgstr ""
+
+#: ../svnserve/serve.c:2058
+msgid "Path is not a string"
+msgstr ""
+
+#: ../svnserve/serve.c:2215
+msgid "Log revprop entry not a string"
+msgstr ""
+
+#: ../svnserve/serve.c:2221
+#, c-format
+msgid "Unknown revprop word '%s' in log command"
+msgstr ""
+
+#: ../svnserve/serve.c:2237
+msgid "Log path entry not a string"
+msgstr ""
+
+#: ../svnserve/svnserve.c:162
+msgid "daemon mode"
+msgstr ""
+
+#: ../svnserve/svnserve.c:163
+msgid "inetd mode"
+msgstr ""
+
+#: ../svnserve/svnserve.c:164
+msgid "tunnel mode"
+msgstr ""
+
+#: ../svnserve/svnserve.c:165
+msgid "listen-once mode (useful for debugging)"
+msgstr ""
+
+#: ../svnserve/svnserve.c:168
+msgid "Windows service mode (Service Control Manager)"
+msgstr ""
+
+#: ../svnserve/svnserve.c:170
+msgid "root of directory to serve"
+msgstr ""
+
+#: ../svnserve/svnserve.c:172
+msgid "force read only, overriding repository config file"
+msgstr ""
+
+#: ../svnserve/svnserve.c:174
+msgid "read configuration from file ARG"
+msgstr ""
+
+#: ../svnserve/svnserve.c:177
+msgid ""
+"listen port. The default port is 3690.\n"
+" [mode: daemon, service, listen-once]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:181
+msgid ""
+"listen port. The default port is 3690.\n"
+" [mode: daemon, listen-once]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:187
+msgid ""
+"listen hostname or IP address\n"
+" By default svnserve listens on all addresses.\n"
+" [mode: daemon, service, listen-once]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:193
+msgid ""
+"listen hostname or IP address\n"
+" By default svnserve listens on all addresses.\n"
+" [mode: daemon, listen-once]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:200
+msgid ""
+"prefer IPv6 when resolving the listen hostname\n"
+" [IPv4 is preferred by default. Using IPv4 and "
+"IPv6\n"
+" at the same time is not supported in daemon "
+"mode.\n"
+" Use inetd mode or tunnel mode if you need this.]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:208
+msgid ""
+"compression level to use for network transmissions\n"
+" [0 .. no compression, 5 .. default, \n"
+" 9 .. maximum compression]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:214
+msgid ""
+"size of the extra in-memory cache in MB used to\n"
+" minimize redundant operations.\n"
+" Default is 16.\n"
+" [used for FSFS repositories only]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:222
+msgid ""
+"enable or disable caching of deltas between older\n"
+" revisions.\n"
+" Default is no.\n"
+" [used for FSFS repositories only]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:230
+msgid ""
+"enable or disable caching of file contents\n"
+" Default is yes.\n"
+" [used for FSFS repositories only]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:236
+msgid ""
+"enable or disable caching of revision properties.\n"
+" Consult the documentation before activating "
+"this.\n"
+" Default is no.\n"
+" [used for FSFS repositories only]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:244
+msgid ""
+"Optimize network handling based on the assumption\n"
+" that most clients are connected with a bitrate "
+"of\n"
+" ARG Mbit/s.\n"
+" Default is 0 (optimizations disabled)."
+msgstr ""
+
+#. ### Making the assumption here that WIN32 never has fork and so
+#. * ### this option never exists when --service exists.
+#: ../svnserve/svnserve.c:254
+msgid "use threads instead of fork [mode: daemon]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:258
+msgid ""
+"run in foreground (useful for debugging)\n"
+" [mode: daemon]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:262
+msgid ""
+"handle one connection at a time in the parent process\n"
+" (useful for debugging)"
+msgstr ""
+
+#: ../svnserve/svnserve.c:266
+msgid "svnserve log file"
+msgstr ""
+
+#: ../svnserve/svnserve.c:269
+msgid ""
+"write server process ID to file ARG\n"
+" [mode: daemon, listen-once, service]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:273
+msgid ""
+"write server process ID to file ARG\n"
+" [mode: daemon, listen-once]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:278
+msgid ""
+"tunnel username (default is current uid's name)\n"
+" [mode: tunnel]"
+msgstr ""
+
+#: ../svnserve/svnserve.c:283
+msgid ""
+"virtual host mode (look for repo in directory\n"
+" of provided hostname)"
+msgstr ""
+
+#: ../svnserve/svnserve.c:300
+#, c-format
+msgid "Type '%s --help' for usage.\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:310
+msgid ""
+"usage: svnserve [-d | -i | -t | -X | --service] [options]\n"
+"\n"
+"Valid options:\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:316
+msgid ""
+"usage: svnserve [-d | -i | -t | -X] [options]\n"
+"\n"
+"Valid options:\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:344
+msgid ""
+"\n"
+"Cyrus SASL authentication is available.\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:616
+#, c-format
+msgid "Invalid port '%s'"
+msgstr ""
+
+#: ../svnserve/svnserve.c:657
+#, c-format
+msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:770
+msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:773
+msgid "You must specify exactly one of -d, -i, -t or -X.\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:782
+msgid "You may only specify one of -T or --single-thread\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:810
+#, c-format
+msgid "Option --tunnel-user is only valid in tunnel mode.\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:829
+#, c-format
+msgid "Can't open stdout"
+msgstr ""
+
+#: ../svnserve/svnserve.c:883
+#, c-format
+msgid ""
+"svnserve: The --service flag is only valid if the process is started by the "
+"Service Control Manager.\n"
+msgstr ""
+
+#: ../svnserve/svnserve.c:933
+#, c-format
+msgid "Can't get address info"
+msgstr ""
+
+#: ../svnserve/svnserve.c:947
+#, c-format
+msgid "Can't create server socket"
+msgstr ""
+
+#: ../svnserve/svnserve.c:958
+#, c-format
+msgid "Can't bind server socket"
+msgstr ""
+
+#: ../svnserve/svnserve.c:1056
+#, c-format
+msgid "Can't accept client connection"
+msgstr ""
+
+#: ../svnserve/svnserve.c:1137
+#, c-format
+msgid "Can't create threadattr"
+msgstr ""
+
+#: ../svnserve/svnserve.c:1145
+#, c-format
+msgid "Can't set detached state"
+msgstr ""
+
+#: ../svnserve/svnserve.c:1158
+#, c-format
+msgid "Can't create thread"
+msgstr ""
+
+#: ../svnserve/winservice.c:346
+#, c-format
+msgid "Failed to create winservice_start_event"
+msgstr ""
+
+#: ../svnserve/winservice.c:357
+#, c-format
+msgid "The service failed to start"
+msgstr ""
+
+#: ../svnserve/winservice.c:405
+#, c-format
+msgid "Failed to connect to Service Control Manager"
+msgstr ""
+
+#: ../svnserve/winservice.c:416
+#, c-format
+msgid ""
+"The service failed to start; an internal error occurred while starting the "
+"service"
+msgstr ""
+
+#: ../svnsync/svnsync.c:92
+msgid ""
+"usage: svnsync initialize DEST_URL SOURCE_URL\n"
+"\n"
+"Initialize a destination repository for synchronization from\n"
+"another repository.\n"
+"\n"
+"If the source URL is not the root of a repository, only the\n"
+"specified part of the repository will be synchronized.\n"
+"\n"
+"The destination URL must point to the root of a repository which\n"
+"has been configured to allow revision property changes. In\n"
+"the general case, the destination repository must contain no\n"
+"committed revisions. Use --allow-non-empty to override this\n"
+"restriction, which will cause svnsync to assume that any revisions\n"
+"already present in the destination repository perfectly mirror\n"
+"their counterparts in the source repository. (This is useful\n"
+"when initializing a copy of a repository as a mirror of that same\n"
+"repository, for example.)\n"
+"\n"
+"You should not commit to, or make revision property changes in,\n"
+"the destination repository by any method other than 'svnsync'.\n"
+"In other words, the destination repository should be a read-only\n"
+"mirror of the source repository.\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:118
+msgid ""
+"usage: svnsync synchronize DEST_URL [SOURCE_URL]\n"
+"\n"
+"Transfer all pending revisions to the destination from the source\n"
+"with which it was initialized.\n"
+"\n"
+"If SOURCE_URL is provided, use that as the source repository URL,\n"
+"ignoring what is recorded in the destination repository as the\n"
+"source URL. Specifying SOURCE_URL is recommended in particular\n"
+"if untrusted users/administrators may have write access to the\n"
+"DEST_URL repository.\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:131
+msgid ""
+"usage:\n"
+"\n"
+" 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n"
+" 2. svnsync copy-revprops DEST_URL REV[:REV2]\n"
+"\n"
+"Copy the revision properties in a given range of revisions to the\n"
+"destination from the source with which it was initialized. If the\n"
+"revision range is not specified, it defaults to all revisions in\n"
+"the DEST_URL repository. Note also that the 'HEAD' revision is the\n"
+"latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n"
+"\n"
+"If SOURCE_URL is provided, use that as the source repository URL,\n"
+"ignoring what is recorded in the destination repository as the\n"
+"source URL. Specifying SOURCE_URL is recommended in particular\n"
+"if untrusted users/administrators may have write access to the\n"
+"DEST_URL repository.\n"
+"\n"
+"Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:152
+msgid ""
+"usage: svnsync info DEST_URL\n"
+"\n"
+"Print information about the synchronization destination repository\n"
+"located at DEST_URL.\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:158
+msgid ""
+"usage: svnsync help [SUBCOMMAND...]\n"
+"\n"
+"Describe the usage of this program or its subcommands.\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:168
+msgid "print as little as possible"
+msgstr ""
+
+#: ../svnsync/svnsync.c:170
+msgid ""
+"operate on revision ARG (or range ARG1:ARG2)\n"
+" A revision argument can be one of:\n"
+" NUMBER revision number\n"
+" 'HEAD' latest in repository"
+msgstr ""
+
+#: ../svnsync/svnsync.c:178
+msgid "allow a non-empty destination repository"
+msgstr ""
+
+#: ../svnsync/svnsync.c:190
+msgid ""
+"specify a username ARG (deprecated;\n"
+" see --source-username and --sync-username)"
+msgstr ""
+
+#: ../svnsync/svnsync.c:194
+msgid ""
+"specify a password ARG (deprecated;\n"
+" see --source-password and --sync-password)"
+msgstr ""
+
+#: ../svnsync/svnsync.c:204
+msgid "connect to source repository with username ARG"
+msgstr ""
+
+#: ../svnsync/svnsync.c:206
+msgid "connect to source repository with password ARG"
+msgstr ""
+
+#: ../svnsync/svnsync.c:208
+msgid "connect to sync repository with username ARG"
+msgstr ""
+
+#: ../svnsync/svnsync.c:210
+msgid "connect to sync repository with password ARG"
+msgstr ""
+
+#: ../svnsync/svnsync.c:222
+msgid ""
+"convert translatable properties from encoding ARG\n"
+" to UTF-8. If not specified, then properties "
+"are\n"
+" presumed to be encoded in UTF-8."
+msgstr ""
+
+#: ../svnsync/svnsync.c:228
+msgid ""
+"Disable built-in locking. Use of this option can\n"
+" corrupt the mirror unless you ensure that no "
+"other\n"
+" instance of svnsync is running concurrently."
+msgstr ""
+
+#: ../svnsync/svnsync.c:234
+msgid ""
+"Steal locks as necessary. Use, with caution,\n"
+" if your mirror repository contains stale locks\n"
+" and is not being concurrently accessed by "
+"another\n"
+" svnsync instance."
+msgstr ""
+
+#: ../svnsync/svnsync.c:357
+msgid ""
+"Target server does not support atomic revision property edits; consider "
+"upgrading it to 1.7 or using an external locking program"
+msgstr ""
+
+#: ../svnsync/svnsync.c:371
+#, c-format
+msgid "Stole lock previously held by '%s'\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:460
+#, c-format
+msgid "Session is rooted at '%s' but the repos root is '%s'"
+msgstr ""
+
+#: ../svnsync/svnsync.c:602
+#, c-format
+msgid "Copied properties for revision %ld (%s* properties skipped).\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:607
+#, c-format
+msgid "Copied properties for revision %ld.\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:623
+#, c-format
+msgid ""
+"NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-"
+"props).\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:753
+msgid ""
+"Destination repository already contains revision history; consider using --"
+"allow-non-empty if the repository's revisions are known to mirror their "
+"respective revisions in the source repository"
+msgstr ""
+
+#: ../svnsync/svnsync.c:762
+#, c-format
+msgid "Destination repository is already synchronizing from '%s'"
+msgstr ""
+
+#: ../svnsync/svnsync.c:797
+msgid "Destination repository has more revisions than source repository"
+msgstr ""
+
+#: ../svnsync/svnsync.c:862 ../svnsync/svnsync.c:865 ../svnsync/svnsync.c:1518
+#: ../svnsync/svnsync.c:1525 ../svnsync/svnsync.c:1762
+#: ../svnsync/svnsync.c:1765 ../svnsync/svnsync.c:1809
+#, c-format
+msgid "Path '%s' is not a URL"
+msgstr ""
+
+#: ../svnsync/svnsync.c:892
+#, c-format
+msgid "Committed revision %ld.\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:935
+msgid "Destination repository has not been initialized"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1301
+#, c-format
+msgid "Commit created r%ld but should have created r%ld"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1416
+#, c-format
+msgid ""
+"Revision being currently copied (%ld), last merged revision (%ld), and "
+"destination HEAD (%ld) are inconsistent; have you committed to the "
+"destination without using svnsync?"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1453
+#, c-format
+msgid ""
+"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
+"committed to the destination without using svnsync?"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1576 ../svnsync/svnsync.c:1581
+#, c-format
+msgid ""
+"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1645 ../svnsync/svnsync.c:1665
+#, c-format
+msgid "Invalid revision number (%ld)"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1715
+msgid ""
+"Cannot specify revisions via both command-line arguments and the --revision "
+"(-r) option"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1723 ../svnsync/svnsync.c:2066
+#, c-format
+msgid "Invalid revision range '%s' provided"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1822
+#, c-format
+msgid "Repository '%s' is not initialized for synchronization"
+msgstr ""
+
+#. Print the info.
+#: ../svnsync/svnsync.c:1828
+#, c-format
+msgid "Source URL: %s\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1830
+#, c-format
+msgid "Source Repository UUID: %s\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1833
+#, c-format
+msgid "Last Merged Revision: %s\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:1850
+msgid ""
+"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnsync --version' to see the program version and RA modules.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:2114
+msgid ""
+"Cannot use --username or --password with any of --source-username, --source-"
+"password, --sync-username, or --sync-password.\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:2138
+msgid "--disable-locking and --steal-lock are mutually exclusive"
+msgstr ""
+
+#: ../svnsync/svnsync.c:2214
+#, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svnsync help %s' for usage.\n"
+msgstr ""
+
+#: ../svnsync/svnsync.c:2297
+msgid "Try 'svnsync help' for more info"
+msgstr ""
+
+#: ../svnversion/svnversion.c:50
+#, c-format
+msgid "Type 'svnversion --help' for usage.\n"
+msgstr ""
+
+#: ../svnversion/svnversion.c:61
+#, c-format
+msgid ""
+"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
+"\n"
+" Produce a compact version identifier for the working copy path\n"
+" WC_PATH. TRAIL_URL is the trailing portion of the URL used to\n"
+" determine if WC_PATH itself is switched (detection of switches\n"
+" within WC_PATH does not rely on TRAIL_URL). The version identifier\n"
+" is written to standard output. For example:\n"
+"\n"
+" $ svnversion . /repos/svn/trunk\n"
+" 4168\n"
+"\n"
+" The version identifier will be a single number if the working\n"
+" copy is single revision, unmodified, not switched and with\n"
+" a URL that matches the TRAIL_URL argument. If the working\n"
+" copy is unusual the version identifier will be more complex:\n"
+"\n"
+" 4123:4168 mixed revision working copy\n"
+" 4168M modified working copy\n"
+" 4123S switched working copy\n"
+" 4123P partial working copy, from a sparse checkout\n"
+" 4123:4168MS mixed revision, modified, switched working copy\n"
+"\n"
+" If WC_PATH is an unversioned path, the program will output\n"
+" 'Unversioned directory' or 'Unversioned file'. If WC_PATH is\n"
+" an added or copied or moved path, the program will output\n"
+" 'Uncommitted local addition, copy or move'.\n"
+"\n"
+" If invoked without arguments WC_PATH will be the current directory.\n"
+"\n"
+"Valid options:\n"
+msgstr ""
+
+#: ../svnversion/svnversion.c:137
+msgid "do not output the trailing newline"
+msgstr ""
+
+#: ../svnversion/svnversion.c:138
+msgid "last changed rather than current revisions"
+msgstr ""
+
+#: ../svnversion/svnversion.c:246
+#, c-format
+msgid "Unversioned symlink%s"
+msgstr ""
+
+#: ../svnversion/svnversion.c:249
+#, c-format
+msgid "Unversioned directory%s"
+msgstr ""
+
+#: ../svnversion/svnversion.c:252
+#, c-format
+msgid "Unversioned file%s"
+msgstr ""
+
+#: ../svnversion/svnversion.c:258
+#, c-format
+msgid "'%s' doesn't exist\n"
+msgstr ""
+
+#: ../svnversion/svnversion.c:259
+#, c-format
+msgid "'%s' is of unknown type\n"
+msgstr ""
+
+#. Local uncommitted modifications, no revision info was found.
+#: ../svnversion/svnversion.c:274
+#, c-format
+msgid "Uncommitted local addition, copy or move%s"
+msgstr ""
Modified: trunk/contrib/subversion/subversion/po/sv.po
===================================================================
--- trunk/contrib/subversion/subversion/po/sv.po 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/po/sv.po 2017-02-20 02:39:09 UTC (rev 9266)
@@ -110,8 +110,8 @@
msgstr ""
"Project-Id-Version: subversion 1.8\n"
"Report-Msgid-Bugs-To: dev at subversion.apache.org\n"
-"POT-Creation-Date: 2013-05-05 21:17+0200\n"
-"PO-Revision-Date: 2013-05-05 21:18+0200\n"
+"POT-Creation-Date: 2013-10-19 21:47+0200\n"
+"PO-Revision-Date: 2013-10-19 22:28+0200\n"
"Last-Translator: Subversion Developers <dev at subversion.apache.org>\n"
"Language-Team: Swedish <dev at subversion.apache.org>\n"
"Language: sv\n"
@@ -310,7 +310,7 @@
msgstr "Läsfel i rör"
#: ../include/svn_error_codes.h:289 ../libsvn_subr/cmdline.c:362
-#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:569 ../svnlook/svnlook.c:1987
+#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:569 ../svnlook/svnlook.c:2009
#, c-format
msgid "Write error"
msgstr "Fel vid skrivning"
@@ -831,7 +831,7 @@
msgid "Session URL does not match expected session URL"
msgstr "Sessionens URL matchar inte den förväntade sessions-URL:en"
-#: ../include/svn_error_codes.h:911 ../libsvn_ra_svn/client.c:491
+#: ../include/svn_error_codes.h:911 ../libsvn_ra_svn/client.c:492
#, c-format
msgid "Can't create tunnel"
msgstr "Kan inte skapa tunnel"
@@ -883,7 +883,7 @@
msgstr "Arkivet har flyttats"
#: ../include/svn_error_codes.h:975 ../libsvn_ra_serf/update.c:2881
-#: ../libsvn_ra_serf/util.c:767
+#: ../libsvn_ra_serf/util.c:844
msgid "Connection timed out"
msgstr "Nätverksanslutningen gick ut"
@@ -1148,8 +1148,8 @@
msgstr "Test hoppades över"
#: ../include/svn_error_codes.h:1278
-msgid "apr memcache library not available"
-msgstr "apr memcache-bibliotek ej tillgängligt"
+msgid "APR memcache library not available"
+msgstr "APR memcache-bibliotek ej tillgängligt"
#: ../include/svn_error_codes.h:1283
msgid "Couldn't perform atomic initialization"
@@ -1350,18 +1350,18 @@
msgid "'%s' prevents creating parent of '%s'"
msgstr "\"%s\" hindrar att förälder till \"%s\" skapas"
-#: ../libsvn_client/add.c:914 ../libsvn_wc/adm_ops.c:731
+#: ../libsvn_client/add.c:914 ../libsvn_wc/adm_ops.c:732
#, c-format
msgid "'%s' is an existing item in conflict; please mark the conflict as resolved before adding a new item here"
msgstr "\"%s\" är ett befintligt objekt i konflikt; markera konflikten som löst innan ett nytt objekt läggs till här"
-#: ../libsvn_client/add.c:921 ../libsvn_wc/adm_ops.c:686
-#: ../libsvn_wc/workqueue.c:904 ../libsvn_wc/workqueue.c:998
+#: ../libsvn_client/add.c:921 ../libsvn_wc/adm_ops.c:687
+#: ../libsvn_wc/workqueue.c:905 ../libsvn_wc/workqueue.c:999
#, c-format
msgid "'%s' not found"
msgstr "\"%s\" finns inte"
-#: ../libsvn_client/add.c:927 ../libsvn_wc/adm_ops.c:691
+#: ../libsvn_client/add.c:927 ../libsvn_wc/adm_ops.c:692
#: ../libsvn_wc/delete.c:98
#, c-format
msgid "Unsupported node kind for path '%s'"
@@ -1380,7 +1380,7 @@
msgstr "\"%s\" är ingen lokal sökväg"
#: ../libsvn_client/add.c:1001 ../libsvn_client/copy_foreign.c:489
-#: ../libsvn_wc/adm_ops.c:765 ../libsvn_wc/copy.c:715
+#: ../libsvn_wc/adm_ops.c:766 ../libsvn_wc/copy.c:715
#, c-format
msgid "'%s' is already under version control"
msgstr "\"%s\" är redan versionshanterad"
@@ -1387,7 +1387,7 @@
#: ../libsvn_client/add.c:1134 ../libsvn_client/add.c:1161
#, c-format
-msgid "There is no valid uri above '%s'"
+msgid "There is no valid URI above '%s'"
msgstr "Det finns ingen giltig URI ovanför \"%s\""
#: ../libsvn_client/blame.c:605
@@ -1402,10 +1402,10 @@
#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:610
#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:833
#: ../libsvn_client/prop_commands.c:1388 ../libsvn_client/revisions.c:104
-#: ../libsvn_wc/adm_ops.c:1196 ../libsvn_wc/adm_ops.c:1246
+#: ../libsvn_wc/adm_ops.c:1197 ../libsvn_wc/adm_ops.c:1247
#: ../libsvn_wc/copy.c:563 ../libsvn_wc/copy.c:624 ../libsvn_wc/entries.c:1301
-#: ../libsvn_wc/entries.c:2679 ../libsvn_wc/entries.c:2710
-#: ../svn/notify.c:1075
+#: ../libsvn_wc/entries.c:2681 ../libsvn_wc/entries.c:2712
+#: ../svn/notify.c:1095
#, c-format
msgid "'%s' is not under version control"
msgstr "\"%s\" är inte versionshanterad"
@@ -1462,7 +1462,7 @@
msgid "Resolving '^/': no repository root found in the target arguments or in the current directory"
msgstr "Uppslagning av \"^/\": ingen arkivrot hittades i målargumenten eller i arbetskatalogen"
-#: ../libsvn_client/commit.c:155 ../libsvn_client/copy.c:1505
+#: ../libsvn_client/commit.c:155 ../libsvn_client/copy.c:1510
msgid "Commit failed (details follow):"
msgstr "Arkiveringen misslyckades (mer information följer):"
@@ -1478,17 +1478,17 @@
msgid "Error bumping revisions post-commit (details follow):"
msgstr "Fel vid höjning av revisionsnummer efter arkivering (mer information följer):"
-#: ../libsvn_client/commit.c:307
+#: ../libsvn_client/commit.c:314
#, c-format
msgid "Cannot delete the directory '%s' in a non-recursive commit because it has children"
msgstr "Kan inte radera katalogen \"%s\" icke-rekursivt eftersom den inte är tom"
-#: ../libsvn_client/commit.c:606
+#: ../libsvn_client/commit.c:613
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "\"%s\" är en URL, men URL:er kan inte vara mål vid arkivering"
-#: ../libsvn_client/commit.c:728
+#: ../libsvn_client/commit.c:735
msgid ""
"Commit can only commit to a single repository at a time.\n"
"Are all targets part of the same working copy?"
@@ -1496,12 +1496,12 @@
"Arkivering kan bara ske till ett enda arkiv åt gången.\n"
"Ingår samtliga mål i samma arbetskopia?"
-#: ../libsvn_client/commit.c:844
+#: ../libsvn_client/commit.c:851
#, c-format
msgid "Cannot commit '%s' because it was moved from '%s' which is not part of the commit; both sides of the move must be committed together"
msgstr "Kan inte arkivera \"%s\" eftersom den flyttades från \"%s\" som inte ingår i arkiveringen; bägge sidor av flytten måste arkiveras tillsammans"
-#: ../libsvn_client/commit.c:875
+#: ../libsvn_client/commit.c:882
#, c-format
msgid "Cannot commit '%s' because it was moved to '%s' which is not part of the commit; both sides of the move must be committed together"
msgstr "Kan inte arkivera \"%s\" eftersom den flyttades till \"%s\" som inte ingår i arkiveringen; bägge sidor av flytten måste arkiveras tillsammans"
@@ -1580,88 +1580,88 @@
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "Standardegenskaper kan inte sättas direkt som revisionsegenskaper"
-#: ../libsvn_client/copy.c:426
+#: ../libsvn_client/copy.c:427
#, c-format
msgid "Path '%s' exists, but is excluded"
msgstr "Sökvägen \"%s\" finns men är utesluten"
-#: ../libsvn_client/copy.c:432 ../libsvn_client/copy.c:1045
-#: ../libsvn_client/copy.c:1304 ../libsvn_client/copy.c:1879
+#: ../libsvn_client/copy.c:433 ../libsvn_client/copy.c:1050
+#: ../libsvn_client/copy.c:1309 ../libsvn_client/copy.c:1884
#: ../libsvn_client/import.c:862
#, c-format
msgid "Path '%s' already exists"
msgstr "Sökvägen \"%s\" finns redan"
-#: ../libsvn_client/copy.c:484
+#: ../libsvn_client/copy.c:488
#, c-format
msgid "Path '%s' already exists as unversioned node"
msgstr "Sökvägen \"%s\" finns redan men är ej versionshanterad"
-#: ../libsvn_client/copy.c:506 ../libsvn_client/copy.c:516
-#: ../libsvn_client/copy.c:1895
+#: ../libsvn_client/copy.c:510 ../libsvn_client/copy.c:520
+#: ../libsvn_client/copy.c:1900
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Sökvägen \"%s\" är ingen katalog"
-#: ../libsvn_client/copy.c:554 ../libsvn_client/merge.c:10116
-#: ../svnlook/svnlook.c:1403
+#: ../libsvn_client/copy.c:559 ../libsvn_client/merge.c:10118
+#: ../svnlook/svnlook.c:1425
#, c-format
msgid "Path '%s' does not exist"
msgstr "Sökvägen \"%s\" finns inte"
-#: ../libsvn_client/copy.c:724 ../libsvn_client/copy.c:765
+#: ../libsvn_client/copy.c:729 ../libsvn_client/copy.c:770
#, c-format
msgid "Path '%s' already exists, but is not a directory"
msgstr "\"%s\" finns redan men är ingen katalog"
-#: ../libsvn_client/copy.c:826
+#: ../libsvn_client/copy.c:831
msgid "Source and destination URLs appear not to point to the same repository."
msgstr "Käll- och destinations-URL:erna verkar inte syfta på samma arkiv."
-#: ../libsvn_client/copy.c:1035 ../libsvn_client/prop_commands.c:167
+#: ../libsvn_client/copy.c:1040 ../libsvn_client/prop_commands.c:167
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Sökvägen \"%s\" finns inte i revision %ld"
-#: ../libsvn_client/copy.c:1863
+#: ../libsvn_client/copy.c:1868
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Sökvägen \"%s\" finns inte i revision %ld"
-#: ../libsvn_client/copy.c:1868
+#: ../libsvn_client/copy.c:1873
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Sökvägen \"%s\" finns inte i den senaste revisionen"
-#: ../libsvn_client/copy.c:1996
+#: ../libsvn_client/copy.c:2001
msgid "Cannot mix repository and working copy sources"
msgstr "Kan inte blanda källor från arkiv och arbetskopia"
-#: ../libsvn_client/copy.c:2048
+#: ../libsvn_client/copy.c:2053
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Kan inte kopiera sökvägen \"%s\" till dess eget barn \"%s\""
-#: ../libsvn_client/copy.c:2084
+#: ../libsvn_client/copy.c:2089
#, c-format
msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'."
msgstr "Kan inte flytta externa objektet \"%s\"; var god redigera egenskapen svn:externals på \"%s\"."
-#: ../libsvn_client/copy.c:2099
+#: ../libsvn_client/copy.c:2104
msgid "Moves between the working copy and the repository are not supported"
msgstr "Flytt mellan arbetskopian och arkivet stöds ej"
-#: ../libsvn_client/copy.c:2114
+#: ../libsvn_client/copy.c:2119
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Kan inte flytta URL:en \"%s\" till sig själv"
-#: ../libsvn_client/copy.c:2115
+#: ../libsvn_client/copy.c:2120
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Kan inte flytta sökvägen \"%s\" till sig själv"
-#: ../libsvn_client/copy.c:2182
+#: ../libsvn_client/copy.c:2187
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr "\"%s\" verkar inte ha någon URL kopplad till sig"
@@ -1668,7 +1668,7 @@
#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:282
#: ../libsvn_client/externals.c:904 ../libsvn_client/externals.c:1103
-#: ../libsvn_wc/update_editor.c:1119
+#: ../libsvn_wc/update_editor.c:1124
#, c-format
msgid "Path '%s' is not in the working copy"
msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
@@ -1675,9 +1675,9 @@
#: ../libsvn_client/copy_foreign.c:372 ../libsvn_client/export.c:812
#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1051
-#: ../libsvn_ra_svn/client.c:1185 ../libsvn_wc/diff_editor.c:1977
-#: ../libsvn_wc/diff_editor.c:2056 ../libsvn_wc/externals.c:651
-#: ../libsvn_wc/update_editor.c:4205
+#: ../libsvn_ra_svn/client.c:1208 ../libsvn_wc/diff_editor.c:1981
+#: ../libsvn_wc/diff_editor.c:2060 ../libsvn_wc/externals.c:651
+#: ../libsvn_wc/update_editor.c:4242
#, c-format
msgid "Checksum mismatch for '%s'"
msgstr "Felaktig kontrollsumma för \"%s\""
@@ -1720,73 +1720,73 @@
msgstr "Icke-rekursiv omlokalisering otillåten"
#. Utilities
-#: ../libsvn_client/diff.c:63
+#: ../libsvn_client/diff.c:64
#, c-format
msgid "Path '%s' must be an immediate child of the directory '%s'"
msgstr "Sökvägen \"%s\" måste stå omedelbart under katalogen \"%s\""
-#: ../libsvn_client/diff.c:257
+#: ../libsvn_client/diff.c:258
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revision %ld)"
-#: ../libsvn_client/diff.c:259
+#: ../libsvn_client/diff.c:260
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(arbetskopia)"
-#: ../libsvn_client/diff.c:511 ../svnlook/svnlook.c:792
+#: ../libsvn_client/diff.c:512 ../svnlook/svnlook.c:795
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sEgenskapsändringar för: %s%s"
-#: ../libsvn_client/diff.c:759
+#: ../libsvn_client/diff.c:760
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Kan inte visa: filen markerad som binär.%s"
-#: ../libsvn_client/diff.c:1250 ../libsvn_client/merge.c:7176
-#: ../libsvn_client/merge.c:10523
+#: ../libsvn_client/diff.c:1265 ../libsvn_client/merge.c:7178
+#: ../libsvn_client/merge.c:10525
msgid "Not all required revisions are specified"
msgstr "Alla revisioner som krävs angavs inte"
-#: ../libsvn_client/diff.c:1264
+#: ../libsvn_client/diff.c:1279
msgid "At least one revision must be something other than BASE or WORKING when diffing a URL"
msgstr "Åtminstone en revision måste vara något annat än BASE eller WORKING för diff av en URL"
-#: ../libsvn_client/diff.c:1301
+#: ../libsvn_client/diff.c:1316
#, c-format
msgid "Diff target '%s' was not found in the repository at revision '%ld'"
msgstr "\"%s\" fanns inte i revision %ld i arkivet"
-#: ../libsvn_client/diff.c:1306
+#: ../libsvn_client/diff.c:1321
#, c-format
msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
msgstr "\"%s\" fanns inte i revision %ld eller %ld i arkivet"
-#: ../libsvn_client/diff.c:1481
+#: ../libsvn_client/diff.c:1496
#, c-format
msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
msgstr "\"%s\" fanns inte i revision %ld och %ld i arkivet"
-#: ../libsvn_client/diff.c:1486
+#: ../libsvn_client/diff.c:1501
#, c-format
msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'"
msgstr "\"%s\" och \"%s\" fanns inte i revision %ld och %ld i arkivet"
-#: ../libsvn_client/diff.c:1560
+#: ../libsvn_client/diff.c:1575
msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported"
msgstr "Tyvärr anropades svn_client_diff6 på ett sätt som inte stöds ännu"
-#: ../libsvn_client/diff.c:1601
+#: ../libsvn_client/diff.c:1616
msgid "Only diffs between a path's text-base and its working files are supported at this time"
msgstr "Endast skillnader mellan en arbetskopias textbas och arbetsfilerna stöds för närvarande"
-#: ../libsvn_client/diff.c:2206
+#: ../libsvn_client/diff.c:2221
msgid "Summarized diffs are only supported between a path's text-base and its working files at this time"
msgstr "Sammanfattade skillnader stöd för närvarande endast mellan en sökvägs textbas och dess arbetskopia"
-#: ../libsvn_client/diff.c:2567 ../libsvn_client/diff.c:2633
+#: ../libsvn_client/diff.c:2582 ../libsvn_client/diff.c:2648
msgid "Cannot ignore properties and show only properties at the same time"
msgstr "Kan inte samtidigt bortse från egenskaper och bara visa egenskaper"
@@ -1795,7 +1795,7 @@
msgid "'%s' is not the same node kind as '%s'"
msgstr "\"%s\" är inte samma typ av nod som \"%s\""
-#: ../libsvn_client/diff_local.c:629 ../libsvn_wc/props.c:1556
+#: ../libsvn_client/diff_local.c:632 ../libsvn_wc/props.c:1568
#, c-format
msgid "'%s' is not a file or directory"
msgstr "\"%s\" är ingen fil eller katalog"
@@ -1811,20 +1811,20 @@
#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1525
#: ../libsvn_wc/adm_crawler.c:1204 ../libsvn_wc/conflicts.c:1293
-#: ../libsvn_wc/copy.c:586 ../libsvn_wc/crop.c:235 ../libsvn_wc/crop.c:326
-#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:704 ../libsvn_wc/props.c:229
-#: ../libsvn_wc/status.c:2781 ../libsvn_wc/wc_db.c:2497
-#: ../libsvn_wc/wc_db.c:2691 ../libsvn_wc/wc_db.c:2715
-#: ../libsvn_wc/wc_db.c:2873 ../libsvn_wc/wc_db.c:3864
-#: ../libsvn_wc/wc_db.c:5883 ../libsvn_wc/wc_db.c:6203
-#: ../libsvn_wc/wc_db.c:6364 ../libsvn_wc/wc_db.c:6518
-#: ../libsvn_wc/wc_db.c:8343 ../libsvn_wc/wc_db.c:8800
-#: ../libsvn_wc/wc_db.c:9429 ../libsvn_wc/wc_db.c:9576
-#: ../libsvn_wc/wc_db.c:9716 ../libsvn_wc/wc_db.c:10066
-#: ../libsvn_wc/wc_db.c:11553 ../libsvn_wc/wc_db.c:11629
-#: ../libsvn_wc/wc_db.c:13163 ../libsvn_wc/wc_db.c:13223
-#: ../libsvn_wc/wc_db.c:13361 ../libsvn_wc/wc_db.c:13519
-#: ../libsvn_wc/wc_db.c:13956 ../libsvn_wc/wc_db.c:14737
+#: ../libsvn_wc/copy.c:586 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327
+#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:704 ../libsvn_wc/props.c:227
+#: ../libsvn_wc/status.c:2781 ../libsvn_wc/wc_db.c:2509
+#: ../libsvn_wc/wc_db.c:2703 ../libsvn_wc/wc_db.c:2727
+#: ../libsvn_wc/wc_db.c:2885 ../libsvn_wc/wc_db.c:3876
+#: ../libsvn_wc/wc_db.c:5895 ../libsvn_wc/wc_db.c:6215
+#: ../libsvn_wc/wc_db.c:6376 ../libsvn_wc/wc_db.c:6530
+#: ../libsvn_wc/wc_db.c:8355 ../libsvn_wc/wc_db.c:8812
+#: ../libsvn_wc/wc_db.c:9441 ../libsvn_wc/wc_db.c:9588
+#: ../libsvn_wc/wc_db.c:9728 ../libsvn_wc/wc_db.c:10078
+#: ../libsvn_wc/wc_db.c:11565 ../libsvn_wc/wc_db.c:11641
+#: ../libsvn_wc/wc_db.c:13175 ../libsvn_wc/wc_db.c:13235
+#: ../libsvn_wc/wc_db.c:13373 ../libsvn_wc/wc_db.c:13531
+#: ../libsvn_wc/wc_db.c:13968 ../libsvn_wc/wc_db.c:14749
#, c-format
msgid "The node '%s' was not found."
msgstr "Noden \"%s\" kunde inte hittas."
@@ -1943,32 +1943,35 @@
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: ../libsvn_client/locking_commands.c:483 ../libsvn_fs/fs-loader.c:1411
-#: ../libsvn_ra/ra_loader.c:1067
+#: ../libsvn_client/locking_commands.c:483 ../libsvn_fs/fs-loader.c:1413
+#: ../libsvn_ra/ra_loader.c:1074
msgid "Lock comment contains illegal characters"
msgstr "Låskommentaren innehåller otillåtna tecken"
-#: ../libsvn_client/log.c:297 ../libsvn_client/log.c:354
-msgid "Missing required revision specification"
-msgstr "Revisionsspecifikation saknas"
+#: ../libsvn_client/log.c:309
+msgid "No valid target found"
+msgstr "Giltigt mål saknas"
-#: ../libsvn_client/log.c:403
+#: ../libsvn_client/log.c:340
#, c-format
msgid "'%s' is not a relative path"
msgstr "\"%s\" är ingen relativ sökväg"
-#: ../libsvn_client/log.c:428
+#: ../libsvn_client/log.c:366
msgid "When specifying working copy paths, only one target may be given"
msgstr "Endast ett mål kan anges då sökvägar till arbetskopior anges"
-#: ../libsvn_client/log.c:454 ../libsvn_client/status.c:454
-#, c-format
-msgid "Entry '%s' has no URL"
-msgstr "Posten \"%s\" saknar URL"
+#: ../libsvn_client/log.c:390 ../libsvn_client/revisions.c:189
+msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
+msgstr "De speciella revisionerna PREV, BASE och COMMITTED kan inte användas för URL:er"
+#: ../libsvn_client/log.c:523 ../libsvn_client/log.c:830
+msgid "Missing required revision specification"
+msgstr "Revisionsspecifikation saknas"
+
#: ../libsvn_client/merge.c:439
#, c-format
-msgid "Url '%s' of '%s' is not in repository '%s'"
+msgid "URL '%s' of '%s' is not in repository '%s'"
msgstr "URL:en \"%s\" för \"%s\" är inte i arkivet \"%s\""
#: ../libsvn_client/merge.c:476
@@ -1979,25 +1982,25 @@
#. xgettext: the '.working', '.merge-left.r%ld' and
#. '.merge-right.r%ld' strings are used to tag onto a file
#. name in case of a merge conflict
-#: ../libsvn_client/merge.c:2028
+#: ../libsvn_client/merge.c:2030
msgid ".working"
msgstr ".arbetskopia"
-#: ../libsvn_client/merge.c:2030
+#: ../libsvn_client/merge.c:2032
#, c-format
msgid ".merge-left.r%ld"
msgstr ".sammanslagning-vänster.r%ld"
-#: ../libsvn_client/merge.c:2033
+#: ../libsvn_client/merge.c:2035
#, c-format
msgid ".merge-right.r%ld"
msgstr ".sammanslagning-höger.r%ld"
-#: ../libsvn_client/merge.c:4681
+#: ../libsvn_client/merge.c:4683
msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
msgstr "Det går inte att göra en omvänd sammanslagning av revisioner från en sökvägs egen framtid; försök att uppdatera först"
-#: ../libsvn_client/merge.c:5416
+#: ../libsvn_client/merge.c:5418
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -2010,74 +2013,75 @@
"lös alla konflikter och kör om sammanslagningen för att ta hand om\n"
"de återstående revisionerna"
-#: ../libsvn_client/merge.c:6231
+#: ../libsvn_client/merge.c:6233
#, c-format
-msgid "Invalid mergeinfo detected on '%s', mergetracking not possible"
+msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
msgstr "Ogiltig sammanslagningsinformation (\"mergeinfo\") för \"%s\"; följning av sammanslagning ej möjlig"
-#: ../libsvn_client/merge.c:6380
+#: ../libsvn_client/merge.c:6382
msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
msgstr "Följning av sammanslagning kräver att inga delträd saknas; försök att återställa dessa först:\n"
-#: ../libsvn_client/merge.c:7380
+#: ../libsvn_client/merge.c:7382
#, c-format
-msgid "Invalid mergeinfo detected on merge target '%s', mergetracking not possible"
+msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
msgstr "Ogiltig sammanslagningsinformation (\"mergeinfo\") för målet \"%s\"; följning av sammanslagning ej möjlig"
-#: ../libsvn_client/merge.c:9698
+#: ../libsvn_client/merge.c:9700
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr "Det går inte att använda två URL:er vid ändring av sammanslagningsinformationen"
-#: ../libsvn_client/merge.c:9705 ../libsvn_client/merge.c:10030
+#: ../libsvn_client/merge.c:9707 ../libsvn_client/merge.c:10032
msgid "Merge from foreign repository is not compatible with mergeinfo modification"
msgstr "Sammanslagning från annat arkiv går inte vid ändring av sammanslagningsinformationen"
-#: ../libsvn_client/merge.c:10123 ../libsvn_client/merge.c:10266
+#: ../libsvn_client/merge.c:10125 ../libsvn_client/merge.c:10268
#, c-format
msgid "Merge target '%s' does not exist in the working copy"
msgstr "Sammanslagningsmålet \"%s\" finns inte i arbetskopian"
-#: ../libsvn_client/merge.c:10146
+#: ../libsvn_client/merge.c:10148
msgid "Cannot determine revision of working copy"
msgstr "Arbetskopians revision kan inte bestämmas"
-#: ../libsvn_client/merge.c:10152
+#: ../libsvn_client/merge.c:10154
#, c-format
msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
msgstr "Sammanslagning till en arbetskopia i blandad revision [%ld:%ld] går inte; försök med att uppdatera först"
-#: ../libsvn_client/merge.c:10167
+#: ../libsvn_client/merge.c:10169
msgid "Cannot merge into a working copy with a switched subtree"
msgstr "Kan inte slå samman till en arbetskopia med växlat delträd"
-#: ../libsvn_client/merge.c:10183
+#: ../libsvn_client/merge.c:10185
msgid "Cannot merge into a working copy that has local modifications"
msgstr "Kan inte slå samman till en arbetskopia som har lokala ändringar"
-#: ../libsvn_client/merge.c:10203 ../svn/merge-cmd.c:60
+#: ../libsvn_client/merge.c:10205 ../svn/merge-cmd.c:60
#, c-format
msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)"
msgstr "Ogiltig sammanslagningskälla \"%s\"; en sökväg i en arbetskopia kan bara användas med en arkivrevision (ett nummer, ett datum eller \"HEAD\")"
-#: ../libsvn_client/merge.c:10526 ../svn/merge-cmd.c:136
+#: ../libsvn_client/merge.c:10528 ../svn/merge-cmd.c:127
msgid "Merge sources must both be either paths or URLs"
msgstr "Båda sammanslagningskällorna måste vara antingen sökvägar eller URL:er"
-#: ../libsvn_client/merge.c:11287 ../libsvn_client/merge.c:11449
+#: ../libsvn_client/merge.c:11289 ../libsvn_client/merge.c:11451
+#: ../libsvn_client/merge.c:12338
#, c-format
msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr "\"%s@%ld\" måste ha samma ursprung som \"%s@%ld\""
-#: ../libsvn_client/merge.c:11399
+#: ../libsvn_client/merge.c:11401
#, c-format
msgid "Neither the reintegrate source nor target can be the root of the repository"
msgstr "Varken återföreningens källa eller mål kan vara arkivets rot"
-#: ../libsvn_client/merge.c:11409
+#: ../libsvn_client/merge.c:11411
msgid "Reintegrate merge not possible"
msgstr "Återförenande sammanslagning ej möjlig"
-#: ../libsvn_client/merge.c:11482
+#: ../libsvn_client/merge.c:11484
#, c-format
msgid ""
"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
@@ -2086,28 +2090,28 @@
"Återförening kan bara ske om revisionerna %ld till %ld tidigare slogs samman från %s till återföreningens källa, men så är inte fallet:\n"
"%s"
-#: ../libsvn_client/merge.c:11544
+#: ../libsvn_client/merge.c:11546
#, c-format
msgid "Can't reintegrate into '%s' because it is locally added and therefore not related to the merge source"
msgstr "Kan inte återförena in i \"%s\" eftersom den har lagts till lokalt och är därför orelaterad till sammanslagningskällan"
-#: ../libsvn_client/merge.c:11812
+#: ../libsvn_client/merge.c:11814
msgid "Cannot merge automatically while ignoring mergeinfo"
msgstr "Automatisk sammanslagning ej möjlig utan användning av sammanslagningsinformation"
-#: ../libsvn_client/merge.c:12515
+#: ../libsvn_client/merge.c:12554
msgid "The required merge is reintegrate-like, and the record-only option cannot be used with this kind of merge"
msgstr "Sammanslagningen som krävs är en återförening, och väljaren \"record-only\" kan inte användas för den här sortens sammanslagning"
-#: ../libsvn_client/merge.c:12521
+#: ../libsvn_client/merge.c:12560
msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge"
msgstr "Sammanslagningen som krävs är en återförening, och väljaren för att ange djupet kan inte användas för den här sortens sammanslagning"
-#: ../libsvn_client/merge.c:12527
+#: ../libsvn_client/merge.c:12566
msgid "The required merge is reintegrate-like, and the force_delete option cannot be used with this kind of merge"
msgstr "Sammanslagningen som krävs är en återförening, och väljaren \"force_delete\" kan inte användas för den här sortens sammanslagning"
-#: ../libsvn_client/mergeinfo.c:1696
+#: ../libsvn_client/mergeinfo.c:1718
msgid "Only depths 'infinity' and 'empty' are currently supported"
msgstr "Bara djupen \"infinity\" (obegränsat) och \"empty\" (tomt) stöds för närvarande"
@@ -2125,9 +2129,9 @@
msgstr "antal sökvägsdelar att ta bort måste vara positivt"
#: ../libsvn_client/patch.c:3021 ../libsvn_fs_base/tree.c:3978
-#: ../libsvn_fs_base/tree.c:3983 ../libsvn_fs_fs/tree.c:3094
-#: ../libsvn_fs_fs/tree.c:3099 ../libsvn_ra/compat.c:675
-#: ../libsvn_ra_local/ra_plugin.c:1144
+#: ../libsvn_fs_base/tree.c:3983 ../libsvn_fs_fs/tree.c:3066
+#: ../libsvn_fs_fs/tree.c:3071 ../libsvn_ra/compat.c:675
+#: ../libsvn_ra_local/ra_plugin.c:1145
#, c-format
msgid "'%s' is not a file"
msgstr "\"%s\" är ingen fil"
@@ -2199,7 +2203,7 @@
msgstr "\"%s\" finns inte i revision %ld"
#: ../libsvn_client/prop_commands.c:583 ../libsvn_client/prop_commands.c:1096
-#: ../libsvn_wc/crop.c:167
+#: ../libsvn_wc/crop.c:168
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "Okänd nodtyp för \"%s\""
@@ -2206,7 +2210,7 @@
#: ../libsvn_client/ra.c:161
#, c-format
-msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
+msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation"
msgstr "Försök att sätta wcprop \"%s\" på \"%s\" under en operation som ej är arkivering"
#: ../libsvn_client/ra.c:415
@@ -2214,17 +2218,17 @@
msgid "Redirect cycle detected for URL '%s'"
msgstr "Rundgång i omdirigering upptäcktes för URL:en \"%s\""
-#: ../libsvn_client/ra.c:526 ../libsvn_client/ra.c:837
+#: ../libsvn_client/ra.c:501 ../libsvn_client/ra.c:812
#, c-format
msgid "'%s' has no URL"
msgstr "\"%s\" saknar URL"
-#: ../libsvn_client/ra.c:704 ../libsvn_ra/compat.c:395
+#: ../libsvn_client/ra.c:679 ../libsvn_ra/compat.c:395
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "Kan inte hitta platsen i arkivet för \"%s\" i revision %ld"
-#: ../libsvn_client/ra.c:716
+#: ../libsvn_client/ra.c:691
#, c-format
msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object"
msgstr "Platsen för \"%s\" i revision %ld finns inte i arkivet eller är ett orelaterat objekt"
@@ -2254,17 +2258,18 @@
msgid "Unrecognized revision type requested for '%s'"
msgstr "Okänd revisionstyp begärd för \"%s\""
-#: ../libsvn_client/revisions.c:189
-msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
-msgstr "De speciella revisionerna PREV, BASE och COMMITTED kan inte användas för URL:er"
-
#: ../libsvn_client/status.c:407 ../libsvn_client/status.c:586
#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542
-#: ../libsvn_wc/wc_db.c:12775 ../libsvn_wc/wc_db_wcroot.c:627
+#: ../libsvn_wc/wc_db.c:12787 ../libsvn_wc/wc_db_wcroot.c:630
#, c-format
msgid "'%s' is not a working copy"
msgstr "\"%s\" är ingen arbetskopia"
+#: ../libsvn_client/status.c:454
+#, c-format
+msgid "Entry '%s' has no URL"
+msgstr "Posten \"%s\" saknar URL"
+
#: ../libsvn_client/switch.c:129
#, c-format
msgid "Cannot both exclude and switch a path"
@@ -2280,8 +2285,8 @@
msgid "Directory '%s' has no URL"
msgstr "Katalogen \"%s\" saknar URL"
-#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:235
-#: ../libsvn_ra_local/ra_plugin.c:325 ../libsvn_wc/update_editor.c:4795
+#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236
+#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:4833
#, c-format
msgid ""
"'%s'\n"
@@ -2381,31 +2386,36 @@
msgid "Unexpected end of svndiff input"
msgstr "Oväntat slut på svndiff"
-#: ../libsvn_diff/diff_file.c:1094
+#: ../libsvn_diff/diff_file.c:184
#, c-format
+msgid "File '%s' is too large to be read in to memory"
+msgstr "Filen \"%s\" är för stor för att kunna läsas in i minnet"
+
+#: ../libsvn_diff/diff_file.c:1106
+#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "Filen \"%s\" ändrades oväntat vid diff-beräkning"
-#: ../libsvn_diff/diff_file.c:1264
+#: ../libsvn_diff/diff_file.c:1276
msgid "Error in options to internal diff"
msgstr "Fel i väljare till intern diff-beräkning"
-#: ../libsvn_diff/diff_file.c:1290
+#: ../libsvn_diff/diff_file.c:1302
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "Ogiltigt argument \"%s\" i diff-flaggor"
#. Order of date components can be different in different languages
-#: ../libsvn_diff/diff_file.c:1787
+#: ../libsvn_diff/diff_file.c:1799
msgid "%a %b %e %H:%M:%S %Y"
msgstr "%a %e %b %Y %H:%M:%S"
-#: ../libsvn_diff/diff_file.c:1863 ../libsvn_diff/diff_file.c:1879
+#: ../libsvn_diff/diff_file.c:1875 ../libsvn_diff/diff_file.c:1891
#, c-format
msgid "Path '%s' must be inside the directory '%s'"
msgstr "Sökvägen \"%s\" måste vara inuti katalogen \"%s\""
-#: ../libsvn_diff/diff_file.c:2397
+#: ../libsvn_diff/diff_file.c:2409
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "Kunde inte ta bort minnesmappning \"%s\""
@@ -2444,82 +2454,82 @@
msgid "The filesystem does not support 'absent' nodes"
msgstr "Filsystemet stöder ej \"frånvarande\" noder"
-#: ../libsvn_fs/fs-loader.c:120
+#: ../libsvn_fs/fs-loader.c:121
#, c-format
msgid "Invalid name for FS type '%s'"
msgstr "Ogiltigt namn för filsystemstypen \"%s\""
-#: ../libsvn_fs/fs-loader.c:137 ../libsvn_ra/ra_loader.c:161
+#: ../libsvn_fs/fs-loader.c:138 ../libsvn_ra/ra_loader.c:161
#: ../libsvn_ra/ra_loader.c:174
#, c-format
msgid "'%s' does not define '%s()'"
msgstr "\"%s\" definierar inte \"%s()\""
-#: ../libsvn_fs/fs-loader.c:163
+#: ../libsvn_fs/fs-loader.c:164
#, c-format
msgid "Failed to load module for FS type '%s'"
msgstr "Kunde inte ladda modulen för filsystemstypen \"%s\""
-#: ../libsvn_fs/fs-loader.c:185
+#: ../libsvn_fs/fs-loader.c:186
#, c-format
msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "Versioner stämmer ej i FS-modulen \"%s\": hittade %d.%d.%d%s, väntade %d.%d.%d%s"
-#: ../libsvn_fs/fs-loader.c:265
+#: ../libsvn_fs/fs-loader.c:266
#, c-format
msgid "Unknown FS type '%s'"
msgstr "Okänd filsystemstyp \"%s\""
-#: ../libsvn_fs/fs-loader.c:387
+#: ../libsvn_fs/fs-loader.c:389
#, c-format
msgid "Path '%s' is not in UTF-8"
msgstr "Sökvägen \"%s\" är inte i UTF-8"
-#: ../libsvn_fs/fs-loader.c:395
+#: ../libsvn_fs/fs-loader.c:397
#, c-format
msgid "Path '%s' contains '.' or '..' element"
msgstr "Sökvägen \"%s\" innehåller elementet \".\" eller \"..\""
-#: ../libsvn_fs/fs-loader.c:552 ../libsvn_repos/repos.c:1982
+#: ../libsvn_fs/fs-loader.c:554 ../libsvn_repos/repos.c:1982
msgid "Hotcopy source and destination are equal"
msgstr "Samma källa och mål för kopiering under drift"
-#: ../libsvn_fs/fs-loader.c:562
+#: ../libsvn_fs/fs-loader.c:564
#, c-format
msgid "'%s' already exists and is a file"
msgstr "\"%s\" finns redan och är en fil"
-#: ../libsvn_fs/fs-loader.c:567
+#: ../libsvn_fs/fs-loader.c:569
#, c-format
msgid "'%s' already exists and has an unknown node kind"
msgstr "\"%s\" finns redan och har en okänd nodtyp"
-#: ../libsvn_fs/fs-loader.c:585
+#: ../libsvn_fs/fs-loader.c:587
#, c-format
msgid "The filesystem type of the hotcopy source ('%s') does not match the filesystem type of the hotcopy destination ('%s')"
msgstr "Filsystemstypen för källan för kopiering under drift (\"%s\") stämmer inte överens med filsystemstypen för destinationen (\"%s\")"
-#: ../libsvn_fs/fs-loader.c:1393
+#: ../libsvn_fs/fs-loader.c:1395
#, c-format
msgid "Malformed UUID '%s'"
msgstr "Felaktig UUID \"%s\""
-#: ../libsvn_fs/fs-loader.c:1421
+#: ../libsvn_fs/fs-loader.c:1423
#, c-format
msgid "Lock token URI '%s' has bad scheme; expected '%s'"
msgstr "Låsidentifieraren med URI \"%s\" har felaktigt schema; väntade \"%s\""
-#: ../libsvn_fs/fs-loader.c:1428
+#: ../libsvn_fs/fs-loader.c:1430
#, c-format
msgid "Lock token '%s' is not ASCII at byte %u"
msgstr "Låsidentifieraren \"%s\" är inte ASCII vid byte %u"
-#: ../libsvn_fs/fs-loader.c:1435
+#: ../libsvn_fs/fs-loader.c:1437
#, c-format
msgid "Lock token URI '%s' is not XML-safe"
msgstr "Låsidentifieraren med URI \"%s\" är inte XML-säker"
-#: ../libsvn_fs/fs-loader.c:1442
+#: ../libsvn_fs/fs-loader.c:1444
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Negativt utgångsgdatum till svn_fs_lock"
@@ -2536,19 +2546,19 @@
msgid "deleting changes"
msgstr "radering av ändringar"
-#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/fs_fs.c:5820
+#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/fs_fs.c:5908
msgid "Missing required node revision ID"
msgstr "Nodrevisions-id saknas"
-#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/fs_fs.c:5830
+#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/fs_fs.c:5918
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Ogiltig ändringsordning: nytt nodrevisions-id utan radering"
-#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/fs_fs.c:5841
+#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/fs_fs.c:5929
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "Ogiltig ändringsordning: ändring som inte är tillägg på raderad sökväg"
-#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/fs_fs.c:5850
+#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/fs_fs.c:5938
msgid "Invalid change ordering: add change on preexisting path"
msgstr "Ogiltig ändringsordning: tilläggsändring på redan befintlig sökväg"
@@ -3016,7 +3026,7 @@
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr "Trasig filsystemsrevision %ld i filsystemet \"%s\""
-#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2224
+#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2267
#, c-format
msgid "Reference to non-existent node '%s' in filesystem '%s'"
msgstr "Referens till icke existerande nod \"%s\" i filsystemet \"%s\""
@@ -3076,151 +3086,151 @@
msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'"
msgstr "Ingen post i tabellen \"checksum-reps\" för kontrollsumman \"%s\" i filsystemet \"%s\""
-#: ../libsvn_fs_base/fs.c:87
+#: ../libsvn_fs_base/fs.c:89
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr "Felaktig databasversion: %d.%d.%d, måste vara minst %d.%d.%d"
-#: ../libsvn_fs_base/fs.c:98
+#: ../libsvn_fs_base/fs.c:100
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr "Felaktig databasversion: kompilerad med %d.%d.%d, kör mot %d.%d.%d"
-#: ../libsvn_fs_base/fs.c:188
+#: ../libsvn_fs_base/fs.c:190
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr "Berkeley DB-fel i filsystemet \"%s\" då databasmiljön skulle stängas:\n"
-#: ../libsvn_fs_base/fs.c:551
+#: ../libsvn_fs_base/fs.c:553
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr "Berkeley DB-fel i filsystemet \"%s\" då databasmiljön skulle skapas:\n"
-#: ../libsvn_fs_base/fs.c:557
+#: ../libsvn_fs_base/fs.c:559
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr "Berkeley DB-fel i filsystemet \"%s\" då databasmiljön skulle öppnas:\n"
-#: ../libsvn_fs_base/fs.c:572
+#: ../libsvn_fs_base/fs.c:574
msgid "creating 'nodes' table"
msgstr "skapande av \"nodes\"-tabellen"
-#: ../libsvn_fs_base/fs.c:573
+#: ../libsvn_fs_base/fs.c:575
msgid "opening 'nodes' table"
msgstr "öppning av \"nodes\"-tabellen"
-#: ../libsvn_fs_base/fs.c:578
+#: ../libsvn_fs_base/fs.c:580
msgid "creating 'revisions' table"
msgstr "skapande av \"revisions\"-tabellen"
-#: ../libsvn_fs_base/fs.c:579
+#: ../libsvn_fs_base/fs.c:581
msgid "opening 'revisions' table"
msgstr "öppnande av \"revisions\"-tabellen"
-#: ../libsvn_fs_base/fs.c:584
+#: ../libsvn_fs_base/fs.c:586
msgid "creating 'transactions' table"
msgstr "skapande av \"transactions\"-tabellen"
-#: ../libsvn_fs_base/fs.c:585
+#: ../libsvn_fs_base/fs.c:587
msgid "opening 'transactions' table"
msgstr "öppnande av \"transactions\"-tabellen"
-#: ../libsvn_fs_base/fs.c:590
+#: ../libsvn_fs_base/fs.c:592
msgid "creating 'copies' table"
msgstr "skapande av \"copies\"-tabellen"
-#: ../libsvn_fs_base/fs.c:591
+#: ../libsvn_fs_base/fs.c:593
msgid "opening 'copies' table"
msgstr "öppnande av \"copies\"-tabellen"
-#: ../libsvn_fs_base/fs.c:596
+#: ../libsvn_fs_base/fs.c:598
msgid "creating 'changes' table"
msgstr "skapande av \"changes\"-tabellen"
-#: ../libsvn_fs_base/fs.c:597
+#: ../libsvn_fs_base/fs.c:599
msgid "opening 'changes' table"
msgstr "öppnande av \"changes\"-tabellen"
-#: ../libsvn_fs_base/fs.c:602
+#: ../libsvn_fs_base/fs.c:604
msgid "creating 'representations' table"
msgstr "skapande av \"representations\"-tabellen"
-#: ../libsvn_fs_base/fs.c:603
+#: ../libsvn_fs_base/fs.c:605
msgid "opening 'representations' table"
msgstr "öppnande av \"representations\"-tabellen"
-#: ../libsvn_fs_base/fs.c:608
+#: ../libsvn_fs_base/fs.c:610
msgid "creating 'strings' table"
msgstr "skapande av \"strings\"-tabellen"
-#: ../libsvn_fs_base/fs.c:609
+#: ../libsvn_fs_base/fs.c:611
msgid "opening 'strings' table"
msgstr "öppnande av \"strings\"-tabellen"
-#: ../libsvn_fs_base/fs.c:614
+#: ../libsvn_fs_base/fs.c:616
msgid "creating 'uuids' table"
msgstr "skapande av \"uuids\"-tabellen"
-#: ../libsvn_fs_base/fs.c:615
+#: ../libsvn_fs_base/fs.c:617
msgid "opening 'uuids' table"
msgstr "öppnande av \"uuids\"-tabellen"
-#: ../libsvn_fs_base/fs.c:620
+#: ../libsvn_fs_base/fs.c:622
msgid "creating 'locks' table"
msgstr "skapande av \"locks\"-tabellen"
-#: ../libsvn_fs_base/fs.c:621
+#: ../libsvn_fs_base/fs.c:623
msgid "opening 'locks' table"
msgstr "öppnande av \"locks\"-tabellen"
-#: ../libsvn_fs_base/fs.c:626
+#: ../libsvn_fs_base/fs.c:628
msgid "creating 'lock-tokens' table"
msgstr "skapande av \"lock-tokens\"-tabellen"
-#: ../libsvn_fs_base/fs.c:627
+#: ../libsvn_fs_base/fs.c:629
msgid "opening 'lock-tokens' table"
msgstr "öppnande av \"lock-tokens\"-tabellen"
-#: ../libsvn_fs_base/fs.c:635
+#: ../libsvn_fs_base/fs.c:637
msgid "creating 'node-origins' table"
msgstr "skapande av \"node-origins\"-tabellen"
-#: ../libsvn_fs_base/fs.c:636
+#: ../libsvn_fs_base/fs.c:638
msgid "opening 'node-origins' table"
msgstr "öppnande av \"node-origins\"-tabellen"
-#: ../libsvn_fs_base/fs.c:645
+#: ../libsvn_fs_base/fs.c:647
msgid "creating 'miscellaneous' table"
msgstr "skapande av \"miscellaneous\"-tabellen"
-#: ../libsvn_fs_base/fs.c:646
+#: ../libsvn_fs_base/fs.c:648
msgid "opening 'miscellaneous' table"
msgstr "öppnande av \"miscellaneous\"-tabellen"
-#: ../libsvn_fs_base/fs.c:655
+#: ../libsvn_fs_base/fs.c:657
msgid "creating 'checksum-reps' table"
msgstr "skapande av \"checksum-reps\"-tabellen"
-#: ../libsvn_fs_base/fs.c:656
+#: ../libsvn_fs_base/fs.c:658
msgid "opening 'checksum-reps' table"
msgstr "öppnande av \"checksum-reps\"-tabellen"
-#: ../libsvn_fs_base/fs.c:728
+#: ../libsvn_fs_base/fs.c:730
#, c-format
msgid "The '%s' feature requires version %d of the filesystem schema; filesystem '%s' uses only version %d"
msgstr "Funktionen \"%s\" behöver version %d av filsystemsschemat; filsystemet \"%s\" använder bara version %d"
-#: ../libsvn_fs_base/fs.c:747
+#: ../libsvn_fs_base/fs.c:749
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Förväntat format på filsystemet \"%d\"; hittade \"%d\""
-#: ../libsvn_fs_base/fs.c:1213
+#: ../libsvn_fs_base/fs.c:1215
#, c-format
msgid "BDB repositories do not support incremental hotcopy"
msgstr "BDB-arkiv stöder inte successiv kopiering under drift"
-#: ../libsvn_fs_base/fs.c:1317
+#: ../libsvn_fs_base/fs.c:1319
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -3231,7 +3241,7 @@
"dåligt med algoritmen för kopiering under drift. Om problemet kvarstår,\n"
"försök med att slå av funktionen i DB_CONFIG"
-#: ../libsvn_fs_base/fs.c:1336
+#: ../libsvn_fs_base/fs.c:1338
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -3243,11 +3253,11 @@
"kopiering under drift. Prova med att avaktivera\n"
"denna funktion i DB_CONFIG om problemet kvarstår"
-#: ../libsvn_fs_base/fs.c:1381
+#: ../libsvn_fs_base/fs.c:1383
msgid "Module for working with a Berkeley DB repository."
msgstr "Modul för att arbeta med ett Berkeley DB-arkiv."
-#: ../libsvn_fs_base/fs.c:1428
+#: ../libsvn_fs_base/fs.c:1430
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Versionen för FS-laddaren (%d) stöds ej för bdb"
@@ -3357,7 +3367,7 @@
msgid "Transaction is dead: '%s'"
msgstr "Transaktionen är död: \"%s\""
-#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:9667
+#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:9755
#, c-format
msgid "revprop '%s' has unexpected value in filesystem"
msgstr "revisionsegenskapen \"%s\" har oväntat värde i filsystemet"
@@ -3378,12 +3388,12 @@
msgid "committing Berkeley DB transaction"
msgstr "slutförande av Berkeley DB-transaktion"
-#: ../libsvn_fs_base/tree.c:772 ../libsvn_fs_fs/tree.c:1046
+#: ../libsvn_fs_base/tree.c:772 ../libsvn_fs_fs/tree.c:1065
#, c-format
msgid "Failure opening '%s'"
msgstr "Kan inte öppna \"%s\""
-#: ../libsvn_fs_base/tree.c:1403 ../libsvn_fs_fs/tree.c:1497
+#: ../libsvn_fs_base/tree.c:1403 ../libsvn_fs_fs/tree.c:1516
msgid "Cannot compare property value between two different filesystems"
msgstr "Kan inte jämföra egenskapsvärde mellan två olika filsystem"
@@ -3396,18 +3406,18 @@
msgid "Unexpected immutable node at '%s'"
msgstr "Oväntad icke ändringsbar nod på \"%s\""
-#: ../libsvn_fs_base/tree.c:1997 ../libsvn_fs_fs/tree.c:1527
-#: ../libsvn_repos/commit.c:1316
+#: ../libsvn_fs_base/tree.c:1997 ../libsvn_fs_fs/tree.c:1546
+#: ../libsvn_repos/commit.c:1244
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt på \"%s\""
#: ../libsvn_fs_base/tree.c:2050 ../libsvn_fs_base/tree.c:2802
-#: ../libsvn_fs_fs/tree.c:1578 ../libsvn_fs_fs/tree.c:2115
+#: ../libsvn_fs_fs/tree.c:1597 ../libsvn_fs_fs/tree.c:2134
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr "Felaktig sammanslagning; ursprung, källa och mål är inte samtliga i samma filsystem"
-#: ../libsvn_fs_base/tree.c:2066 ../libsvn_fs_fs/tree.c:1594
+#: ../libsvn_fs_base/tree.c:2066 ../libsvn_fs_fs/tree.c:1613
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "Felaktig sammanslagning; målet \"%s\" har id \"%s\", samma som ursprunget"
@@ -3422,40 +3432,40 @@
msgid "Cannot deltify revisions prior to r%ld"
msgstr "Kan inte deltifiera revisioner äldre än r%ld"
-#: ../libsvn_fs_base/tree.c:3004 ../libsvn_fs_fs/tree.c:2317
+#: ../libsvn_fs_base/tree.c:3004 ../libsvn_fs_fs/tree.c:2289
msgid "The root directory cannot be deleted"
msgstr "Rotkatalogen kan inte raderas"
-#: ../libsvn_fs_base/tree.c:3217 ../libsvn_fs_fs/tree.c:2387
+#: ../libsvn_fs_base/tree.c:3217 ../libsvn_fs_fs/tree.c:2359
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "Kan inte kopiera mellan två olika filsystem (\"%s\" och \"%s\")"
-#: ../libsvn_fs_base/tree.c:3226 ../libsvn_fs_fs/tree.c:2393
+#: ../libsvn_fs_base/tree.c:3226 ../libsvn_fs_fs/tree.c:2365
msgid "Copy from mutable tree not currently supported"
msgstr "Kopiering från ändringsbart träd stöds ej för närvarande"
-#: ../libsvn_fs_base/tree.c:3736 ../libsvn_fs_fs/tree.c:2870
+#: ../libsvn_fs_base/tree.c:3736 ../libsvn_fs_fs/tree.c:2842
#, c-format
msgid "Base checksum mismatch on '%s'"
msgstr "Felaktig baskontrollsumma för \"%s\""
-#: ../libsvn_fs_base/tree.c:3969 ../libsvn_fs_fs/tree.c:3085
+#: ../libsvn_fs_base/tree.c:3969 ../libsvn_fs_fs/tree.c:3057
msgid "Cannot compare file contents between two different filesystems"
msgstr "Kan inte jämföra filinnehåll mellan två olika filsystem"
-#: ../libsvn_fs_base/tree.c:5006 ../libsvn_fs_base/tree.c:5181
+#: ../libsvn_fs_base/tree.c:5013 ../libsvn_fs_base/tree.c:5188
#, c-format
msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
msgstr "Nodrevision \"%s\" påstår sig ha sammanslagningsinformation men det har den inte"
-#: ../libsvn_fs_base/tree.c:5042
+#: ../libsvn_fs_base/tree.c:5049
#, c-format
msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not a directory"
msgstr "Nodrevision \"%s\" påstår sig sitta på ett träd med sammanslagningsinformation men är ingen katalog"
#: ../libsvn_fs_fs/dag.c:426 ../libsvn_fs_fs/dag.c:442
-#: ../libsvn_ra_serf/serf.c:962 ../libsvn_ra_serf/serf.c:1025
+#: ../libsvn_ra_serf/serf.c:1038 ../libsvn_ra_serf/serf.c:1101
msgid "Can't get entries of non-directory"
msgstr "Kan inte erhålla poster för något som ej är en katalog"
@@ -3478,21 +3488,21 @@
msgid "Attempted to update ancestry of non-mutable node"
msgstr "Försök att uppdatera ursprung till icke ändringsbar nod"
-#: ../libsvn_fs_fs/fs.c:82
+#: ../libsvn_fs_fs/fs.c:83
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Kan inte hämta delad data i FSFS"
-#: ../libsvn_fs_fs/fs.c:106
+#: ../libsvn_fs_fs/fs.c:107
#, c-format
msgid "Can't store FSFS shared data"
msgstr "Kan inte lagra delad data i FSFS"
-#: ../libsvn_fs_fs/fs.c:400
+#: ../libsvn_fs_fs/fs.c:401
msgid "Module for working with a plain file (FSFS) repository."
msgstr "Modul för att arbeta med ett arkiv bestående av vanliga filer (FSFS)."
-#: ../libsvn_fs_fs/fs.c:450
+#: ../libsvn_fs_fs/fs.c:451
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Versionen för FS-laddaren (%d) stöds ej för fsfs"
@@ -3561,350 +3571,360 @@
msgid "Expected FS format between '1' and '%d'; found format '%d'"
msgstr "Förväntat filsystemsformat mellan \"1\" och \"%d\"; hittade \"%d\""
-#: ../libsvn_fs_fs/fs_fs.c:1551
+#: ../libsvn_fs_fs/fs_fs.c:1581
#, c-format
msgid "'%s' is not a regular file. Please move it out of the way and try again"
msgstr "\"%s\" är inte en vanlig fil. Flytta den ur vägen och försök igen"
-#: ../libsvn_fs_fs/fs_fs.c:1709
+#: ../libsvn_fs_fs/fs_fs.c:1752
#, c-format
msgid "Can't read '%s'"
msgstr "Kan inte läsa \"%s\""
-#: ../libsvn_fs_fs/fs_fs.c:1772 ../libsvn_fs_fs/fs_fs.c:1791
+#: ../libsvn_fs_fs/fs_fs.c:1815 ../libsvn_fs_fs/fs_fs.c:1834
#, c-format
msgid "Found malformed header '%s' in revision file"
msgstr "Hittade felaktigt huvud \"%s\" i revisionsfil"
-#: ../libsvn_fs_fs/fs_fs.c:1827
+#: ../libsvn_fs_fs/fs_fs.c:1870
#, c-format
msgid "Invalid revision number '%ld'"
msgstr "Ogiltigt revisionsnummer \"%ld\""
-#: ../libsvn_fs_fs/fs_fs.c:1842 ../libsvn_fs_fs/fs_fs.c:1897
-#: ../libsvn_fs_fs/fs_fs.c:1908 ../libsvn_repos/log.c:2259
-#: ../libsvn_repos/log.c:2263
+#: ../libsvn_fs_fs/fs_fs.c:1885 ../libsvn_fs_fs/fs_fs.c:1940
+#: ../libsvn_fs_fs/fs_fs.c:1951 ../libsvn_repos/log.c:2268
+#: ../libsvn_repos/log.c:2272
#, c-format
msgid "No such revision %ld"
msgstr "Revisionen %ld finns inte"
-#: ../libsvn_fs_fs/fs_fs.c:1942
+#: ../libsvn_fs_fs/fs_fs.c:1985
msgid "Unexpected EOF"
msgstr "Oväntat filslut"
-#: ../libsvn_fs_fs/fs_fs.c:1949
+#: ../libsvn_fs_fs/fs_fs.c:1992
#, c-format
msgid "Number '%s' invalid or too large"
msgstr "Talet \"%s\" ogiltigt eller för stort"
-#: ../libsvn_fs_fs/fs_fs.c:2116 ../libsvn_fs_fs/fs_fs.c:2130
-#: ../libsvn_fs_fs/fs_fs.c:2138 ../libsvn_fs_fs/fs_fs.c:2146
-#: ../libsvn_fs_fs/fs_fs.c:2155 ../libsvn_fs_fs/fs_fs.c:2168
-#: ../libsvn_fs_fs/fs_fs.c:2177
+#: ../libsvn_fs_fs/fs_fs.c:2159 ../libsvn_fs_fs/fs_fs.c:2173
+#: ../libsvn_fs_fs/fs_fs.c:2181 ../libsvn_fs_fs/fs_fs.c:2189
+#: ../libsvn_fs_fs/fs_fs.c:2198 ../libsvn_fs_fs/fs_fs.c:2211
+#: ../libsvn_fs_fs/fs_fs.c:2220
msgid "Malformed text representation offset line in node-rev"
msgstr "Felaktig rad med textrepresentationsposition i node-rev"
-#: ../libsvn_fs_fs/fs_fs.c:2208
+#: ../libsvn_fs_fs/fs_fs.c:2251
#, c-format
msgid "While reading representation offsets for node-revision '%s':"
msgstr "Fel vid läsning av representationsposition för nodrevision \"%s\":"
-#: ../libsvn_fs_fs/fs_fs.c:2363
+#: ../libsvn_fs_fs/fs_fs.c:2406
msgid "Missing id field in node-rev"
msgstr "ID-fält saknas i node-rev"
-#: ../libsvn_fs_fs/fs_fs.c:2377
+#: ../libsvn_fs_fs/fs_fs.c:2420
#, c-format
msgid "Missing kind field in node-rev '%s'"
msgstr "Typfält saknas i node-rev \"%s\""
-#: ../libsvn_fs_fs/fs_fs.c:2412
+#: ../libsvn_fs_fs/fs_fs.c:2455
#, c-format
msgid "Missing cpath field in node-rev '%s'"
msgstr "Fältet cpath saknas i node-rev \"%s\""
-#: ../libsvn_fs_fs/fs_fs.c:2440 ../libsvn_fs_fs/fs_fs.c:2447
+#: ../libsvn_fs_fs/fs_fs.c:2483 ../libsvn_fs_fs/fs_fs.c:2490
#, c-format
msgid "Malformed copyroot line in node-rev '%s'"
msgstr "Felaktig copyroot-rad i node-rev \"%s\""
-#: ../libsvn_fs_fs/fs_fs.c:2464 ../libsvn_fs_fs/fs_fs.c:2471
+#: ../libsvn_fs_fs/fs_fs.c:2507 ../libsvn_fs_fs/fs_fs.c:2514
#, c-format
msgid "Malformed copyfrom line in node-rev '%s'"
msgstr "Felaktig copyfrom-rad i node-rev \"%s\""
-#: ../libsvn_fs_fs/fs_fs.c:2640 ../libsvn_fs_fs/fs_fs.c:7541
+#: ../libsvn_fs_fs/fs_fs.c:2683 ../libsvn_fs_fs/fs_fs.c:7629
#, c-format
msgid "Attempted to write to non-transaction '%s'"
msgstr "Försök att skriva till \"%s\" som inte är en transaktion"
-#: ../libsvn_fs_fs/fs_fs.c:2777
+#: ../libsvn_fs_fs/fs_fs.c:2820
#, c-format
msgid "Malformed representation header at %s"
msgstr "Felaktigt representationshuvud vid %s"
-#: ../libsvn_fs_fs/fs_fs.c:2809
+#: ../libsvn_fs_fs/fs_fs.c:2852
#, c-format
msgid "Missing node-id in node-rev at r%ld (offset %s)"
msgstr "Nod-id saknas i nodrevisionen i r%ld (position %s)"
-#: ../libsvn_fs_fs/fs_fs.c:2818
+#: ../libsvn_fs_fs/fs_fs.c:2861
#, c-format
msgid "Corrupt node-id '%s' in node-rev at r%ld (offset %s)"
msgstr "Trasig nod-id \"%s\" i nodrevisionen i r%ld (position %s)"
-#: ../libsvn_fs_fs/fs_fs.c:2909
+#: ../libsvn_fs_fs/fs_fs.c:2952
#, c-format
msgid "Revision file (r%ld) lacks trailing newline"
msgstr "Avslutande radslut saknas i revisionsfil (r%ld)"
-#: ../libsvn_fs_fs/fs_fs.c:2923
+#: ../libsvn_fs_fs/fs_fs.c:2966
#, c-format
msgid "Final line in revision file (r%ld) longer than 64 characters"
msgstr "Den sista raden i revisionsfilen (r%ld) är längre än 64 tecken"
-#: ../libsvn_fs_fs/fs_fs.c:2938
+#: ../libsvn_fs_fs/fs_fs.c:2981
#, c-format
msgid "Final line in revision file r%ld missing space"
msgstr "Den sista raden i revisionsfilen r%ld saknar mellanslag"
-#: ../libsvn_fs_fs/fs_fs.c:3633
+#: ../libsvn_fs_fs/fs_fs.c:3685
#, c-format
-msgid "Packed revprop manifest for rev %ld too small"
-msgstr "Den packade innehållsförteckningen för revisionsegenskaper för revision %ld är för liten"
+msgid "Packed revprop manifest for r%ld too small"
+msgstr "Packad innehållsförteckning för revisionsegenskaper för r%ld är för liten"
-#: ../libsvn_fs_fs/fs_fs.c:3679
+#: ../libsvn_fs_fs/fs_fs.c:3742
+#, c-format
+msgid "Revprop pack for revision r%ld contains revprops for r%ld .. r%ld"
+msgstr "Packade revisionsegenskaper för r%ld innehåller egenskaper för r%ld .. r%ld"
+
+#: ../libsvn_fs_fs/fs_fs.c:3753
+#, c-format
+msgid "Revprop pack for revision r%ld starts at non-packed revisions r%ld"
+msgstr "Packade revisionsegenskaper för r%ld börjar vid icke-packade r%ld"
+
+#: ../libsvn_fs_fs/fs_fs.c:3762
msgid "Header end not found"
msgstr "Slutet på datahuvudet hittades ej"
-#: ../libsvn_fs_fs/fs_fs.c:3707
+#: ../libsvn_fs_fs/fs_fs.c:3790
msgid "Packed revprop size exceeds pack file size"
msgstr "Packad revisionsegenskap större än packfilen"
-#: ../libsvn_fs_fs/fs_fs.c:3766
+#: ../libsvn_fs_fs/fs_fs.c:3849
#, c-format
msgid "No such packed revision %ld"
msgstr "Packade revisionen %ld finns inte"
-#: ../libsvn_fs_fs/fs_fs.c:3806
+#: ../libsvn_fs_fs/fs_fs.c:3889
#, c-format
-msgid "Failed to read revprop pack file for rev %ld"
-msgstr "Kunde inte läsa packfilen för revisionsegenskaper för revision %ld"
+msgid "Failed to read revprop pack file for r%ld"
+msgstr "Kunde inte läsa packfilen för revisionsegenskaper för r%ld"
-#: ../libsvn_fs_fs/fs_fs.c:3813
+#: ../libsvn_fs_fs/fs_fs.c:3896
#, c-format
-msgid "Revprop pack file for rev %ld is corrupt"
-msgstr "Trasig packfil för revisionsegenskaper för revision %ld"
+msgid "Revprop pack file for r%ld is corrupt"
+msgstr "Trasig packfil för revisionsegenskaper för r%ld"
-#: ../libsvn_fs_fs/fs_fs.c:3886
+#: ../libsvn_fs_fs/fs_fs.c:3969
#, c-format
msgid "Could not read revprops for revision %ld"
msgstr "Kunde inte läsa revisionsegenskaper för revision %ld"
-#: ../libsvn_fs_fs/fs_fs.c:4111
+#: ../libsvn_fs_fs/fs_fs.c:4198
#, c-format
msgid "Packed file '%s' misses a tag"
msgstr "Packad fil \"%s\" saknar en etikett"
-#: ../libsvn_fs_fs/fs_fs.c:4448
+#: ../libsvn_fs_fs/fs_fs.c:4536
msgid "Malformed svndiff data in representation"
msgstr "Felaktigt svndiff-data i representation"
-#: ../libsvn_fs_fs/fs_fs.c:4884 ../libsvn_fs_fs/fs_fs.c:4903
+#: ../libsvn_fs_fs/fs_fs.c:4972 ../libsvn_fs_fs/fs_fs.c:4991
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "Hamnade efter slutet på representationen vid läsning av ett svndiff-fönster"
-#: ../libsvn_fs_fs/fs_fs.c:4991
+#: ../libsvn_fs_fs/fs_fs.c:5079
msgid "svndiff window length is corrupt"
msgstr "Fönsterlängd i svndiff är trasig"
-#: ../libsvn_fs_fs/fs_fs.c:5159
+#: ../libsvn_fs_fs/fs_fs.c:5247
msgid "Checksum mismatch while reading representation"
msgstr "Felaktig kontrollsumma vid läsning av representation"
-#: ../libsvn_fs_fs/fs_fs.c:5522 ../libsvn_fs_fs/fs_fs.c:5536
-#: ../libsvn_fs_fs/fs_fs.c:5543
+#: ../libsvn_fs_fs/fs_fs.c:5610 ../libsvn_fs_fs/fs_fs.c:5624
+#: ../libsvn_fs_fs/fs_fs.c:5631
#, c-format
msgid "Directory entry corrupt in '%s'"
msgstr "Katalogpost trasig i \"%s\""
-#: ../libsvn_fs_fs/fs_fs.c:6021 ../libsvn_fs_fs/fs_fs.c:6026
-#: ../libsvn_fs_fs/fs_fs.c:6032 ../libsvn_fs_fs/fs_fs.c:6049
-#: ../libsvn_fs_fs/fs_fs.c:6082 ../libsvn_fs_fs/fs_fs.c:6102
-#: ../libsvn_fs_fs/fs_fs.c:6137 ../libsvn_fs_fs/fs_fs.c:6142
+#: ../libsvn_fs_fs/fs_fs.c:6109 ../libsvn_fs_fs/fs_fs.c:6114
+#: ../libsvn_fs_fs/fs_fs.c:6120 ../libsvn_fs_fs/fs_fs.c:6137
+#: ../libsvn_fs_fs/fs_fs.c:6170 ../libsvn_fs_fs/fs_fs.c:6190
+#: ../libsvn_fs_fs/fs_fs.c:6225 ../libsvn_fs_fs/fs_fs.c:6230
msgid "Invalid changes line in rev-file"
msgstr "Ogiltig changes-rad i rev-fil"
-#: ../libsvn_fs_fs/fs_fs.c:6075
+#: ../libsvn_fs_fs/fs_fs.c:6163
msgid "Invalid change kind in rev file"
msgstr "Ogiltig ändringstyp i rev-fil"
-#: ../libsvn_fs_fs/fs_fs.c:6095
+#: ../libsvn_fs_fs/fs_fs.c:6183
msgid "Invalid text-mod flag in rev-file"
msgstr "Ogiltig text-mod-flagga i rev-fil"
-#: ../libsvn_fs_fs/fs_fs.c:6115
+#: ../libsvn_fs_fs/fs_fs.c:6203
msgid "Invalid prop-mod flag in rev-file"
msgstr "Ogiltig prop-mod-flagga i rev-fil"
-#: ../libsvn_fs_fs/fs_fs.c:6373
+#: ../libsvn_fs_fs/fs_fs.c:6461
msgid "Copying from transactions not allowed"
msgstr "Det är inte tillåtet att kopiera från transaktioner"
-#: ../libsvn_fs_fs/fs_fs.c:6506
+#: ../libsvn_fs_fs/fs_fs.c:6594
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Kan inte skapa transaktionskatalog i \"%s\" för revision %ld"
-#: ../libsvn_fs_fs/fs_fs.c:6571
+#: ../libsvn_fs_fs/fs_fs.c:6659
msgid "Internal error: a null transaction id was passed to get_txn_proplist()"
msgstr "Internt fel: transaktions-id:t noll gavs till get_txn_proplist"
-#: ../libsvn_fs_fs/fs_fs.c:6730 ../libsvn_fs_fs/fs_fs.c:6737
+#: ../libsvn_fs_fs/fs_fs.c:6818 ../libsvn_fs_fs/fs_fs.c:6825
msgid "next-id file corrupt"
msgstr "next-id-filen är trasig"
-#: ../libsvn_fs_fs/fs_fs.c:6833
+#: ../libsvn_fs_fs/fs_fs.c:6921
#, c-format
msgid "Transaction '%s' cleanup failed"
msgstr "Städning efter transaktion \"%s\" misslyckades"
-#: ../libsvn_fs_fs/fs_fs.c:6973
+#: ../libsvn_fs_fs/fs_fs.c:7061
#, c-format
msgid "Invalid change type %d"
msgstr "Ogiltig ändringstyp %d"
-#: ../libsvn_fs_fs/fs_fs.c:7561
+#: ../libsvn_fs_fs/fs_fs.c:7649
msgid "Can't set text contents of a directory"
msgstr "Kan inte sätta textinnehåll i en katalog"
-#: ../libsvn_fs_fs/fs_fs.c:7647 ../libsvn_fs_fs/fs_fs.c:7652
-#: ../libsvn_fs_fs/fs_fs.c:7659
+#: ../libsvn_fs_fs/fs_fs.c:7735 ../libsvn_fs_fs/fs_fs.c:7740
+#: ../libsvn_fs_fs/fs_fs.c:7747
msgid "Corrupt 'current' file"
msgstr "Trasig \"current\"-fil"
-#: ../libsvn_fs_fs/fs_fs.c:7919
+#: ../libsvn_fs_fs/fs_fs.c:8007
#, c-format
msgid "predecessor count for the root node-revision is wrong: found (%d+%ld != %d), committing r%ld"
msgstr "föregångarräknaren för rotnodsrevisionen är felaktig: %d+%ld != %d hittades, arkiverar r%ld"
-#: ../libsvn_fs_fs/fs_fs.c:8054
+#: ../libsvn_fs_fs/fs_fs.c:8142
msgid "Truncated protorev file detected"
msgstr "Avhuggen protorev-fil upptäcktes"
-#: ../libsvn_fs_fs/fs_fs.c:8454
+#: ../libsvn_fs_fs/fs_fs.c:8542
msgid "Transaction out of date"
msgstr "Transaktionen är inaktuell"
-#: ../libsvn_fs_fs/fs_fs.c:8948
+#: ../libsvn_fs_fs/fs_fs.c:9036
msgid "Recovery encountered a non-directory node"
msgstr "En nod som ej är katalog påträffades vid återställning"
-#: ../libsvn_fs_fs/fs_fs.c:8970
+#: ../libsvn_fs_fs/fs_fs.c:9058
msgid "Recovery encountered a deltified directory representation"
msgstr "En deltafierad katalogrepresentation påträffades vid återställning"
-#: ../libsvn_fs_fs/fs_fs.c:9006 ../libsvn_fs_fs/fs_fs.c:9015
-#: ../libsvn_fs_fs/fs_fs.c:9021
+#: ../libsvn_fs_fs/fs_fs.c:9094 ../libsvn_fs_fs/fs_fs.c:9103
+#: ../libsvn_fs_fs/fs_fs.c:9109
msgid "Directory entry corrupt"
msgstr "Katalogpost trasig"
-#: ../libsvn_fs_fs/fs_fs.c:9194
+#: ../libsvn_fs_fs/fs_fs.c:9282
#, c-format
msgid "Expected current rev to be <= %ld but found %ld"
msgstr "Den aktuella revisionen förväntades vara högst %ld men är %ld"
-#: ../libsvn_fs_fs/fs_fs.c:9251
+#: ../libsvn_fs_fs/fs_fs.c:9339
#, c-format
msgid "Revision %ld has a revs file but no revprops file"
msgstr "Revision %ld har en revisionsfil men ingen revisionsegenskapsfil "
-#: ../libsvn_fs_fs/fs_fs.c:9258
+#: ../libsvn_fs_fs/fs_fs.c:9346
#, c-format
msgid "Revision %ld has a revs file but the revprops file is inaccessible"
msgstr "Revision %ld har en revisionsfil men revisionsegenskapsfilen är oåtkomlig"
-#: ../libsvn_fs_fs/fs_fs.c:9267
+#: ../libsvn_fs_fs/fs_fs.c:9355
#, c-format
msgid "Revision %ld has a non-file where its revprops file should be"
msgstr "Revision %ld har något som inte är en fil där dess revisionsegenskapsfil borde vara"
-#: ../libsvn_fs_fs/fs_fs.c:9445
+#: ../libsvn_fs_fs/fs_fs.c:9533
#, c-format
msgid "Node origin for '%s' exists with a different value (%s) than what we were about to store (%s)"
msgstr "Nodursprunget för \"%s\" finns med ett annat värde (%s) än vad som just skulle lagras (%s)"
-#: ../libsvn_fs_fs/fs_fs.c:9551
+#: ../libsvn_fs_fs/fs_fs.c:9639
#, c-format
msgid "No such transaction '%s'"
msgstr "Transaktionen \"%s\" finns inte"
-#: ../libsvn_fs_fs/fs_fs.c:10268
+#: ../libsvn_fs_fs/fs_fs.c:10356
#, c-format
msgid "FSFS format (%d) too old to pack; please upgrade the filesystem."
msgstr "FSFS-formatet (%d) är för gammalt för att packas; var god uppgradera filsystemet."
-#: ../libsvn_fs_fs/fs_fs.c:10547 ../libsvn_subr/io.c:248
+#: ../libsvn_fs_fs/fs_fs.c:10635 ../libsvn_subr/io.c:248
#, c-format
msgid "Error converting entry in directory '%s' to UTF-8"
msgstr "Fel vid omvandling av en post i katalogen \"%s\" till UTF-8"
-#: ../libsvn_fs_fs/fs_fs.c:10584 ../libsvn_subr/io.c:1021
+#: ../libsvn_fs_fs/fs_fs.c:10672 ../libsvn_subr/io.c:1021
#, c-format
msgid "Source '%s' is not a directory"
msgstr "Källan \"%s\" är ingen katalog"
-#: ../libsvn_fs_fs/fs_fs.c:10590 ../libsvn_subr/io.c:1027
+#: ../libsvn_fs_fs/fs_fs.c:10678 ../libsvn_subr/io.c:1027
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "Destinationen \"%s\" är ingen katalog"
-#: ../libsvn_fs_fs/fs_fs.c:10662 ../libsvn_subr/io.c:1104
+#: ../libsvn_fs_fs/fs_fs.c:10750 ../libsvn_subr/io.c:1104
#: ../libsvn_subr/io.c:2485
#, c-format
msgid "Can't read directory '%s'"
msgstr "Kan inte läsa katalogen \"%s\""
-#: ../libsvn_fs_fs/fs_fs.c:10667 ../libsvn_subr/io.c:1109
-#: ../libsvn_subr/io.c:2490 ../libsvn_subr/io.c:3988
+#: ../libsvn_fs_fs/fs_fs.c:10755 ../libsvn_subr/io.c:1109
+#: ../libsvn_subr/io.c:2490 ../libsvn_subr/io.c:3995
#, c-format
msgid "Error closing directory '%s'"
msgstr "Fel vid stängning av katalogen \"%s\""
-#: ../libsvn_fs_fs/fs_fs.c:10907
+#: ../libsvn_fs_fs/fs_fs.c:11038
#, c-format
msgid "The FSFS format (%d) of the hotcopy source does not match the FSFS format (%d) of the hotcopy destination; please upgrade both repositories to the same format"
msgstr "FSFS-formatet (%d) hos källan till en kopia under drift motsvarar inte FSFS-formatet (%d) hos målet; var god uppgradera bägge arkiven till samma format"
-#: ../libsvn_fs_fs/fs_fs.c:10916
+#: ../libsvn_fs_fs/fs_fs.c:11047
msgid "The UUID of the hotcopy source does not match the UUID of the hotcopy destination"
msgstr "UUID:n för källan till en kopia under drift motsvarar inte UUID:n för målet"
-#: ../libsvn_fs_fs/fs_fs.c:10923
+#: ../libsvn_fs_fs/fs_fs.c:11054
msgid "The sharding layout configuration of the hotcopy source does not match the sharding layout configuration of the hotcopy destination"
msgstr "Splittringsarrangemanget för källan till en kopia under drift motsvarar inte målets splittringsarrangemang"
-#: ../libsvn_fs_fs/fs_fs.c:11028
+#: ../libsvn_fs_fs/fs_fs.c:11180
#, c-format
msgid "Failed to create hotcopy at '%s'. The file '%s' is missing from the source repository. Please create this file, for instance by running 'svnadmin upgrade %s'"
msgstr "Misslyckades att skapa kopia under drift vid \"%s\". Filen \"%s\" saknades från källarkivet. Skapa denna fil, till exempel genom att köra \"svnadmin upgrade %s\""
-#: ../libsvn_fs_fs/fs_fs.c:11054
+#: ../libsvn_fs_fs/fs_fs.c:11206
#, c-format
msgid "The hotcopy destination already contains more revisions (%lu) than the hotcopy source contains (%lu); are source and destination swapped?"
msgstr "Målet för en kopia under drift innehåller redan fler revisioner (%lu) än källan gör (%lu); har källa och mål bytt plats?"
-#: ../libsvn_fs_fs/fs_fs.c:11090
+#: ../libsvn_fs_fs/fs_fs.c:11242
#, c-format
msgid "The hotcopy destination already contains more packed revisions (%lu) than the hotcopy source contains (%lu)"
msgstr "Målet för en kopia under drift innehåller redan fler packade revisioner (%lu) än källan gör (%lu)"
-#: ../libsvn_fs_fs/fs_fs.c:11203
+#: ../libsvn_fs_fs/fs_fs.c:11355
#, c-format
msgid "The assumed HEAD revision (%lu) of the hotcopy source has been packed while the hotcopy was in progress; please restart the hotcopy operation"
msgstr "Den förmodade huvudrevisionen (%lu) för källan till en kopia under drift packades medan kopieringen skedde; var god starta om kopieringen"
-#: ../libsvn_fs_fs/fs_fs.c:11218
+#: ../libsvn_fs_fs/fs_fs.c:11370
#, c-format
msgid "Revision %lu disappeared from the hotcopy source while hotcopy was in progress"
msgstr "Revision %lu försvann från källan till en kopiering under drift medan kopieringen skedde"
@@ -3940,25 +3960,24 @@
#: ../libsvn_fs_fs/rep-cache.c:323
#, c-format
msgid "Representation key for checksum '%%s' exists in filesystem '%%s' with a different value (%%ld,%%%s,%%%s,%%%s) than what we were about to store (%%ld,%%%s,%%%s,%%%s)"
-msgstr "En representationsnyckel för kontrollsumman \"%%s\" finns i filsystemet \"%%s\" med ett värde (%%ld,%%%s,%%%s,%%%s) som skiljer sig från det som som skulle lagras (%%ld,%%%s,%%%s,%%%s)"
+msgstr "En representationsnyckel för kontrollsumman \"%%s\" finns i filsystemet \"%%s\" med ett värde (%%ld,%%%s,%%%s,%%%s) som skiljer sig från det som skulle lagras (%%ld,%%%s,%%%s,%%%s)"
-#: ../libsvn_fs_fs/tree.c:2237 ../libsvn_repos/commit.c:328
-#: ../libsvn_subr/path.c:1233
+#: ../libsvn_fs_fs/tree.c:2209 ../libsvn_subr/path.c:1233
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Ogiltigt kontrolltecken \"0x%02x\" i sökvägen \"%s\""
-#: ../libsvn_fs_fs/tree.c:3828
+#: ../libsvn_fs_fs/tree.c:3808
#, c-format
msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
msgstr "Nodrevision nr \"%s\" påstår sig ha sammanslagningsinformation men det har den inte"
-#: ../libsvn_fs_fs/tree.c:3944
+#: ../libsvn_fs_fs/tree.c:3924
#, c-format
msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't"
msgstr "Nodrevision \"%s@%ld\" påstår sig ha sammanslagningsinformation men det har den inte"
-#: ../libsvn_fs_fs/tree.c:4144
+#: ../libsvn_fs_fs/tree.c:4124
#, c-format
msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; filesystem '%s' uses only version %d"
msgstr "För att begära sammanslagningsinformation krävs version %d av FSFS-filsystemsschemat; filsystemet \"%s\" har bara version %d"
@@ -3986,18 +4005,18 @@
msgid "'%s' in revision %ld is an unrelated object"
msgstr "\"%s\" i revision %ld är ett orelaterat objekt"
-#: ../libsvn_ra/compat.c:843 ../libsvn_ra/ra_loader.c:1284
+#: ../libsvn_ra/compat.c:843 ../libsvn_ra/ra_loader.c:1291
#, c-format
msgid "Invalid peg revision %ld"
msgstr "Ogiltig fixerad revision %ld"
-#: ../libsvn_ra/compat.c:846 ../libsvn_ra/ra_loader.c:1287
+#: ../libsvn_ra/compat.c:846 ../libsvn_ra/ra_loader.c:1294
#: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329
#, c-format
msgid "Invalid end revision %ld"
msgstr "Ogiltig slutrevision %ld"
-#: ../libsvn_ra/compat.c:849 ../libsvn_ra/ra_loader.c:1290
+#: ../libsvn_ra/compat.c:849 ../libsvn_ra/ra_loader.c:1297
msgid "Peg revision must precede end revision"
msgstr "Fixerad revision måste komma före slutrevisionen"
@@ -4006,7 +4025,7 @@
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "Versioner stämmer ej i insticksmodulen \"%s\" för RA: hittade %d.%d.%d%s, väntade %d.%d.%d%s"
-#: ../libsvn_ra/ra_loader.c:292 ../libsvn_ra_serf/serf.c:518
+#: ../libsvn_ra/ra_loader.c:292 ../libsvn_ra_serf/serf.c:594
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "Ogiltig arkiv-URL \"%s\""
@@ -4036,7 +4055,7 @@
msgid "'%s' isn't a child of session URL '%s'"
msgstr "\"%s\" är inget barn i sessions-URL:en \"%s\""
-#: ../libsvn_ra/ra_loader.c:580 ../libsvn_ra_svn/client.c:2398
+#: ../libsvn_ra/ra_loader.c:580 ../libsvn_ra_svn/client.c:2465
#, c-format
msgid "'%s' isn't a child of repository root URL '%s'"
msgstr "\"%s\" är inget barn i arkivrots-URL:en \"%s\""
@@ -4046,73 +4065,82 @@
msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client"
msgstr "Angivelse av \"old_value_p\" tillåts inte när inte förmågan \"%s\" har annonserats, och kan tyda på ett fel i klienten"
-#: ../libsvn_ra/ra_loader.c:1438
+#: ../libsvn_ra/ra_loader.c:1445
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - hanterar schemat \"%s\"\n"
-#: ../libsvn_ra/ra_loader.c:1531
+#: ../libsvn_ra/ra_loader.c:1538
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Okänt URL-schema \"%s\""
-#: ../libsvn_ra/util.c:64
+#: ../libsvn_ra/util.c:55
+msgid "<repository>"
+msgstr "<arkiv>"
+
+#: ../libsvn_ra/util.c:73
#, c-format
msgid "Retrieval of mergeinfo unsupported by '%s'"
msgstr "Hämtning av sammanslagningsinformation stöds inte av \"%s\""
-#: ../libsvn_ra/util.c:104
+#: ../libsvn_ra/util.c:99
#, c-format
+msgid "The '%s' feature is not supported by '%s'"
+msgstr "Funktionen \"%s\" stöds inte av \"%s\""
+
+#: ../libsvn_ra/util.c:142
+#, c-format
msgid "Lock was stolen by '%s'; unable to remove it"
msgstr "Lås stals av \"%s\"; kunde inte tas bort"
-#: ../libsvn_ra/util.c:145
+#: ../libsvn_ra/util.c:183
#, c-format
msgid "Unable to determine local hostname"
msgstr "Det gick inte att ta reda på det lokala värdnamnet"
-#: ../libsvn_ra/util.c:240
+#: ../libsvn_ra/util.c:278
#, c-format
msgid "Couldn't get lock on destination repos after %d attempts"
msgstr "Kunde inte låsa destinationsarkivet efter %d försök"
-#: ../libsvn_ra_local/ra_plugin.c:161
+#: ../libsvn_ra_local/ra_plugin.c:162
msgid "memory-cache-size invalid"
msgstr "Ogiltig \"memory-cache-size\""
#. ----------------------------------------------------------------
#. ** The RA vtable routines **
-#: ../libsvn_ra_local/ra_plugin.c:502
+#: ../libsvn_ra_local/ra_plugin.c:503
msgid "Module for accessing a repository on local disk."
msgstr "Modul för åtkomst av arkiv på disk lokalt."
-#: ../libsvn_ra_local/ra_plugin.c:578
+#: ../libsvn_ra_local/ra_plugin.c:579
msgid "Unable to open an ra_local session to URL"
msgstr "Kunde inte öppna en ra_local-session till URL:en"
-#: ../libsvn_ra_local/ra_plugin.c:611 ../libsvn_ra_serf/serf.c:510
+#: ../libsvn_ra_local/ra_plugin.c:612 ../libsvn_ra_serf/serf.c:586
#, c-format
msgid "URL '%s' is not a child of the session's repository root URL '%s'"
msgstr "URL:en \"%s\" är inte ett barn av sessionens arkivrots-URL \"%s\""
-#: ../libsvn_ra_local/ra_plugin.c:1139 ../libsvn_ra_local/ra_plugin.c:1596
-#: ../libsvn_ra_serf/util.c:2414
+#: ../libsvn_ra_local/ra_plugin.c:1140 ../libsvn_ra_local/ra_plugin.c:1597
+#: ../libsvn_ra_serf/util.c:2476
#, c-format
msgid "'%s' path not found"
msgstr "Sökvägen \"%s\" finns inte"
-#: ../libsvn_ra_local/ra_plugin.c:1538 ../libsvn_ra_serf/options.c:613
-#: ../libsvn_ra_svn/client.c:2599
+#: ../libsvn_ra_local/ra_plugin.c:1539 ../libsvn_ra_serf/options.c:675
+#: ../libsvn_ra_svn/client.c:2666
#, c-format
msgid "Don't know anything about capability '%s'"
msgstr "Okänd förmåga \"%s\""
-#: ../libsvn_ra_local/ra_plugin.c:1744
+#: ../libsvn_ra_local/ra_plugin.c:1745
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Versionen för RA-laddaren (%d) stöds ej för ra_local"
-#: ../libsvn_ra_local/split_url.c:47 ../libsvn_ra_local/split_url.c:53
+#: ../libsvn_ra_local/split_url.c:49 ../libsvn_ra_local/split_url.c:55
#, c-format
msgid "Unable to open repository '%s'"
msgstr "Kunde inte öppna arkivet \"%s\""
@@ -4130,71 +4158,76 @@
msgid "Error parsing Location header value"
msgstr "Syntaxfel i \"Location\"-huvudets värde"
-#: ../libsvn_ra_serf/commit.c:431
+#: ../libsvn_ra_serf/commit.c:439
#, c-format
msgid "Directory '%s' is out of date; try updating"
msgstr "Katalogen \"%s\" är inaktuell; försök att uppdatera"
-#: ../libsvn_ra_serf/commit.c:519 ../libsvn_repos/commit.c:584
+#: ../libsvn_ra_serf/commit.c:527 ../libsvn_repos/commit.c:512
#, c-format
msgid "Path '%s' not present"
msgstr "Sökvägen \"%s\" finns inte"
-#: ../libsvn_ra_serf/commit.c:569
+#: ../libsvn_ra_serf/commit.c:577
#, c-format
msgid "File '%s' is out of date; try updating"
msgstr "Filen \"%s\" är inaktuell; försök att uppdatera"
-#: ../libsvn_ra_serf/commit.c:961
+#: ../libsvn_ra_serf/commit.c:979
msgid "At least one property change failed; repository is unchanged"
msgstr "Åtminstone en egenskapsändring misslyckades; arkivet är oförändrat"
-#: ../libsvn_ra_serf/commit.c:1161
+#: ../libsvn_ra_serf/commit.c:1179
#, c-format
msgid "Failed writing updated file"
msgstr "MIsslyckades att skriva uppdaterad fil"
-#: ../libsvn_ra_serf/commit.c:1349 ../libsvn_ra_serf/commit.c:1439
+#: ../libsvn_ra_serf/commit.c:1367 ../libsvn_ra_serf/commit.c:1457
#, c-format
msgid "%s of '%s': %d %s (%s://%s)"
msgstr "%s av \"%s\": %d %s (%s://%s)"
-#: ../libsvn_ra_serf/commit.c:1359
+#: ../libsvn_ra_serf/commit.c:1377
#, c-format
msgid "POST request did not return transaction information"
msgstr "POST-begäran gav ingen transaktionsinformation"
-#: ../libsvn_ra_serf/commit.c:1403
+#: ../libsvn_ra_serf/commit.c:1421
msgid "The OPTIONS response did not include the requested activity-collection-set value"
msgstr "OPTIONS-svaret innehöll inte det efterfrågade värdet på \"activity-collection-set\""
-#: ../libsvn_ra_serf/commit.c:1668 ../libsvn_ra_serf/commit.c:2066
+#: ../libsvn_ra_serf/commit.c:1686 ../libsvn_ra_serf/commit.c:2084
#: ../libsvn_ra_serf/update.c:2631
#, c-format
msgid "Unable to parse URL '%s'"
msgstr "Syntaxfel i URL:en \"%s\""
-#: ../libsvn_ra_serf/commit.c:1696 ../libsvn_ra_serf/util.c:2410
+#: ../libsvn_ra_serf/commit.c:1714 ../libsvn_ra_serf/util.c:2472
#, c-format
msgid "Access to '%s' forbidden"
msgstr "Åtkomst till \"%s\" ej tillåten"
-#: ../libsvn_ra_serf/commit.c:1700
+#: ../libsvn_ra_serf/commit.c:1718
#, c-format
msgid "Adding directory failed: %s on %s (%d %s)"
msgstr "Lägga till katalog misslyckades: %s på %s (%d %s)"
-#: ../libsvn_ra_serf/commit.c:1918
+#: ../libsvn_ra_serf/commit.c:1936
#, c-format
msgid "File '%s' already exists"
msgstr "Filen \"%s\" finns redan"
-#: ../libsvn_ra_serf/commit.c:2189
+#: ../libsvn_ra_serf/commit.c:2207
#, c-format
msgid "MERGE request failed: returned %d (during commit)"
msgstr "MERGE-begäran misslyckades: returnerade %d (under arkivering)"
-#: ../libsvn_ra_serf/commit.c:2454
+#: ../libsvn_ra_serf/commit.c:2281
+#, c-format
+msgid "DELETE returned unexpected status: %d"
+msgstr "DELETE gav oväntad felkod: %d"
+
+#: ../libsvn_ra_serf/commit.c:2474
msgid "DAV request failed; it's possible that the repository's pre-revprop-change hook either failed or is non-existent"
msgstr "DAV-förfrågan misslyckades; arkivets krokskript före ändring av revisionsegenskap (\"pre-revprop-change\") kan ha misslyckats eller saknats"
@@ -4231,7 +4264,7 @@
msgid "Unsupported encoding '%s'"
msgstr "Kodningen \"%s\" stöds ej"
-#: ../libsvn_ra_serf/log.c:568 ../libsvn_ra_svn/client.c:1551
+#: ../libsvn_ra_serf/log.c:568 ../libsvn_ra_svn/client.c:1577
msgid "Server does not support custom revprops via log"
msgstr "Servern stöder ej anpassade revisionsegenskaper via loggning"
@@ -4240,12 +4273,12 @@
msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
msgstr "Ett MERGE-svar för \"%s\" är inte barn till destinationen (\"%s\")"
-#: ../libsvn_ra_serf/options.c:596
+#: ../libsvn_ra_serf/options.c:658
#, c-format
msgid "Don't know how to handle '%s' for capability '%s'"
msgstr "Kan inte hantera \"%s\" för förmåga \"%s\""
-#: ../libsvn_ra_serf/options.c:620
+#: ../libsvn_ra_serf/options.c:682
#, c-format
msgid "Attempt to fetch capability '%s' resulted in '%s'"
msgstr "Ett försök att hämta förmåga \"%s\" resulterade i \"%s\""
@@ -4283,32 +4316,32 @@
msgid "The PROPFIND response did not include the requested 'DAV:' properties"
msgstr "PROPFIND-svaret innehöll inte de efterfrågade \"DAV:\"-egenskaperna"
-#: ../libsvn_ra_serf/replay.c:223 ../libsvn_ra_serf/update.c:1660
+#: ../libsvn_ra_serf/replay.c:222 ../libsvn_ra_serf/update.c:1660
msgid "Missing revision attr in target-revision element"
msgstr "Attributet \"revision\" saknas på target-revision-elementet"
-#: ../libsvn_ra_serf/replay.c:241
+#: ../libsvn_ra_serf/replay.c:240
msgid "Missing revision attr in open-root element"
msgstr "Attributet \"revision\" saknas på open-root-elementet"
-#: ../libsvn_ra_serf/replay.c:261 ../libsvn_ra_serf/update.c:1888
+#: ../libsvn_ra_serf/replay.c:260 ../libsvn_ra_serf/update.c:1888
msgid "Missing name attr in delete-entry element"
msgstr "Attributet name saknas på delete-entry-elementet"
-#: ../libsvn_ra_serf/replay.c:267
+#: ../libsvn_ra_serf/replay.c:266
msgid "Missing revision attr in delete-entry element"
msgstr "Attributet revision saknas på delete-entry-elementet"
-#: ../libsvn_ra_serf/replay.c:287 ../libsvn_ra_serf/update.c:1727
+#: ../libsvn_ra_serf/replay.c:286 ../libsvn_ra_serf/update.c:1727
msgid "Missing name attr in open-directory element"
msgstr "Attributet name saknas på open-directory-elementet"
-#: ../libsvn_ra_serf/replay.c:293 ../libsvn_ra_serf/update.c:1678
+#: ../libsvn_ra_serf/replay.c:292 ../libsvn_ra_serf/update.c:1678
#: ../libsvn_ra_serf/update.c:1718
msgid "Missing revision attr in open-directory element"
msgstr "Attributet revision saknas på open-directory-elementet"
-#: ../libsvn_ra_serf/replay.c:313 ../libsvn_ra_serf/update.c:1765
+#: ../libsvn_ra_serf/replay.c:312 ../libsvn_ra_serf/update.c:1765
msgid "Missing name attr in add-directory element"
msgstr "Attributet name saknas på add-directory-elementet"
@@ -4320,17 +4353,17 @@
msgid "Missing revision attr in open-file element"
msgstr "Attributet revision saknas på open-file-elementet"
-#: ../libsvn_ra_serf/replay.c:376 ../libsvn_ra_serf/update.c:1843
+#: ../libsvn_ra_serf/replay.c:375 ../libsvn_ra_serf/update.c:1843
msgid "Missing name attr in add-file element"
msgstr "Attributet name saknas på add-file-elementet"
-#: ../libsvn_ra_serf/replay.c:442 ../libsvn_ra_serf/update.c:1984
+#: ../libsvn_ra_serf/replay.c:443 ../libsvn_ra_serf/update.c:1984
#: ../libsvn_ra_serf/update.c:2071
#, c-format
msgid "Missing name attr in %s element"
msgstr "Attributet name saknas på %s-elementet"
-#: ../libsvn_ra_serf/replay.c:579
+#: ../libsvn_ra_serf/replay.c:578
msgid "Error writing stream: unexpected EOF"
msgstr "Fel vid skrivning till ström: oväntat filslut"
@@ -4342,51 +4375,65 @@
msgid "Module for accessing a repository via WebDAV protocol using serf."
msgstr "Modul för åtkomst av arkiv via protokollet WebDAV med hjälp av serf."
-#: ../libsvn_ra_serf/serf.c:122
+#: ../libsvn_ra_serf/serf.c:65
#, c-format
-msgid "Invalid config: unknown http authtype '%s'"
-msgstr "Felaktig konfiguration: okänd http-authtype \"%s\""
+msgid ""
+"Module for accessing a repository via WebDAV protocol using serf.\n"
+" - using serf %d.%d.%d"
+msgstr ""
+"Modul för åtkomst av arkiv via protokollet WebDAV med hjälp av serf.\n"
+" - använder serf %d.%d.%d"
-#: ../libsvn_ra_serf/serf.c:302
+#: ../libsvn_ra_serf/serf.c:129
+#, c-format
+msgid "Invalid config: unknown %s '%s'"
+msgstr "Felaktig konfiguration: okänd %s \"%s\""
+
+#: ../libsvn_ra_serf/serf.c:327
msgid "Invalid config: illegal character in timeout value"
msgstr "Felaktig konfiguration: otillåtet tecken i timeout-värde"
-#: ../libsvn_ra_serf/serf.c:306
+#: ../libsvn_ra_serf/serf.c:331
msgid "Invalid config: negative timeout value"
msgstr "Felaktig konfiguration: negativt timeout-värde"
-#: ../libsvn_ra_serf/serf.c:319
+#: ../libsvn_ra_serf/serf.c:344
msgid "Invalid URL: illegal character in proxy port number"
msgstr "Felaktig URL: ogiltigt tecken i proxy-portnummer"
-#: ../libsvn_ra_serf/serf.c:323
+#: ../libsvn_ra_serf/serf.c:348
msgid "Invalid URL: negative proxy port number"
msgstr "Felaktig URL: negativt proxy-portnummer"
-#: ../libsvn_ra_serf/serf.c:326
+#: ../libsvn_ra_serf/serf.c:351
msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535"
msgstr "Felaktig URL: portnummer för proxy större än det högsta TCP-portnumret 65535"
-#: ../libsvn_ra_serf/serf.c:346
+#: ../libsvn_ra_serf/serf.c:371
#, c-format
msgid "Could not resolve proxy server '%s'"
msgstr "Kunde inte slå upp proxy-servern \"%s\""
-#: ../libsvn_ra_serf/serf.c:418
+#: ../libsvn_ra_serf/serf.c:474
#, c-format
msgid "Illegal URL '%s'"
msgstr "Otillåten URL \"%s\""
-#: ../libsvn_ra_serf/serf.c:1140
+#: ../libsvn_ra_serf/serf.c:546
+#, c-format
+msgid "Connection to '%s' failed"
+msgstr "Anslutning till \"%s\" misslyckades"
+
+#: ../libsvn_ra_serf/serf.c:1216
msgid "The UUID property was not found on the resource or any of its parents"
msgstr "UUID-egenskapen hittades inte på resursen eller någon av dess föräldrar"
-#: ../libsvn_ra_serf/serf.c:1214
+#: ../libsvn_ra_serf/serf.c:1290
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Versionen för RA-laddaren (%d) stöds ej för ra_serf"
-#: ../libsvn_ra_serf/serf.c:1228
+#: ../libsvn_ra_serf/serf.c:1304
#, c-format
msgid "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d library"
msgstr "ra_serf är kompilerad för serf %d.%d.%d men läste in ett inkompatibelt bibliotek med version %d.%d.%d"
@@ -4436,31 +4483,63 @@
msgid "Can't get text contents of a directory"
msgstr "Kan inte läsa en katalogs textinnehåll"
-#: ../libsvn_ra_serf/util.c:347
+#: ../libsvn_ra_serf/util.c:248
+msgid ": "
+msgstr ": "
+
+#: ../libsvn_ra_serf/util.c:250
+msgid ", "
+msgstr ", "
+
+#: ../libsvn_ra_serf/util.c:362
+msgid "Server SSL certificate verification failed"
+msgstr "Kontroll av SSL-certifikat för server misslyckades"
+
+#: ../libsvn_ra_serf/util.c:367
+msgid "certificate is not yet valid"
+msgstr "certifikatet är inte giltigt ännu"
+
+#: ../libsvn_ra_serf/util.c:370
+msgid "certificate has expired"
+msgstr "certifikatet har gått ut"
+
+#: ../libsvn_ra_serf/util.c:374
+msgid "certificate issued for a different hostname"
+msgstr "certifikatet utfärdat för ett annat datornamn"
+
+#: ../libsvn_ra_serf/util.c:378
+msgid "issuer is not trusted"
+msgstr "utfärdaren är inte betrodd"
+
+#: ../libsvn_ra_serf/util.c:381
+msgid "and other reason(s)"
+msgstr "och andra orsaker"
+
+#: ../libsvn_ra_serf/util.c:428
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "Felaktig konfiguration: kan inte ladda certifikatfilen \"%s\""
-#: ../libsvn_ra_serf/util.c:783 ../libsvn_ra_serf/util.c:786
+#: ../libsvn_ra_serf/util.c:860 ../libsvn_ra_serf/util.c:863
msgid "Error running context"
msgstr "Fel vid körning av kontext"
-#: ../libsvn_ra_serf/util.c:1103 ../libsvn_ra_serf/util.c:1108
+#: ../libsvn_ra_serf/util.c:1197 ../libsvn_ra_serf/util.c:1202
#, c-format
msgid "Malformed DAV:status CDATA '%s'"
msgstr "Felaktig \"CDATA\" för \"DAV:status\": \"%s\""
-#: ../libsvn_ra_serf/util.c:1400
+#: ../libsvn_ra_serf/util.c:1494
#, c-format
msgid "XML parsing failed"
msgstr "XML-tolkning misslyckades"
-#: ../libsvn_ra_serf/util.c:1403
+#: ../libsvn_ra_serf/util.c:1497
#, c-format
msgid "XML parsing failed: (%d %s)"
msgstr "XML-tolkning misslyckades: (%d %s)"
-#: ../libsvn_ra_serf/util.c:1778
+#: ../libsvn_ra_serf/util.c:1826
msgid ""
"No more credentials or we tried too many times.\n"
"Authentication failed"
@@ -4468,115 +4547,140 @@
"Inga fler klientreferenser eller så försökte vi för många gånger.\n"
"Autentisering misslyckades"
-#: ../libsvn_ra_serf/util.c:1800
+#: ../libsvn_ra_serf/util.c:1848
msgid "Proxy authentication failed"
msgstr "Proxy-autentisering misslyckades"
-#: ../libsvn_ra_serf/util.c:1911
+#: ../libsvn_ra_serf/util.c:1901
#, c-format
+msgid "%s request on '%s' failed"
+msgstr "%s-förfrågan på \"%s\" misslyckades"
+
+#: ../libsvn_ra_serf/util.c:1973
+#, c-format
msgid "Premature EOF seen from server (http status=%d)"
msgstr "För tidigt filslut från server (HTTP-felkod %d)"
-#: ../libsvn_ra_serf/util.c:1980
+#: ../libsvn_ra_serf/util.c:2042
#, c-format
msgid "%s request on '%s' failed: %d %s"
msgstr "%s-förfrågan på \"%s\" misslyckades: %d %s"
-#: ../libsvn_ra_serf/util.c:2302
+#: ../libsvn_ra_serf/util.c:2364
msgid "The PROPFIND response did not include the requested version-controlled-configuration value"
msgstr "PROPFIND-svaret innehöll inte det efterfrågade värdet på \"version-controlled-configuration\""
-#: ../libsvn_ra_serf/util.c:2404
+#: ../libsvn_ra_serf/util.c:2466
#, c-format
msgid "Repository moved permanently to '%s'; please relocate"
msgstr "Arkivet har flyttats permanent till \"%s\"; vänligen omlokalisera"
-#: ../libsvn_ra_serf/util.c:2406
+#: ../libsvn_ra_serf/util.c:2468
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
msgstr "Arkivet har flyttats temporärt till \"%s\"; vänligen omlokalisera"
-#: ../libsvn_ra_serf/util.c:2417
+#: ../libsvn_ra_serf/util.c:2479
#, c-format
msgid "'%s': no lock token available"
msgstr "\"%s\": ingen låsidentifierare tillgänglig"
-#: ../libsvn_ra_serf/util.c:2561
+#: ../libsvn_ra_serf/util.c:2483
#, c-format
+msgid "DAV request failed: 411 Content length required. The server or an intermediate proxy does not accept chunked encoding. Try setting 'http-chunked-requests' to 'auto' or 'no' in your client configuration."
+msgstr "DAV-begäran misslyckades: 411, innehållslängd krävs. Servern eller en mellanliggande proxy godtar inte styckvis kodning. Försök med att sätta \"http-chunked-requests\" till \"auto\" eller \"no\" i klientinställningarna."
+
+#: ../libsvn_ra_serf/util.c:2489
+#, c-format
+msgid "The requested feature is not supported by '%s'"
+msgstr "Den begärda funktionen stöds inte av \"%s\""
+
+#: ../libsvn_ra_serf/util.c:2495
+#, c-format
+msgid "Unexpected HTTP status %d '%s' on '%s'\n"
+msgstr "Oväntat HTTP-fel %d \"%s\" för \"%s\"\n"
+
+#: ../libsvn_ra_serf/util.c:2639
+#, c-format
msgid "The %s response contains invalid XML (%d %s)"
msgstr "Svaret på %s innehåller ogiltig XML (%d %s)"
-#: ../libsvn_ra_serf/xml.c:674
+#: ../libsvn_ra_serf/xml.c:622
#, c-format
+msgid "XML Parsing failed: Unexpected root element '%s'"
+msgstr "XML-tolkning misslyckades: Oväntat rotelement \"%s\""
+
+#: ../libsvn_ra_serf/xml.c:682
+#, c-format
msgid "Missing XML attribute: '%s'"
msgstr "XML-attribut saknas: \"%s\""
-#: ../libsvn_ra_serf/xml.c:749
+#: ../libsvn_ra_serf/xml.c:757
msgid "The response contains invalid XML"
msgstr "Svaret innehåller ogiltig XML"
-#: ../libsvn_ra_svn/client.c:141
+#: ../libsvn_ra_svn/client.c:142
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Okänt värdnamn \"%s\""
-#: ../libsvn_ra_svn/client.c:166
+#: ../libsvn_ra_svn/client.c:167
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Kan inte ansluta till värden \"%s\""
-#: ../libsvn_ra_svn/client.c:204
+#: ../libsvn_ra_svn/client.c:205
msgid "Prop diffs element not a list"
msgstr "Element med egenskapsskillnader är ingen lista"
-#: ../libsvn_ra_svn/client.c:402
+#: ../libsvn_ra_svn/client.c:403
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Odefinierat tunnelschema \"%s\""
-#: ../libsvn_ra_svn/client.c:419
+#: ../libsvn_ra_svn/client.c:420
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Tunnelschemat %s kräver att miljövariabeln %s är definierad"
-#: ../libsvn_ra_svn/client.c:430
+#: ../libsvn_ra_svn/client.c:431
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Kan inte dela upp kommandosträngen \"%s\""
-#: ../libsvn_ra_svn/client.c:463
+#: ../libsvn_ra_svn/client.c:464
#, c-format
msgid "Error in child process: %s"
msgstr "Fel i barnprocess: %s"
-#: ../libsvn_ra_svn/client.c:538
+#: ../libsvn_ra_svn/client.c:539
msgid "To better debug SSH connection problems, remove the -q option from 'ssh' in the [tunnels] section of your Subversion configuration file."
msgstr "För att kunna felsöka problem med SSH-anslutningar bättre, ta bort väljaren -q från \"ssh\" i sektionen \"[tunnels] \" i konfigurationsfilen för Subversion."
-#: ../libsvn_ra_svn/client.c:556
+#: ../libsvn_ra_svn/client.c:557
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Ogiltig svn-arkiv-URL \"%s\""
-#: ../libsvn_ra_svn/client.c:636
+#: ../libsvn_ra_svn/client.c:637
#, c-format
msgid "Server requires minimum version %d"
msgstr "Servern kräver minst version %d"
-#: ../libsvn_ra_svn/client.c:640
+#: ../libsvn_ra_svn/client.c:641
#, c-format
msgid "Server only supports versions up to %d"
msgstr "Servern stöder bara versioner till och med %d"
-#: ../libsvn_ra_svn/client.c:648
+#: ../libsvn_ra_svn/client.c:649
msgid "Server does not support edit pipelining"
msgstr "Servern stöder ej \"edit pipelining\""
-#: ../libsvn_ra_svn/client.c:685
+#: ../libsvn_ra_svn/client.c:686
msgid "Impossibly long repository root from server"
msgstr "För lång arkivrot från servern"
-#: ../libsvn_ra_svn/client.c:697
+#: ../libsvn_ra_svn/client.c:698
msgid ""
"Module for accessing a repository using the svn network protocol.\n"
" - with Cyrus SASL authentication"
@@ -4584,144 +4688,149 @@
"Modul för åtkomst av ett arkiv över nätverk via protokollet svn.\n"
" - med Cyrus-SASL-autentisering"
-#: ../libsvn_ra_svn/client.c:701
+#: ../libsvn_ra_svn/client.c:702
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Modul för åtkomst av ett arkiv över nätverk via protokollet svn."
-#: ../libsvn_ra_svn/client.c:911
+#: ../libsvn_ra_svn/client.c:912
msgid "Server did not send repository root"
msgstr "Servern skickade ingen arkivrot"
#: ../libsvn_ra_svn/client.c:985
+#, c-format
+msgid "ra_svn does not support not specifying a log message with pre-1.5 servers; consider passing an empty one, or upgrading the server"
+msgstr "ra_svn stöder inte att ett loggmeddelande anges med en server äldre än 1.5; använd ett tomt loggmeddelande eller uppgradera servern"
+
+#: ../libsvn_ra_svn/client.c:1008
msgid "Server doesn't support setting arbitrary revision properties during commit"
msgstr "Servern stöder inte att godtyckliga revisionsegenskaper sätts under arkivering"
-#: ../libsvn_ra_svn/client.c:1088
+#: ../libsvn_ra_svn/client.c:1111
msgid "Inherited proplist element not a list"
msgstr "Element i ärvda egenskaper är ingen lista"
-#: ../libsvn_ra_svn/client.c:1163
+#: ../libsvn_ra_svn/client.c:1186
msgid "Non-string as part of file contents"
msgstr "Icke-sträng var del av filinnehåll"
-#: ../libsvn_ra_svn/client.c:1249
+#: ../libsvn_ra_svn/client.c:1272
msgid "Dirlist element not a list"
msgstr "Element med kataloglista är ingen lista"
-#: ../libsvn_ra_svn/client.c:1334
+#: ../libsvn_ra_svn/client.c:1357
msgid "Mergeinfo element is not a list"
msgstr "Element för sammanslagningsinformation är ej en lista"
-#: ../libsvn_ra_svn/client.c:1539
+#: ../libsvn_ra_svn/client.c:1565
msgid "Log entry not a list"
msgstr "Loggposten är ej en lista"
-#: ../libsvn_ra_svn/client.c:1586
+#: ../libsvn_ra_svn/client.c:1612
msgid "Changed-path entry not a list"
msgstr "Post med ändrade sökvägar är ingen lista"
-#: ../libsvn_ra_svn/client.c:1711
+#: ../libsvn_ra_svn/client.c:1778
msgid "'stat' not implemented"
msgstr "\"stat\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:1770
+#: ../libsvn_ra_svn/client.c:1837
msgid "'get-locations' not implemented"
msgstr "\"get-locations\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:1785
+#: ../libsvn_ra_svn/client.c:1852
msgid "Location entry not a list"
msgstr "Post med information om plats är ingen lista"
-#: ../libsvn_ra_svn/client.c:1824
+#: ../libsvn_ra_svn/client.c:1891
msgid "'get-location-segments' not implemented"
msgstr "\"get-location-segments\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:1841
+#: ../libsvn_ra_svn/client.c:1908
msgid "Location segment entry not a list"
msgstr "Post med information om segmentplats är ingen lista"
-#: ../libsvn_ra_svn/client.c:1851
+#: ../libsvn_ra_svn/client.c:1918
msgid "Expected valid revision range"
msgstr "Väntade ett giltigt revisionsnummerintervall"
-#: ../libsvn_ra_svn/client.c:1892
+#: ../libsvn_ra_svn/client.c:1959
msgid "'get-file-revs' not implemented"
msgstr "\"get-file-revs\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:1916
+#: ../libsvn_ra_svn/client.c:1983
msgid "Revision entry not a list"
msgstr "Revisionsposten är ej en lista"
-#: ../libsvn_ra_svn/client.c:1933 ../libsvn_ra_svn/client.c:1963
+#: ../libsvn_ra_svn/client.c:2000 ../libsvn_ra_svn/client.c:2030
msgid "Text delta chunk not a string"
msgstr "Textdeltadel är inte en sträng"
-#: ../libsvn_ra_svn/client.c:1975
+#: ../libsvn_ra_svn/client.c:2042
msgid "The get-file-revs command didn't return any revisions"
msgstr "get-file-revs-kommandot returnerade inga revisioner"
-#: ../libsvn_ra_svn/client.c:2022
+#: ../libsvn_ra_svn/client.c:2089
msgid "Server doesn't support the lock command"
msgstr "Servern stöder ej lock-kommandot"
-#: ../libsvn_ra_svn/client.c:2086
+#: ../libsvn_ra_svn/client.c:2153
msgid "Server doesn't support the unlock command"
msgstr "Servern stöder ej unlock-kommandot"
-#: ../libsvn_ra_svn/client.c:2184
+#: ../libsvn_ra_svn/client.c:2251
msgid "Lock response not a list"
msgstr "Svar på lock-kommandot är ingen lista"
-#: ../libsvn_ra_svn/client.c:2198
+#: ../libsvn_ra_svn/client.c:2265
msgid "Unknown status for lock command"
msgstr "Okänd statusindikering för lock-kommandot"
-#: ../libsvn_ra_svn/client.c:2222
+#: ../libsvn_ra_svn/client.c:2289
msgid "Didn't receive end marker for lock responses"
msgstr "Erhöll ingen slutmarkör i svaret på lock-kommandot"
-#: ../libsvn_ra_svn/client.c:2312
+#: ../libsvn_ra_svn/client.c:2379
msgid "Unlock response not a list"
msgstr "Svar på unlock-kommandot är ingen lista"
-#: ../libsvn_ra_svn/client.c:2326
+#: ../libsvn_ra_svn/client.c:2393
msgid "Unknown status for unlock command"
msgstr "Okänd statusindikation för unlock-kommandot"
-#: ../libsvn_ra_svn/client.c:2349
+#: ../libsvn_ra_svn/client.c:2416
msgid "Didn't receive end marker for unlock responses"
msgstr "Erhöll ingen slutmarkör i svaret på unlock-kommandot"
-#: ../libsvn_ra_svn/client.c:2373 ../libsvn_ra_svn/client.c:2425
+#: ../libsvn_ra_svn/client.c:2440 ../libsvn_ra_svn/client.c:2492
msgid "Server doesn't support the get-lock command"
msgstr "Servern stöder ej get-lock-kommandot"
-#: ../libsvn_ra_svn/client.c:2439
+#: ../libsvn_ra_svn/client.c:2506
msgid "Lock element not a list"
msgstr "Element med lås är ingen lista"
-#: ../libsvn_ra_svn/client.c:2482
+#: ../libsvn_ra_svn/client.c:2549
msgid "Server doesn't support the replay command"
msgstr "Servern stöder ej replay-kommandot"
-#: ../libsvn_ra_svn/client.c:2513
+#: ../libsvn_ra_svn/client.c:2580
msgid "Server doesn't support the replay-range command"
msgstr "Servern stöder ej replay-range-kommandot"
-#: ../libsvn_ra_svn/client.c:2531
+#: ../libsvn_ra_svn/client.c:2598
#, c-format
msgid "Expected 'revprops', found '%s'"
msgstr "Väntade \"revprops\", hittade \"%s\""
-#: ../libsvn_ra_svn/client.c:2548
+#: ../libsvn_ra_svn/client.c:2615
msgid "Error while replaying commit"
msgstr "Fel vid uppspelning av arkivering"
-#: ../libsvn_ra_svn/client.c:2621
+#: ../libsvn_ra_svn/client.c:2688
msgid "'get-deleted-rev' not implemented"
msgstr "\"get-deleted-rev\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:2720
+#: ../libsvn_ra_svn/client.c:2787
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Versionen för RA-laddaren (%d) stöds ej för ra_svn"
@@ -4844,17 +4953,17 @@
msgid "'%s' is out of date"
msgstr "\"%s\" är inaktuell"
-#: ../libsvn_repos/commit.c:363
+#: ../libsvn_repos/commit.c:291
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "Erhöll källsökväg men ingen källrevision för \"%s\""
-#: ../libsvn_repos/commit.c:396
+#: ../libsvn_repos/commit.c:324
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "Käll-URL:en \"%s\" är från ett annat arkiv"
-#: ../libsvn_repos/commit.c:712
+#: ../libsvn_repos/commit.c:640
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -4863,15 +4972,15 @@
"Kontrollsumma fel för resulterande fulltext\n"
"(\"%s\")"
-#: ../libsvn_repos/commit.c:757
+#: ../libsvn_repos/commit.c:685
msgid "(no error)"
msgstr "(inget fel)"
-#: ../libsvn_repos/commit.c:788 ../libsvn_repos/commit.c:794
+#: ../libsvn_repos/commit.c:716 ../libsvn_repos/commit.c:722
msgid "post-commit hook failed with no error message."
msgstr "Krokskriptet efter arkivering (\"post-commit\") misslyckades utan något felmeddelande."
-#: ../libsvn_repos/commit.c:797
+#: ../libsvn_repos/commit.c:725
#, c-format
msgid ""
"post commit FS processing had error:\n"
@@ -4882,11 +4991,11 @@
"%s\n"
"%s"
-#: ../libsvn_repos/commit.c:798 ../libsvn_repos/commit.c:807
+#: ../libsvn_repos/commit.c:726 ../libsvn_repos/commit.c:735
msgid "(no error message)"
msgstr "(inget felmeddelande)"
-#: ../libsvn_repos/commit.c:805
+#: ../libsvn_repos/commit.c:733
#, c-format
msgid ""
"post commit FS processing had error:\n"
@@ -4895,7 +5004,7 @@
"Filsystemsbearbetning efter arkiveringen (post-commit) slog fel:\n"
"%s"
-#: ../libsvn_repos/commit.c:1327 ../libsvn_repos/fs-wrap.c:98
+#: ../libsvn_repos/commit.c:1255 ../libsvn_repos/fs-wrap.c:98
#: ../libsvn_repos/load-fs-vtable.c:978
msgid "Commit succeeded, but post-commit hook failed"
msgstr "Arkiveringen lyckades, men krokskriptet efter arkivering (\"post-commit\") misslyckades"
@@ -4916,17 +5025,17 @@
msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry"
msgstr "Editeringen börjar på ett ogiltigt ställe; minst en av sökvägarna är ingen katalog och det fanns ingen källpost"
-#: ../libsvn_repos/deprecated.c:614 ../svnadmin/svnadmin.c:768
+#: ../libsvn_repos/deprecated.c:614 ../svnadmin/svnadmin.c:780
#, c-format
msgid "* Dumped revision %ld.\n"
msgstr "* Dumpade revision %ld.\n"
-#: ../libsvn_repos/deprecated.c:620 ../svnadmin/svnadmin.c:774
+#: ../libsvn_repos/deprecated.c:620 ../svnadmin/svnadmin.c:786
#, c-format
msgid "* Verified revision %ld.\n"
msgstr "* Verifierade revision %ld.\n"
-#: ../libsvn_repos/deprecated.c:628 ../svnadmin/svnadmin.c:822
+#: ../libsvn_repos/deprecated.c:628 ../svnadmin/svnadmin.c:834
#, c-format
msgid ""
"\n"
@@ -4937,7 +5046,7 @@
"------- Arkiverade revision %ld >>>\n"
"\n"
-#: ../libsvn_repos/deprecated.c:634 ../svnadmin/svnadmin.c:828
+#: ../libsvn_repos/deprecated.c:634 ../svnadmin/svnadmin.c:840
#, c-format
msgid ""
"\n"
@@ -4948,36 +5057,36 @@
"------- Arkiverade ny revision %ld (från originalrevisionen %ld) >>>\n"
"\n"
-#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:841
+#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:853
#, c-format
msgid " * editing path : %s ..."
msgstr " * editerar sökvägen: %s ..."
-#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:847
+#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:859
#, c-format
msgid " * deleting path : %s ..."
msgstr " * raderar sökvägen: %s ..."
-#: ../libsvn_repos/deprecated.c:659 ../svnadmin/svnadmin.c:853
+#: ../libsvn_repos/deprecated.c:659 ../svnadmin/svnadmin.c:865
#, c-format
msgid " * adding path : %s ..."
msgstr " * lägger till sökvägen: %s ..."
-#: ../libsvn_repos/deprecated.c:665 ../svnadmin/svnadmin.c:859
+#: ../libsvn_repos/deprecated.c:665 ../svnadmin/svnadmin.c:871
#, c-format
msgid " * replacing path : %s ..."
msgstr " * ersätter sökvägen: %s ..."
-#: ../libsvn_repos/deprecated.c:675 ../svnadmin/svnadmin.c:869
+#: ../libsvn_repos/deprecated.c:675 ../svnadmin/svnadmin.c:881
msgid " done.\n"
msgstr " klart.\n"
-#: ../libsvn_repos/deprecated.c:685 ../svnadmin/svnadmin.c:879
+#: ../libsvn_repos/deprecated.c:685 ../svnadmin/svnadmin.c:891
#, c-format
msgid "<<< Started new transaction, based on original revision %ld\n"
msgstr "<<< Startade ny transaktion, baserad på originalrevisionen %ld\n"
-#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:892
+#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:904
#, c-format
msgid " removing '\\r' from %s ..."
msgstr " tar bort \"\\r\" från %s ..."
@@ -5020,42 +5129,42 @@
msgid "Unexpected node kind %d for '%s'"
msgstr "Oväntad nodtyp %d för \"%s\""
-#: ../libsvn_repos/fs-wrap.c:179
+#: ../libsvn_repos/fs-wrap.c:183
#, c-format
msgid "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client"
msgstr "Lagring av egenskapen \"%s\" som ej är \"vanlig\" är inte tillåtet via arkivets gränssnitt och kan tyda på ett programfel i klienten"
-#: ../libsvn_repos/fs-wrap.c:194
+#: ../libsvn_repos/fs-wrap.c:198
#, c-format
msgid "Cannot accept '%s' property because it is not encoded in UTF-8"
msgstr "Egenskapen \"%s\" godtas ej eftersom den inte är kodad i UTF-8"
-#: ../libsvn_repos/fs-wrap.c:204
+#: ../libsvn_repos/fs-wrap.c:208
#, c-format
msgid "Cannot accept non-LF line endings in '%s' property"
msgstr "Kan inte godta andra radslut än radmatning (LF) i egenskapen \"%s\""
-#: ../libsvn_repos/fs-wrap.c:245
+#: ../libsvn_repos/fs-wrap.c:249
#, c-format
msgid "Commit rejected because mergeinfo on '%s' contains unexpected string terminator"
msgstr "Arkivering avslogs eftersom sammanslagningsinformationen på \"%s\" innehåller oväntat strängslutstecken"
-#: ../libsvn_repos/fs-wrap.c:252
+#: ../libsvn_repos/fs-wrap.c:256
#, c-format
msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid"
msgstr "Arkivering avslogs eftersom sammanslagningsinformationen på \"%s\" har fel syntax"
-#: ../libsvn_repos/fs-wrap.c:382
+#: ../libsvn_repos/fs-wrap.c:386
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "Skrivning nekad: ej behörig att läsa allt i revision %ld"
-#: ../libsvn_repos/fs-wrap.c:568
+#: ../libsvn_repos/fs-wrap.c:570
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr "Kan inte låsa upp sökvägen \"%s\", inget autentiserat användarnamn tillgängligt"
-#: ../libsvn_repos/fs-wrap.c:584
+#: ../libsvn_repos/fs-wrap.c:586
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr "Upplåsningen lyckades, men krokskriptet efter upplåsning (\"post-unlock\") misslyckades"
@@ -5209,7 +5318,7 @@
msgid "'%s' not found in filesystem"
msgstr "\"%s\" finns inte i filsystemet"
-#: ../libsvn_repos/replay.c:546 ../libsvn_repos/replay.c:1253
+#: ../libsvn_repos/replay.c:546 ../libsvn_repos/replay.c:1267
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "Sökvägen \"%s\" i filsystemet är varken en fil eller katalog"
@@ -5379,7 +5488,7 @@
msgid "'%s' is not a file in revision %ld"
msgstr "\"%s\" är inte en fil i revision %ld"
-#: ../libsvn_subr/auth.c:221
+#: ../libsvn_subr/auth.c:222
#, c-format
msgid "No provider registered for '%s' credentials"
msgstr "Ingen tillhandahållare registrerad för klientreferenser av typ \"%s\""
@@ -5399,13 +5508,6 @@
msgid "Can't unlock cache mutex"
msgstr "Kan inte låsa upp mutex"
-#. We are OOM. There is no need to proceed with "half a cache".
-#.
-#: ../libsvn_subr/cache-membuffer.c:1285
-#, c-format
-msgid "OOM"
-msgstr "Slut på minne"
-
#: ../libsvn_subr/cache-membuffer.c:1299
#, c-format
msgid "Can't create cache mutex"
@@ -5519,7 +5621,7 @@
msgstr "Kan inte skriva till \"%s\""
#: ../libsvn_subr/cmdline.c:1202 ../libsvn_subr/cmdline.c:1217
-#: ../libsvn_subr/cmdline.c:1251 ../libsvn_subr/io.c:3602
+#: ../libsvn_subr/cmdline.c:1251 ../libsvn_subr/io.c:3609
#, c-format
msgid "Can't stat '%s'"
msgstr "Kan inte ta status på \"%s\""
@@ -5657,7 +5759,7 @@
msgid "Can't expand time"
msgstr "Kan inte dela upp tid"
-#: ../libsvn_subr/deprecated.c:360 ../libsvn_subr/opt.c:302
+#: ../libsvn_subr/deprecated.c:361 ../libsvn_subr/opt.c:302
msgid ""
"\n"
"Valid options:\n"
@@ -5665,7 +5767,7 @@
"\n"
"Giltiga flaggor:\n"
-#: ../libsvn_subr/deprecated.c:436 ../libsvn_subr/opt.c:417
+#: ../libsvn_subr/deprecated.c:437 ../libsvn_subr/opt.c:417
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -5672,13 +5774,13 @@
"\n"
msgstr "\"%s\": okänt kommando.\n"
-#: ../libsvn_subr/deprecated.c:614 ../libsvn_subr/opt.c:1237
+#: ../libsvn_subr/deprecated.c:615 ../libsvn_subr/opt.c:1237
#: ../svnrdump/svnrdump.c:646
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Skriv \"%s help\" för användning.\n"
-#: ../libsvn_subr/deprecated.c:1022
+#: ../libsvn_subr/deprecated.c:1023
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "\"%s\" är varken ett fil- eller katalognamn"
@@ -5688,17 +5790,17 @@
msgid "Couldn't determine absolute path of '%s'"
msgstr "Kunde inte ta reda på absolut sökväg för \"%s\""
-#: ../libsvn_subr/dirent_uri.c:2311
+#: ../libsvn_subr/dirent_uri.c:2313
#, c-format
msgid "Local URL '%s' does not contain 'file://' prefix"
msgstr "Den lokala URL:en \"%s\" börjar inte med \"file://\""
-#: ../libsvn_subr/dirent_uri.c:2390
+#: ../libsvn_subr/dirent_uri.c:2392
#, c-format
msgid "Local URL '%s' contains only a hostname, no path"
msgstr "Den lokala URL:en \"%s\" innehåller endast ett värdnamn och ingen sökväg"
-#: ../libsvn_subr/dirent_uri.c:2404
+#: ../libsvn_subr/dirent_uri.c:2406
#, c-format
msgid "Local URL '%s' contains unsupported hostname"
msgstr "Den lokala URL:en \"%s\" innehåller värdnamn som inte stöds"
@@ -5750,12 +5852,12 @@
msgid "unknown error"
msgstr "okänt fel"
-#: ../libsvn_subr/gpg_agent.c:342 ../libsvn_subr/prompt.c:631
+#: ../libsvn_subr/gpg_agent.c:358 ../libsvn_subr/prompt.c:631
#, c-format
msgid "Password for '%s': "
msgstr "Lösenord för \"%s\": "
-#: ../libsvn_subr/gpg_agent.c:343
+#: ../libsvn_subr/gpg_agent.c:359
#, c-format
msgid "Enter your Subversion password for %s"
msgstr "Mata in ditt Subversion-lösenord för %s"
@@ -5780,7 +5882,7 @@
msgid "Can't check path '%s'"
msgstr "Kan inte kontrollera sökvägen \"%s\""
-#: ../libsvn_subr/io.c:537 ../libsvn_subr/io.c:4544
+#: ../libsvn_subr/io.c:537 ../libsvn_subr/io.c:4551
#, c-format
msgid "Can't open '%s'"
msgstr "Kan inte öppna \"%s\""
@@ -5820,7 +5922,7 @@
msgstr "Kan inte sätta rättigheter på \"%s\""
#: ../libsvn_subr/io.c:913 ../libsvn_subr/io.c:1977 ../libsvn_subr/io.c:2036
-#: ../libsvn_subr/io.c:4582
+#: ../libsvn_subr/io.c:4589
#, c-format
msgid "Can't get file name"
msgstr "Kan inte erhålla filnamn"
@@ -5875,12 +5977,12 @@
msgid "Can't unlock file '%s'"
msgstr "Kan inte låsa upp filen \"%s\""
-#: ../libsvn_subr/io.c:2096 ../libsvn_subr/io.c:3500
+#: ../libsvn_subr/io.c:2096 ../libsvn_subr/io.c:3504
#, c-format
msgid "Can't flush file '%s'"
msgstr "Kan inte tömma buffertar för filen \"%s\""
-#: ../libsvn_subr/io.c:2097 ../libsvn_subr/io.c:3501
+#: ../libsvn_subr/io.c:2097 ../libsvn_subr/io.c:3505
#, c-format
msgid "Can't flush stream"
msgstr "Kan inte tömma buffertar för ström"
@@ -5891,7 +5993,7 @@
msgstr "Kan inte tömma filbuffertar till disk"
#: ../libsvn_subr/io.c:2218 ../libsvn_subr/prompt.c:197
-#: ../svnserve/svnserve.c:787
+#: ../svnserve/svnserve.c:824
#, c-format
msgid "Can't open stdin"
msgstr "Kan inte öppna standard in"
@@ -5975,22 +6077,32 @@
msgid "Error waiting for process '%s'"
msgstr "Fel då processen \"%s\" inväntades"
-#: ../libsvn_subr/io.c:2801
+#: ../libsvn_subr/io.c:2802
#, c-format
-msgid "Process '%s' failed (exitwhy %d)"
-msgstr "Processen \"%s\" misslyckades (orsak %d)"
+msgid "Process '%s' failed (signal %d, core dumped)"
+msgstr "Processen \"%s\" misslyckades (signal %d, minnesutskrift skapad)"
-#: ../libsvn_subr/io.c:2808
+#: ../libsvn_subr/io.c:2807
#, c-format
+msgid "Process '%s' failed (signal %d)"
+msgstr "Processen \"%s\" misslyckades (signal %d)"
+
+#: ../libsvn_subr/io.c:2813
+#, c-format
+msgid "Process '%s' failed (exitwhy %d, exitcode %d)"
+msgstr "Processen \"%s\" misslyckades (orsak %d, slutkod %d)"
+
+#: ../libsvn_subr/io.c:2821
+#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Processen \"%s\" returnerade felstatus %d"
-#: ../libsvn_subr/io.c:2915
+#: ../libsvn_subr/io.c:2928
#, c-format
msgid "'%s' returned %d"
msgstr "\"%s\" returnerade %d"
-#: ../libsvn_subr/io.c:3035
+#: ../libsvn_subr/io.c:3048
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -6005,161 +6117,161 @@
"%s\n"
"%s"
-#: ../libsvn_subr/io.c:3176
+#: ../libsvn_subr/io.c:3189
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "Kan inte känna av MIME-typ på \"%s\", som inte är en fil"
-#: ../libsvn_subr/io.c:3271
+#: ../libsvn_subr/io.c:3284
#, c-format
msgid "Can't open file '%s'"
msgstr "Kan inte öppna filen \"%s\""
-#: ../libsvn_subr/io.c:3311
+#: ../libsvn_subr/io.c:3324
#, c-format
msgid "Can't close file '%s'"
msgstr "Kan inte stänga filen \"%s\""
-#: ../libsvn_subr/io.c:3312
+#: ../libsvn_subr/io.c:3325
#, c-format
msgid "Can't close stream"
msgstr "Kan inte stänga ström"
-#: ../libsvn_subr/io.c:3321 ../libsvn_subr/io.c:3357 ../libsvn_subr/io.c:3382
+#: ../libsvn_subr/io.c:3334 ../libsvn_subr/io.c:3370 ../libsvn_subr/io.c:3395
#, c-format
msgid "Can't read file '%s'"
msgstr "Kan inte läsa filen \"%s\""
-#: ../libsvn_subr/io.c:3322 ../libsvn_subr/io.c:3358 ../libsvn_subr/io.c:3383
+#: ../libsvn_subr/io.c:3335 ../libsvn_subr/io.c:3371 ../libsvn_subr/io.c:3396
#, c-format
msgid "Can't read stream"
msgstr "Kan inte läsa från ström"
-#: ../libsvn_subr/io.c:3331
+#: ../libsvn_subr/io.c:3344
#, c-format
msgid "Can't write file '%s'"
msgstr "Kan inte skriva till filen \"%s\""
-#: ../libsvn_subr/io.c:3332
+#: ../libsvn_subr/io.c:3345
#, c-format
msgid "Can't write stream"
msgstr "Kan inte skriva till ström"
-#: ../libsvn_subr/io.c:3346
+#: ../libsvn_subr/io.c:3359
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Kan inte erhålla attributinformation från filen \"%s\""
-#: ../libsvn_subr/io.c:3347
+#: ../libsvn_subr/io.c:3360
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Kan inte erhålla attributinformation från ström"
-#: ../libsvn_subr/io.c:3394
+#: ../libsvn_subr/io.c:3407
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Kan inte sätta filpekaren i filen \"%s\""
-#: ../libsvn_subr/io.c:3395
+#: ../libsvn_subr/io.c:3408
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Kan inte sätta filpekaren i ström"
-#: ../libsvn_subr/io.c:3406 ../libsvn_subr/io.c:3453
+#: ../libsvn_subr/io.c:3419 ../libsvn_subr/io.c:3466
#, c-format
msgid "Can't write to file '%s'"
msgstr "Kan inte skriva till filen \"%s\""
-#: ../libsvn_subr/io.c:3407 ../libsvn_subr/io.c:3454
+#: ../libsvn_subr/io.c:3420 ../libsvn_subr/io.c:3467
#, c-format
msgid "Can't write to stream"
msgstr "Kan inte skriva till ström"
-#: ../libsvn_subr/io.c:3505
+#: ../libsvn_subr/io.c:3509
#, c-format
msgid "Can't truncate file '%s'"
msgstr "Kan inte hugga av filen \"%s\""
-#: ../libsvn_subr/io.c:3506
+#: ../libsvn_subr/io.c:3510
#, c-format
msgid "Can't truncate stream"
msgstr "Kan inte hugga av ström"
-#: ../libsvn_subr/io.c:3576
+#: ../libsvn_subr/io.c:3583
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Kan inte läsa längdrad i filen \"%s\""
-#: ../libsvn_subr/io.c:3580
+#: ../libsvn_subr/io.c:3587
msgid "Can't read length line in stream"
msgstr "Kan inte läsa längdrad i ström"
-#: ../libsvn_subr/io.c:3637
+#: ../libsvn_subr/io.c:3644
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Kan inte flytta \"%s\" till \"%s\""
-#: ../libsvn_subr/io.c:3718
+#: ../libsvn_subr/io.c:3725
#, c-format
msgid "Can't create directory '%s'"
msgstr "Kan inte skapa katalogen \"%s\""
-#: ../libsvn_subr/io.c:3741
+#: ../libsvn_subr/io.c:3748
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Kan inte dölja katalogen \"%s\""
-#: ../libsvn_subr/io.c:3801 ../libsvn_subr/io.c:3924
+#: ../libsvn_subr/io.c:3808 ../libsvn_subr/io.c:3931
#, c-format
msgid "Can't open directory '%s'"
msgstr "Kan inte öppna katalogen \"%s\""
-#: ../libsvn_subr/io.c:3836
+#: ../libsvn_subr/io.c:3843
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Kan inte radera katalogen \"%s\""
-#: ../libsvn_subr/io.c:3854
+#: ../libsvn_subr/io.c:3861
#, c-format
msgid "Can't read directory"
msgstr "Kan inte läsa katalog"
-#: ../libsvn_subr/io.c:3874
+#: ../libsvn_subr/io.c:3881
#, c-format
msgid "Error closing directory"
msgstr "Fel vid stängning av katalog"
-#: ../libsvn_subr/io.c:3943
+#: ../libsvn_subr/io.c:3950
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Kan inte läsa katalogpost i \"%s\""
-#: ../libsvn_subr/io.c:4069
+#: ../libsvn_subr/io.c:4076
#, c-format
msgid "Can't check directory '%s'"
msgstr "Kan inte kontrollera katalogen \"%s\""
-#: ../libsvn_subr/io.c:4131
+#: ../libsvn_subr/io.c:4138
#, c-format
msgid "Reading '%s'"
msgstr "Läser \"%s\""
-#: ../libsvn_subr/io.c:4150
+#: ../libsvn_subr/io.c:4157
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "Första raden i \"%s\" innehåller något som inte är en siffra"
-#: ../libsvn_subr/io.c:4465
+#: ../libsvn_subr/io.c:4472
#, c-format
msgid "Can't create temporary file from template '%s'"
msgstr "Kan inte skapa temporärfil från mallen \"%s\""
-#: ../libsvn_subr/io.c:4554
+#: ../libsvn_subr/io.c:4561
#, c-format
msgid "Can't set aside '%s'"
msgstr "Kan inte flytta \"%s\" åt sidan"
-#: ../libsvn_subr/io.c:4566
+#: ../libsvn_subr/io.c:4573
#, c-format
msgid "Unable to make name in '%s'"
msgstr "Kunde inte skapa namn i \"%s\""
@@ -6244,41 +6356,41 @@
msgid "Can't unlock mutex"
msgstr "Kan inte låsa upp mutex"
-#: ../libsvn_subr/named_atomic.c:331
+#: ../libsvn_subr/named_atomic.c:335
msgid "Not a valid atomic"
msgstr "Inte en giltig atomisk variabel"
-#: ../libsvn_subr/named_atomic.c:465
+#: ../libsvn_subr/named_atomic.c:474
#, c-format
msgid "MMAP failed for file '%s'"
msgstr "MMAP misslyckades för filen \"%s\""
-#: ../libsvn_subr/named_atomic.c:477
+#: ../libsvn_subr/named_atomic.c:486
msgid "Number of atomics in namespace is too large."
msgstr "För många atomiska variabler i namnrymden"
-#: ../libsvn_subr/named_atomic.c:527
+#: ../libsvn_subr/named_atomic.c:537
msgid "Atomic's name is too long."
msgstr "För långt namn på atomisk variabel"
-#: ../libsvn_subr/named_atomic.c:533
+#: ../libsvn_subr/named_atomic.c:543
msgid "Namespace has not been initialized."
msgstr "Namnrymden har ej initierats"
-#: ../libsvn_subr/named_atomic.c:581
+#: ../libsvn_subr/named_atomic.c:591
msgid "Out of slots for named atomic."
msgstr "Slut på fack för namngiven atomisk variabel."
-#: ../libsvn_subr/nls.c:81
+#: ../libsvn_subr/nls.c:80
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
msgstr "Kan inte konvertera sträng från UCS-2: \"%s\""
-#: ../libsvn_subr/nls.c:88
+#: ../libsvn_subr/nls.c:87
msgid "Can't get module file name"
msgstr "Kan inte erhålla modulens filnamn"
-#: ../libsvn_subr/nls.c:103
+#: ../libsvn_subr/nls.c:102
#, c-format
msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
msgstr "Kan inte konvertera modulens sökväg till UTF-8 från UCS-2: \"%s\""
@@ -6372,7 +6484,7 @@
msgid "Can't determine the native path encoding"
msgstr "Kan inte hitta den teckenkodning som ditt system använder för sökvägar"
-#: ../libsvn_subr/path.c:1302
+#: ../libsvn_subr/path.c:1303
#, c-format
msgid "Improper relative URL '%s'"
msgstr "Oriktig relativ URL \"%s\""
@@ -6577,8 +6689,8 @@
#: ../libsvn_subr/sqlite.c:176
#, c-format
-msgid "sqlite: %s (S%d), executing statement '%s'"
-msgstr "sqlite: %s (S%d), körning av \"%s\""
+msgid "sqlite[S%d]: %s, executing statement '%s'"
+msgstr "sqlite[S%d]: %s, körning av \"%s\""
#: ../libsvn_subr/sqlite.c:265
msgid "sqlite: Expected database row missing"
@@ -6599,8 +6711,8 @@
#: ../libsvn_subr/sqlite.c:747
#, c-format
-msgid "Could not configure SQLite (S%d)"
-msgstr "Kunde inte konfigurera SQLite (S%d)"
+msgid "Could not configure SQLite [S%d]"
+msgstr "Kunde inte konfigurera SQLite [S%d]"
#: ../libsvn_subr/sqlite.c:749
msgid "Could not initialize SQLite"
@@ -6616,7 +6728,7 @@
msgid "Could not convert '%s' into a number"
msgstr "Kunde inte omvandla \"%s\" till ett tal"
-#: ../libsvn_subr/subst.c:1787 ../libsvn_wc/props.c:1648
+#: ../libsvn_subr/subst.c:1793 ../libsvn_wc/props.c:1660
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Filen \"%s\" har inkonsekventa radslut"
@@ -6657,47 +6769,47 @@
msgid "Negative revision number found parsing '%s'"
msgstr "Negativt revisionsnummer i \"%s\""
-#: ../libsvn_subr/utf.c:240
+#: ../libsvn_subr/utf.c:245
#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr "Kan inte skapa teckenkonverterare från systemets kodning till \"%s\""
-#: ../libsvn_subr/utf.c:244
+#: ../libsvn_subr/utf.c:249
#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr "Kan inte skapa teckenkonverterare från \"%s\" till systemets kodning"
-#: ../libsvn_subr/utf.c:248
+#: ../libsvn_subr/utf.c:253
#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "Kan inte skapa teckenkonverterare från \"%s\" till \"%s\""
-#: ../libsvn_subr/utf.c:590
+#: ../libsvn_subr/utf.c:601
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "Kan inte konvertera sträng från systemets kodning till \"%s\":"
-#: ../libsvn_subr/utf.c:594
+#: ../libsvn_subr/utf.c:605
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "Kan inte konvertera sträng från \"%s\" till systemets kodning:"
-#: ../libsvn_subr/utf.c:598
+#: ../libsvn_subr/utf.c:609
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "Kan inte konvertera sträng från \"%s\" till \"%s\""
-#: ../libsvn_subr/utf.c:643
+#: ../libsvn_subr/utf.c:654
#, c-format
msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from UTF-8"
msgstr "Giltig data \"%s\" följdes av icke-ASCII-byte %d: kan inte konvertera till/från UTF-8"
-#: ../libsvn_subr/utf.c:651
+#: ../libsvn_subr/utf.c:662
#, c-format
msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
msgstr "Tecken som ej tillhör ASCII (kod %d) hittades; kan inte konvertera till/från UTF-8"
-#: ../libsvn_subr/utf.c:696
+#: ../libsvn_subr/utf.c:707
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -6730,12 +6842,20 @@
msgid "MIME type '%s' contains invalid character '0x%02x' in postfix"
msgstr "MIME-typen \"%s\" innehåller det ogiltiga tecknet \"0x%02x\" i postfix"
-#: ../libsvn_subr/version.c:89
+#: ../libsvn_subr/version.c:91
#, c-format
-msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "Versioner stämmer ej i \"%s\": hittade %d.%d.%d%s, väntade %d.%d.%d%s"
+msgid "Version mismatch in '%s'%s: found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "Versioner stämmer ej i \"%s\"%s: hittade %d.%d.%d%s, väntade %d.%d.%d%s"
-#: ../libsvn_subr/version.c:132
+#: ../libsvn_subr/version.c:96
+msgid " (expecting equality)"
+msgstr " (likhet förväntad)"
+
+#: ../libsvn_subr/version.c:98
+msgid " (expecting compatibility)"
+msgstr " (kompatibilitet förväntad)"
+
+#: ../libsvn_subr/version.c:139
msgid ""
"Copyright (C) 2013 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
@@ -6747,9 +6867,9 @@
"se filen NOTICE för vidare information.\n"
"Subversion är öppen källkod; se http://subversion.apache.org/\n"
-#: ../libsvn_subr/version.c:210 ../libsvn_subr/version.c:221
-#: ../libsvn_subr/version.c:227 ../libsvn_subr/version.c:244
-#: ../libsvn_subr/version.c:251
+#: ../libsvn_subr/version.c:217 ../libsvn_subr/version.c:228
+#: ../libsvn_subr/version.c:234 ../libsvn_subr/version.c:251
+#: ../libsvn_subr/version.c:258
#, c-format
msgid "Failed to parse version number string '%s'"
msgstr "Syntaxfel i sträng med versionsnummer \"%s\""
@@ -6823,37 +6943,37 @@
msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'"
msgstr "URL:en \"%s\" (UUID: \"%s\") stämmer inte med den existerande URL:en \"%s\" (UUID: \"%s\") i \"%s\""
-#: ../libsvn_wc/adm_ops.c:601 ../libsvn_wc/update_editor.c:5206
+#: ../libsvn_wc/adm_ops.c:602 ../libsvn_wc/update_editor.c:5244
#, c-format
msgid "Can't find parent directory's node while trying to add '%s'"
msgstr "Kunde inte hitta föräldrakatalogens nod när \"%s\" skulle läggas till"
-#: ../libsvn_wc/adm_ops.c:610 ../libsvn_wc/update_editor.c:5200
+#: ../libsvn_wc/adm_ops.c:611 ../libsvn_wc/update_editor.c:5238
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "Kan inte lägga till \"%s\" i en föräldrakatalog som är schemalagd för radering"
-#: ../libsvn_wc/adm_ops.c:617 ../libsvn_wc/update_editor.c:5213
+#: ../libsvn_wc/adm_ops.c:618 ../libsvn_wc/update_editor.c:5251
#, c-format
msgid "Can't schedule an addition of '%s' below a not-directory node"
msgstr "Kan inte schemalägga ett tillägg av \"%s\" under en nod som inte är en katalog"
-#: ../libsvn_wc/adm_ops.c:676
+#: ../libsvn_wc/adm_ops.c:677
#, c-format
msgid "Can't create an entry with a reserved name while trying to add '%s'"
msgstr "Kunde inte skapa en post med ett reserverat namn när \"%s\" skulle läggas till"
-#: ../libsvn_wc/adm_ops.c:880
+#: ../libsvn_wc/adm_ops.c:881
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "URL:en \"%s\" har annan arkivrot än sin förälder"
-#: ../libsvn_wc/adm_ops.c:898
+#: ../libsvn_wc/adm_ops.c:899
#, c-format
msgid "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' for addition under a working copy from repository '%s' with uuid '%s'."
msgstr "Kan inte schemalägga arbetskopian vid \"%s\" från arkivet \"%s\" med UUID \"%s\" för att läggas till under en arbetskopia från arkiv \"%s\" med UUID \"%s\"."
-#: ../libsvn_wc/adm_ops.c:912
+#: ../libsvn_wc/adm_ops.c:913
#, c-format
msgid "Can't add '%s' with URL '%s', but with the data from '%s'"
msgstr "Kan inte lägga till \"%s\" med URL \"%s\", men med data från \"%s\""
@@ -6888,21 +7008,21 @@
msgid "Conflict callback violated API: returned no merged file"
msgstr "Konfliktprocedur bröt mot API:et: returnerade ingen sammanslagen fil"
-#: ../libsvn_wc/conflicts.c:2406 ../libsvn_wc/conflicts.c:2571
+#: ../libsvn_wc/conflicts.c:2468 ../libsvn_wc/conflicts.c:2644
msgid "Invalid 'conflict_result' argument"
msgstr "Ogiltigt \"conflict_result\"-argument"
-#: ../libsvn_wc/conflicts.c:2682 ../libsvn_wc/conflicts.c:2722
+#: ../libsvn_wc/conflicts.c:2767 ../libsvn_wc/conflicts.c:2807
#, c-format
msgid "Tree conflict can only be resolved to 'working' or 'mine-conflict' state; '%s' not resolved"
msgstr "Trädkonflikt kan endast lösas till tillstånden \"working\" eller \"mine-conflict\"; \"%s\" ej löst"
-#: ../libsvn_wc/conflicts.c:2737
+#: ../libsvn_wc/conflicts.c:2822
#, c-format
msgid "Tree conflict can only be resolved to 'working' state; '%s' not resolved"
msgstr "Trädkonflikt kan endast lösas till tillståndet \"working\"; \"%s\" ej löst"
-#: ../libsvn_wc/conflicts.c:2945
+#: ../libsvn_wc/conflicts.c:2924
msgid "No conflict-callback and no pre-defined conflict-choice provided"
msgstr "Ingen konfliktprocedur och inget fördefinierad konfliktval tillhandahölls"
@@ -6916,13 +7036,13 @@
msgid "cannot handle node kind for '%s'"
msgstr "kan inte hantera nodtyp för \"%s\""
-#: ../libsvn_wc/copy.c:432 ../libsvn_wc/wc_db.c:4400 ../libsvn_wc/wc_db.c:4975
+#: ../libsvn_wc/copy.c:432 ../libsvn_wc/wc_db.c:4412 ../libsvn_wc/wc_db.c:4987
#, c-format
msgid "Cannot handle status of '%s'"
msgstr "Kan inte hantera tillståndet för \"%s\""
-#: ../libsvn_wc/copy.c:441 ../libsvn_wc/wc_db.c:4391 ../libsvn_wc/wc_db.c:4969
-#: ../libsvn_wc/wc_db.c:5203
+#: ../libsvn_wc/copy.c:441 ../libsvn_wc/wc_db.c:4403 ../libsvn_wc/wc_db.c:4981
+#: ../libsvn_wc/wc_db.c:5215
#, c-format
msgid "Cannot copy '%s' excluded by server"
msgstr "Kan inte kopiera \"%s\" som är utesluten av servern"
@@ -6972,40 +7092,40 @@
msgid "Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first"
msgstr "Kan inte flytta delträd \"%s\" i blandad revision [%ld:%ld]; försök med att uppdatera först"
-#: ../libsvn_wc/crop.c:207
+#: ../libsvn_wc/crop.c:208
#, c-format
msgid "Cannot exclude '%s': it is a working copy root"
msgstr "Kan inte utesluta \"%s\": den är rot till en arbetskopia"
-#: ../libsvn_wc/crop.c:215
+#: ../libsvn_wc/crop.c:216
#, c-format
msgid "Cannot exclude '%s': it is a switched path"
msgstr "Kan inte utesluta \"%s\": det är en växlad sökväg"
-#: ../libsvn_wc/crop.c:242
+#: ../libsvn_wc/crop.c:243
#, c-format
msgid "Cannot exclude '%s': it is to be added to the repository. Try commit instead"
msgstr "Kan inte utesluta \"%s\": den kommer läggas till arkivet. Försök arkivera den istället"
-#: ../libsvn_wc/crop.c:249
+#: ../libsvn_wc/crop.c:250
#, c-format
msgid "Cannot exclude '%s': it is to be deleted from the repository. Try commit instead"
msgstr "Kan inte utesluta \"%s\": den kommer tas bort från arkivet. Försök arkivera den istället"
-#: ../libsvn_wc/crop.c:308
+#: ../libsvn_wc/crop.c:309
msgid "Can only crop a working copy with a restrictive depth"
msgstr "Kan bara beskära en arbetskopia med ett begränsande djup"
-#: ../libsvn_wc/crop.c:319
+#: ../libsvn_wc/crop.c:320
msgid "Can only crop directories"
msgstr "Kan bara beskära kataloger"
-#: ../libsvn_wc/crop.c:332
+#: ../libsvn_wc/crop.c:333
#, c-format
msgid "Cannot crop '%s': it is going to be removed from repository. Try commit instead"
msgstr "Kan inte beskära \"%s\": den kommer tas bort från arkivet. Försök arkivera den istället"
-#: ../libsvn_wc/crop.c:339
+#: ../libsvn_wc/crop.c:340
#, c-format
msgid "Cannot crop '%s': it is to be added to the repository. Try commit instead"
msgstr "Kan inte beskära \"%s\": den kommer läggas till arkivet. Försök arkivera den istället"
@@ -7055,32 +7175,32 @@
msgid "The file '%s' has no checksum"
msgstr "Filen \"%s\" saknar kontrollsumma"
-#: ../libsvn_wc/entries.c:1617
+#: ../libsvn_wc/entries.c:1619
#, c-format
msgid "Unable to upgrade '%s' at line %d"
msgstr "Kunde inte uppgradera \"%s\" på rad %d"
-#: ../libsvn_wc/entries.c:1835
+#: ../libsvn_wc/entries.c:1837
#, c-format
msgid "No copyfrom URL for '%s'"
msgstr "Ingen URL för kopieringskällan för \"%s\""
-#: ../libsvn_wc/entries.c:2049
+#: ../libsvn_wc/entries.c:2051
#, c-format
msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; "
msgstr "Felaktig MD5-kontrollsumma för \"%s\"; väntade \"%s\", fick \"%s\""
-#: ../libsvn_wc/entries.c:2396
+#: ../libsvn_wc/entries.c:2398
#, c-format
msgid "No default entry in directory '%s'"
msgstr "Ingen normalpost i katalogen \"%s\""
-#: ../libsvn_wc/entries.c:2552
+#: ../libsvn_wc/entries.c:2554
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "Katalogen \"%s\" saknar THIS_DIR-post"
-#: ../libsvn_wc/entries.c:2733 ../libsvn_wc/node.c:528
+#: ../libsvn_wc/entries.c:2735 ../libsvn_wc/node.c:528
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "\"%s\" har okänd nodtyp"
@@ -7120,27 +7240,27 @@
msgid "Node '%s' is no existing file external"
msgstr "Noden \"%s\" är inte en befintlig extern fil"
-#: ../libsvn_wc/externals.c:1516
+#: ../libsvn_wc/externals.c:1517
#, c-format
msgid "URL '%s' does not begin with a scheme"
msgstr "URL:en \"%s\" börjar inte med ett schema"
-#: ../libsvn_wc/externals.c:1571
+#: ../libsvn_wc/externals.c:1572
#, c-format
msgid "Illegal parent directory URL '%s'"
msgstr "Otillåten föräldrakatalogs-URL \"%s\""
-#: ../libsvn_wc/externals.c:1610
+#: ../libsvn_wc/externals.c:1611
#, c-format
msgid "Illegal repository root URL '%s'"
msgstr "Otillåten arkivrots-URL \"%s\""
-#: ../libsvn_wc/externals.c:1655
+#: ../libsvn_wc/externals.c:1656
#, c-format
msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
msgstr "Den externa relativa URL:en \"%s\" får inte innehålla \"..\""
-#: ../libsvn_wc/externals.c:1683
+#: ../libsvn_wc/externals.c:1684
#, c-format
msgid "Unrecognized format for the relative external URL '%s'"
msgstr "Okänt format för den relativa externa URL:en \"%s\""
@@ -7150,7 +7270,7 @@
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
msgstr "Sökvägen \"%s\" slutar med \"%s\", vilket inte stöds för den här operationen"
-#: ../libsvn_wc/lock.c:773 ../libsvn_wc/wc_db.c:13640
+#: ../libsvn_wc/lock.c:773 ../libsvn_wc/wc_db.c:13652
#, c-format
msgid "Working copy '%s' locked"
msgstr "Arbetskopian \"%s\" är låst"
@@ -7190,12 +7310,12 @@
msgid "Can't obtain lock on non-directory '%s'."
msgstr "Kan inte låsa icke-katalogen \"%s\""
-#: ../libsvn_wc/merge.c:1281 ../libsvn_wc/props.c:259
+#: ../libsvn_wc/merge.c:1281 ../libsvn_wc/props.c:257
#, c-format
msgid "Can't merge into conflicted node '%s'"
msgstr "Kan inte slå samman till konfliktnoden \"%s\""
-#: ../libsvn_wc/merge.c:1324 ../libsvn_wc/props.c:275
+#: ../libsvn_wc/merge.c:1324 ../libsvn_wc/props.c:273
#, c-format
msgid "The property '%s' may not be merged into '%s'."
msgstr "Egenskapen \"%s\" får inte slås samman till \"%s\"."
@@ -7245,17 +7365,17 @@
msgid "Illegal file external revision kind %d for path '%s'"
msgstr "Ogiltig revisionstyp %d för extern fil med sökväg \"%s\""
-#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:843
+#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:847
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "Posten \"%s\" har ogiltig nodtyp"
-#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:823
+#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:827
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "Posten för \"%s\" har ogiltig arkivrot"
-#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:868
+#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:872
#, c-format
msgid "Entry '%s' has invalid 'schedule' value"
msgstr "Posten \"%s\" har ogiltigt \"schedule\"-värde"
@@ -7270,47 +7390,47 @@
msgid "Entry '%s' has invalid '%s' value"
msgstr "Posten \"%s\" har ogiltigt värde för \"%s\""
-#: ../libsvn_wc/old-and-busted.c:1081
+#: ../libsvn_wc/old-and-busted.c:1085
#, c-format
msgid "XML parser failed in '%s'"
msgstr "XML-tolken misslyckades i \"%s\""
-#: ../libsvn_wc/old-and-busted.c:1137
+#: ../libsvn_wc/old-and-busted.c:1141
msgid "Missing default entry"
msgstr "Normalpost saknas"
-#: ../libsvn_wc/old-and-busted.c:1142
+#: ../libsvn_wc/old-and-busted.c:1146
msgid "Default entry has no revision number"
msgstr "Normalposten saknar revisionsnummer"
-#: ../libsvn_wc/old-and-busted.c:1147
+#: ../libsvn_wc/old-and-busted.c:1151
msgid "Default entry is missing URL"
msgstr "Normalposten saknar URL"
-#: ../libsvn_wc/old-and-busted.c:1226
+#: ../libsvn_wc/old-and-busted.c:1230
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Felaktig versionsrad i postfilen för \"%s\""
-#: ../libsvn_wc/old-and-busted.c:1243
+#: ../libsvn_wc/old-and-busted.c:1247
msgid "Missing entry terminator"
msgstr "Avslutningstecken för posten saknas"
-#: ../libsvn_wc/old-and-busted.c:1246
+#: ../libsvn_wc/old-and-busted.c:1250
msgid "Invalid entry terminator"
msgstr "Ogiltigt avslutningstecken för post"
-#: ../libsvn_wc/old-and-busted.c:1250
+#: ../libsvn_wc/old-and-busted.c:1254
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Fel vid post %d i postfilen för \"%s\":"
-#: ../libsvn_wc/props.c:238
+#: ../libsvn_wc/props.c:236
#, c-format
msgid "The node '%s' does not have properties in this state."
msgstr "Noden \"%s\" har inga egenskaper i detta tillstånd."
-#: ../libsvn_wc/props.c:403
+#: ../libsvn_wc/props.c:401
#, c-format
msgid ""
"Trying to add new property '%s'\n"
@@ -7319,7 +7439,7 @@
"Försöker lägga till egenskapen \"%s\"\n"
"men egenskapen finns redan.\n"
-#: ../libsvn_wc/props.c:412
+#: ../libsvn_wc/props.c:410
#, c-format
msgid ""
"Trying to add new property '%s'\n"
@@ -7328,7 +7448,7 @@
"Försöker lägga till egenskapen \"%s\"\n"
"men egenskapen har tagits bort lokalt.\n"
-#: ../libsvn_wc/props.c:426
+#: ../libsvn_wc/props.c:424
#, c-format
msgid ""
"Trying to delete property '%s'\n"
@@ -7337,7 +7457,7 @@
"Försöker ta bort egenskapen \"%s\"\n"
"men egenskapen har lagts till lokalt.\n"
-#: ../libsvn_wc/props.c:442
+#: ../libsvn_wc/props.c:440
#, c-format
msgid ""
"Trying to delete property '%s'\n"
@@ -7346,7 +7466,7 @@
"Försöker ta bort egenskapen \"%s\"\n"
"men egenskapen har ändrats lokalt.\n"
-#: ../libsvn_wc/props.c:452
+#: ../libsvn_wc/props.c:450
#, c-format
msgid ""
"Trying to delete property '%s'\n"
@@ -7355,7 +7475,7 @@
"Försöker ta bort egenskapen \"%s\"\n"
"men egenskapen har tagits bort lokalt och hade ett annat värde.\n"
-#: ../libsvn_wc/props.c:464
+#: ../libsvn_wc/props.c:462
#, c-format
msgid ""
"Trying to delete property '%s'\n"
@@ -7364,7 +7484,7 @@
"Försöker ta bort egenskapen \"%s\"\n"
"men det lokala värdet på egenskapen är annorlunda.\n"
-#: ../libsvn_wc/props.c:483
+#: ../libsvn_wc/props.c:481
#, c-format
msgid ""
"Trying to change property '%s'\n"
@@ -7373,7 +7493,7 @@
"Försöker ändra egenskapen \"%s\"\n"
"men det lokala värdet på egenskapen står i konflikt med ändringen.\n"
-#: ../libsvn_wc/props.c:491
+#: ../libsvn_wc/props.c:489
#, c-format
msgid ""
"Trying to change property '%s'\n"
@@ -7382,7 +7502,7 @@
"Försöker ändra egenskapen \"%s\"\n"
"men egenskapen har redan ändrats lokalt till ett annat värde.\n"
-#: ../libsvn_wc/props.c:498
+#: ../libsvn_wc/props.c:496
#, c-format
msgid ""
"Trying to change property '%s'\n"
@@ -7391,7 +7511,7 @@
"Försöker ändra egenskapen \"%s\"\n"
"men egenskapen har tagits bort lokalt.\n"
-#: ../libsvn_wc/props.c:504
+#: ../libsvn_wc/props.c:502
#, c-format
msgid ""
"Trying to change property '%s'\n"
@@ -7400,7 +7520,7 @@
"Försöker ändra egenskapen \"%s\"\n"
"men egenskapen har lagts till lokalt med ett annat värde.\n"
-#: ../libsvn_wc/props.c:510
+#: ../libsvn_wc/props.c:508
#, c-format
msgid ""
"Trying to change property '%s'\n"
@@ -7409,82 +7529,82 @@
"Försöker ändra egenskapen \"%s\"\n"
"men egenskapen finns inte lokalt.\n"
-#: ../libsvn_wc/props.c:614
+#: ../libsvn_wc/props.c:612
msgid "<<<<<<< (local property value)"
msgstr "<<<<<<< (lokalt egenskapsvärde)"
-#: ../libsvn_wc/props.c:615
+#: ../libsvn_wc/props.c:613
msgid ">>>>>>> (incoming property value)"
msgstr ">>>>>>> (inkommande egenskapsvärde)"
-#: ../libsvn_wc/props.c:636
+#: ../libsvn_wc/props.c:648
msgid "Local property value:\n"
msgstr "Lokalt egenskapsvärde:\n"
-#: ../libsvn_wc/props.c:638 ../libsvn_wc/props.c:649
+#: ../libsvn_wc/props.c:650 ../libsvn_wc/props.c:661
msgid "Cannot display: property value is binary data\n"
msgstr "Kan inte visa: egenskapsvärdet är binärdata\n"
-#: ../libsvn_wc/props.c:647
+#: ../libsvn_wc/props.c:659
msgid "Incoming property value:\n"
msgstr "Inkommande egenskapsvärde:\n"
-#: ../libsvn_wc/props.c:1463 ../libsvn_wc/props.c:1872
-#: ../libsvn_wc/props.c:1973
+#: ../libsvn_wc/props.c:1475 ../libsvn_wc/props.c:1884
+#: ../libsvn_wc/props.c:1985
#, c-format
msgid "Property '%s' is an entry property"
msgstr "Egenskapen \"%s\" är en postegenskap"
-#: ../libsvn_wc/props.c:1500 ../libsvn_wc/props.c:1507
+#: ../libsvn_wc/props.c:1512 ../libsvn_wc/props.c:1519
msgid "Failed to load properties"
msgstr "Misslyckades med att läsa egenskaper"
-#: ../libsvn_wc/props.c:1543
+#: ../libsvn_wc/props.c:1555
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Kan inte sätta \"%s\" på en katalog (\"%s\")"
-#: ../libsvn_wc/props.c:1550
+#: ../libsvn_wc/props.c:1562
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Kan inte sätta \"%s\" på en fil (\"%s\")"
-#: ../libsvn_wc/props.c:1629
+#: ../libsvn_wc/props.c:1641
#, c-format
msgid "Can't set '%s': file '%s' has binary mime type property"
msgstr "Kan inte sätta \"%s\": filen \"%s\" har binär mime-typsegenskap"
-#: ../libsvn_wc/props.c:1674
+#: ../libsvn_wc/props.c:1686
msgid "Failed to load current properties"
msgstr "Misslyckades med att läsa aktuella egenskaper"
-#: ../libsvn_wc/props.c:1894
+#: ../libsvn_wc/props.c:1906
#, c-format
msgid "Can't set properties on '%s': invalid status for updating properties."
msgstr "Kan inte sätta egenskaper på \"%s\": felaktigt tillstånd för att uppdatera egenskaper."
-#: ../libsvn_wc/props.c:1978
+#: ../libsvn_wc/props.c:1990
#, c-format
msgid "Property '%s' is a WC property, not a regular property"
msgstr "Egenskapen \"%s\" är en arbetskopieegenskap, inte en vanlig egenskap"
-#: ../libsvn_wc/props.c:2072
+#: ../libsvn_wc/props.c:2084
#, c-format
msgid "Unrecognized line ending style '%s' for '%s'"
msgstr "Okänt sätt att markera radslut \"%s\" för \"%s\""
#. scratch_
-#: ../libsvn_wc/props.c:2123
+#: ../libsvn_wc/props.c:2135
#, c-format
msgid " (%d more duplicate targets found)"
msgstr " (ytterligare %d mål förekommer flera gånger)"
-#: ../libsvn_wc/props.c:2128
+#: ../libsvn_wc/props.c:2140
#, c-format
msgid "Invalid %s property on '%s': target '%s' appears more than once%s"
msgstr "Ogiltig egenskap %s på \"%s\": målet \"%s\" förekommer mer än en gång%s"
-#: ../libsvn_wc/props.c:2159
+#: ../libsvn_wc/props.c:2171
#, c-format
msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')"
msgstr "Kan inte sätta icke-ärftlig sammanslagningsinformation på en icke-katalog (\"%s\")"
@@ -7544,7 +7664,7 @@
msgid "Attempt to add tree conflict that already exists at '%s'"
msgstr "Försök att lägga till en trädkonflikt som redan finns vid \"%s\""
-#: ../libsvn_wc/update_editor.c:998
+#: ../libsvn_wc/update_editor.c:999
#, c-format
msgid ""
"Checksum mismatch while updating '%s':\n"
@@ -7555,41 +7675,41 @@
" väntad: %s\n"
" erhållen: %s\n"
-#: ../libsvn_wc/update_editor.c:1129
+#: ../libsvn_wc/update_editor.c:1134
#, c-format
msgid "'%s' is not valid as filename in directory '%s'"
msgstr "\"%s\" är inte giltig som filnamn i katalogen \"%s\""
-#: ../libsvn_wc/update_editor.c:1606
+#: ../libsvn_wc/update_editor.c:1611
#, c-format
msgid "Unexpected attempt to add a node at path '%s'"
msgstr "Oväntat försök att lägga till en nod vid sökvägen \"%s\""
-#: ../libsvn_wc/update_editor.c:1617
+#: ../libsvn_wc/update_editor.c:1622
#, c-format
msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'"
msgstr "Oväntat försök att ändra, radera eller ersätta en nod vid sökvägen \"%s\""
-#: ../libsvn_wc/update_editor.c:2019
+#: ../libsvn_wc/update_editor.c:2036
#, c-format
msgid "Failed to add directory '%s': object of the same name as the administrative directory"
msgstr "Kunde inte lägga till katalogen \"%s\": objektet har samma namn som förvaltningskatalogen"
-#: ../libsvn_wc/update_editor.c:2667
+#: ../libsvn_wc/update_editor.c:2694
msgid "Couldn't do property merge"
msgstr "Kunde inte slå ihop egenskaper"
-#: ../libsvn_wc/update_editor.c:3023
+#: ../libsvn_wc/update_editor.c:3050
#, c-format
msgid "Failed to mark '%s' absent: item of the same name is already scheduled for addition"
msgstr "Kunde inte markera \"%s\" som saknad: ett objekt med det namnet är redan schemalagt att läggas till"
-#: ../libsvn_wc/update_editor.c:3111
+#: ../libsvn_wc/update_editor.c:3138
#, c-format
msgid "Failed to add file '%s': object of the same name as the administrative directory"
msgstr "Misslyckades att lägga till filen \"%s\": objektet har samma namn som förvaltningskatalogen"
-#: ../libsvn_wc/update_editor.c:3623
+#: ../libsvn_wc/update_editor.c:3660
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -7600,22 +7720,22 @@
" väntad: %s\n"
" lagrad: %s\n"
-#: ../libsvn_wc/update_editor.c:5181
+#: ../libsvn_wc/update_editor.c:5219
#, c-format
msgid "Node '%s' exists."
msgstr "Noden \"%s\" finns redan."
-#: ../libsvn_wc/update_editor.c:5241
+#: ../libsvn_wc/update_editor.c:5279
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "URL:en för kopieringskällan till \"%s\" har annan arkivrot än \"%s\""
-#: ../libsvn_wc/update_editor.c:5439
+#: ../libsvn_wc/update_editor.c:5477
#, c-format
msgid "'%s' is not an unmodified copied directory"
msgstr "\"%s\" är inte en oförändrad kopierad katalog"
-#: ../libsvn_wc/update_editor.c:5450
+#: ../libsvn_wc/update_editor.c:5488
#, c-format
msgid "Copyfrom '%s' doesn't match original location of '%s'"
msgstr "Kopieringskällan \"%s\" motsvarar inte den ursprungliga platsen \"%s\""
@@ -7696,138 +7816,138 @@
msgid "The file '%s' has no checksum."
msgstr "Filen \"%s\" saknar kontrollsumma."
-#: ../libsvn_wc/wc_db.c:2456 ../libsvn_wc/wc_db.c:2837
-#: ../libsvn_wc/wc_db.c:8878
+#: ../libsvn_wc/wc_db.c:2468 ../libsvn_wc/wc_db.c:2849
+#: ../libsvn_wc/wc_db.c:8890
#, c-format
msgid "The node '%s' has a corrupt checksum value."
msgstr "Noden \"%s\" har en trasig kontrollsumma."
-#: ../libsvn_wc/wc_db.c:2641
+#: ../libsvn_wc/wc_db.c:2653
#, c-format
msgid "The node '%s' has a BASE status that has no properties."
msgstr "Noden \"%s\" har ett \"BASE\"-tillstånd utan egenskaper."
-#: ../libsvn_wc/wc_db.c:3467
+#: ../libsvn_wc/wc_db.c:3479
#, c-format
msgid "The node '%s' is not an external."
msgstr "Noden \"%s\" är inte extern."
-#: ../libsvn_wc/wc_db.c:3874
+#: ../libsvn_wc/wc_db.c:3886
#, c-format
msgid "Expected node '%s' to be deleted."
msgstr "Noden \"%s\" väntades vara raderad."
-#: ../libsvn_wc/wc_db.c:6355 ../libsvn_wc/wc_db.c:6433
+#: ../libsvn_wc/wc_db.c:6367 ../libsvn_wc/wc_db.c:6445
#, c-format
msgid "Can't revert '%s' without reverting children"
msgstr "Kan inte återställa \"%s\" utan att återställa dess barn"
-#: ../libsvn_wc/wc_db.c:6530
+#: ../libsvn_wc/wc_db.c:6542
#, c-format
msgid "Can't revert '%s' without reverting parent"
msgstr "Kan inte återställa \"%s\" utan att återställa dess förälder"
-#: ../libsvn_wc/wc_db.c:6647
+#: ../libsvn_wc/wc_db.c:6659
#, c-format
msgid "Unsupported depth for revert of '%s'"
msgstr "Djupet för återställningen av \"%s\" stöds inte"
-#: ../libsvn_wc/wc_db.c:7490
+#: ../libsvn_wc/wc_db.c:7502
#, c-format
msgid "Cannot delete '%s' as '%s' is excluded by server"
msgstr "Kan inte ta bort \"%s\" eftersom servern har uteslutit \"%s\""
-#: ../libsvn_wc/wc_db.c:7501
+#: ../libsvn_wc/wc_db.c:7513
#, c-format
msgid "Cannot delete '%s' as it is excluded by server"
msgstr "Kan inte ta bort \"%s\" eftersom servern har uteslutit den"
-#: ../libsvn_wc/wc_db.c:7508
+#: ../libsvn_wc/wc_db.c:7520
#, c-format
msgid "Cannot delete '%s' as it is excluded"
msgstr "Kan inte ta bort \"%s\" eftersom den är utesluten"
-#: ../libsvn_wc/wc_db.c:7922
+#: ../libsvn_wc/wc_db.c:7934
#, c-format
msgid "Cannot move '%s' to '%s' because they are not in the same working copy"
msgstr "Kan inte flytta \"%s\" till \"%s\" eftersom de inte är i samma arbetskopia"
-#: ../libsvn_wc/wc_db.c:8280
+#: ../libsvn_wc/wc_db.c:8292
#, c-format
msgid "Corrupt data for '%s'"
msgstr "Trasig data för \"%s\""
-#: ../libsvn_wc/wc_db.c:8584
+#: ../libsvn_wc/wc_db.c:8596
#, c-format
msgid "The node '%s' comes from unexpected repository '%s', expected '%s'; if this node is a file external using the correct URL in the external definition can fix the problem, see issue #4087"
msgstr "Noden \"%s\" tillhör arkiv \"%s\" istället för \"%s\"; om denna nod är en extern fil så kan problemet lösas genom att använda rätt URL i den externa definitionen, se felrapport nr 4087"
-#: ../libsvn_wc/wc_db.c:9003
+#: ../libsvn_wc/wc_db.c:9015
#, c-format
msgid "The node '%s' is not in working copy '%s'"
msgstr "Noden \"%s\" är inte i arbetskopian \"%s\""
-#: ../libsvn_wc/wc_db.c:9040
+#: ../libsvn_wc/wc_db.c:9052
#, c-format
msgid "The node '%s' is not installable"
msgstr "Noden \"%s\" kan inte installeras"
-#: ../libsvn_wc/wc_db.c:9469 ../libsvn_wc/wc_db.c:9728
+#: ../libsvn_wc/wc_db.c:9481 ../libsvn_wc/wc_db.c:9740
#, c-format
msgid "The node '%s' has a status that has no properties."
msgstr "Noden \"%s\" har ett tillstånd utan egenskaper."
-#: ../libsvn_wc/wc_db.c:11568
+#: ../libsvn_wc/wc_db.c:11580
#, c-format
msgid "Expected node '%s' to be added."
msgstr "Noden \"%s\" förväntades ha lagts till."
-#: ../libsvn_wc/wc_db.c:11914
+#: ../libsvn_wc/wc_db.c:11926
#, c-format
msgid "Path '%s' was not moved here"
msgstr "Sökvägen \"%s\" har inte flyttats hit"
-#: ../libsvn_wc/wc_db.c:11983
+#: ../libsvn_wc/wc_db.c:11995
#, c-format
msgid "The base node '%s' was not found."
msgstr "Basnoden \"%s\" hittades inte."
-#: ../libsvn_wc/wc_db.c:12415
+#: ../libsvn_wc/wc_db.c:12427
#, c-format
msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530."
msgstr "Egenskaperna för \"%s\" är i ett obestämt tillstånd och kan inte uppgraderas. Se felrapport nr 2530."
-#: ../libsvn_wc/wc_db.c:12427
+#: ../libsvn_wc/wc_db.c:12439
#, c-format
msgid "Insufficient NODES rows for '%s'"
msgstr "Inte tillräckligt med \"NODES\"-rader för \"%s\""
-#: ../libsvn_wc/wc_db.c:12574
+#: ../libsvn_wc/wc_db.c:12586
#, c-format
msgid "Repository '%s' not found in the database"
msgstr "Arkivet \"%s\" finns inte i databasen"
-#: ../libsvn_wc/wc_db.c:13561 ../libsvn_wc/wc_db.c:13609
+#: ../libsvn_wc/wc_db.c:13573 ../libsvn_wc/wc_db.c:13621
#, c-format
msgid "'%s' is already locked."
msgstr "\"%s\" är redan låst."
-#: ../libsvn_wc/wc_db.c:13566 ../libsvn_wc/wc_db.c:13617
+#: ../libsvn_wc/wc_db.c:13578 ../libsvn_wc/wc_db.c:13629
#, c-format
msgid "Working copy '%s' locked."
msgstr "Arbetskopian \"%s\" är låst."
-#: ../libsvn_wc/wc_db.c:13689
+#: ../libsvn_wc/wc_db.c:13701
#, c-format
msgid "'%s' is already locked via '%s'."
msgstr "\"%s\" är redan låst genom \"%s\"."
-#: ../libsvn_wc/wc_db.c:13863
+#: ../libsvn_wc/wc_db.c:13875
#, c-format
msgid "Working copy not locked at '%s'."
msgstr "Arbetskopian inte låst vid \"%s\"."
-#: ../libsvn_wc/wc_db.c:14246
+#: ../libsvn_wc/wc_db.c:14258
#, c-format
msgid "Modification of '%s' already exists"
msgstr "Ändringen av \"%s\" finns redan"
@@ -7834,22 +7954,22 @@
#. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT
#. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message.
-#: ../libsvn_wc/wc_db.c:14888
+#: ../libsvn_wc/wc_db.c:14900
#, c-format
msgid "database inconsistency at local_relpath='%s' verifying expression '%s'"
msgstr "inkonsistens i databasen vid \"local_relpath\" \"%s\" när uttrycket \"%s\" kontrollerades"
-#: ../libsvn_wc/wc_db.c:15008
+#: ../libsvn_wc/wc_db.c:15024
#, c-format
msgid "Can't upgrade '%s' as it is not a working copy root"
msgstr "Kan inte uppgradera \"%s\" eftersom den inte är rot till en arbetskopia"
-#: ../libsvn_wc/wc_db.c:15014
+#: ../libsvn_wc/wc_db.c:15030
#, c-format
msgid "Working copy '%s' is too old and must be upgraded to at least format %d, as created by Subversion %s"
msgstr "Arbetskopian \"%s\" är för gammal och måste uppgraderas till åtminstone format %d, vilket är vad Subversion %s använder"
-#: ../libsvn_wc/wc_db.c:15029
+#: ../libsvn_wc/wc_db.c:15048
msgid "Working copy upgrade failed"
msgstr "Uppgradering av arbetskopian misslyckades"
@@ -7964,42 +8084,42 @@
msgid "The symlink at '%s' points nowhere"
msgstr "Den symboliska länken vid \"%s\" pekar ingenstans"
-#: ../libsvn_wc/wc_db_wcroot.c:661
+#: ../libsvn_wc/wc_db_wcroot.c:665
#, c-format
msgid "Missing a row in WCROOT for '%s'."
msgstr "En rad i \"WCROOT\" saknas för \"%s\"."
-#: ../libsvn_wc/wc_db_wcroot.c:709
+#: ../libsvn_wc/wc_db_wcroot.c:716
#, c-format
msgid "The working copy at '%s' is corrupt."
msgstr "Förstörd arbetskopia \"%s\"."
-#: ../libsvn_wc/wc_db_wcroot.c:725
+#: ../libsvn_wc/wc_db_wcroot.c:732
#, c-format
msgid "The working copy database at '%s' is missing."
msgstr "Arbetskopians databas \"%s\" saknas."
-#: ../libsvn_wc/wc_db_wcroot.c:734
+#: ../libsvn_wc/wc_db_wcroot.c:741
#, c-format
msgid "The working copy database at '%s' is corrupt."
msgstr "Arbetskopians databas \"%s\" är trasig."
-#: ../libsvn_wc/wc_db_wcroot.c:881
+#: ../libsvn_wc/wc_db_wcroot.c:899
#, c-format
msgid "'%s' is not a working copy root"
msgstr "\"%s\" är inte rot till en arbetskopia"
-#: ../libsvn_wc/workqueue.c:517
+#: ../libsvn_wc/workqueue.c:518
#, c-format
msgid "Can't install '%s' from pristine store, because no checksum is recorded for this file"
msgstr "Kan inte installera \"%s\" från lagringen av orörd data eftersom ingen kontrollsumma har registrerats för denna fil"
-#: ../libsvn_wc/workqueue.c:1498
+#: ../libsvn_wc/workqueue.c:1499
#, c-format
msgid "Unrecognized work item in the queue"
msgstr "Okänt element i arbetskön"
-#: ../libsvn_wc/workqueue.c:1578
+#: ../libsvn_wc/workqueue.c:1579
#, c-format
msgid "Failed to run the WC DB work queue associated with '%s', work item %d %s"
msgstr "Misslyckades med att behandla arbetskopians databaskö kopplad till \"%s\", element %d %s"
@@ -8017,7 +8137,7 @@
msgstr "Flaggan \"verbose\" är inte tillåten i XML-läge"
#: ../svn/blame-cmd.c:315 ../svn/info-cmd.c:613 ../svn/list-cmd.c:312
-#: ../svn/status-cmd.c:302
+#: ../svn/status-cmd.c:308
msgid "'incremental' option only valid in XML mode"
msgstr "Flaggan \"incremental\" är endast tillåten i XML-läge"
@@ -8175,8 +8295,46 @@
msgid "upon none"
msgstr "vid ingenting"
+#: ../svn/cl-conflicts.c:200
+msgid "local edit"
+msgstr "lokal ändring"
+
+#: ../svn/cl-conflicts.c:203
+msgid "local add"
+msgstr "lokalt tillägg"
+
+#: ../svn/cl-conflicts.c:206
+msgid "local delete"
+msgstr "lokal radering"
+
+#: ../svn/cl-conflicts.c:209
+msgid "local obstruction"
+msgstr "lokal blockering"
+
+#: ../svn/cl-conflicts.c:212
+#, c-format
+msgid "local %s"
+msgstr "lokal %s"
+
+#: ../svn/cl-conflicts.c:220
+msgid "incoming edit"
+msgstr "inkommande ändring"
+
#: ../svn/cl-conflicts.c:223
+msgid "incoming add"
+msgstr "inkommande tillägg"
+
+#: ../svn/cl-conflicts.c:226
+msgid "incoming delete"
+msgstr "inkommande radering"
+
+#: ../svn/cl-conflicts.c:229
#, c-format
+msgid "incoming %s"
+msgstr "inkommande %s"
+
+#: ../svn/cl-conflicts.c:235 ../svn/cl-conflicts.c:277
+#, c-format
msgid "%s, %s %s"
msgstr "%s, %s %s"
@@ -8183,7 +8341,7 @@
#. A catch-all message for very rare or nominally impossible cases.
#. It will not be pretty, but is closer to an internal error than
#. an ordinary user-facing string.
-#: ../svn/cl-conflicts.c:231
+#: ../svn/cl-conflicts.c:285
#, c-format
msgid "local: %s %s incoming: %s %s %s"
msgstr "lokalt: %s %s inkommande: %s %s %s"
@@ -8202,39 +8360,47 @@
msgid "Commit targets must be local paths"
msgstr "Arkiveringsmål måste vara lokala sökvägar"
-#: ../svn/conflict-callbacks.c:152 ../svn/conflict-callbacks.c:169
+#: ../svn/conflict-callbacks.c:155 ../svn/conflict-callbacks.c:172
msgid "MINE"
msgstr "MIN"
-#: ../svn/conflict-callbacks.c:157 ../svn/conflict-callbacks.c:167
+#: ../svn/conflict-callbacks.c:160 ../svn/conflict-callbacks.c:170
msgid "THEIRS"
msgstr "ANDRAS"
-#: ../svn/conflict-callbacks.c:160
+#: ../svn/conflict-callbacks.c:163
msgid "MERGED"
msgstr "SAMMANSLAGNING"
-#: ../svn/conflict-callbacks.c:217
+#: ../svn/conflict-callbacks.c:220 ../svn/conflict-callbacks.c:276
msgid "||||||| ORIGINAL"
msgstr "||||||| ORIGINAL"
-#: ../svn/conflict-callbacks.c:218
+#: ../svn/conflict-callbacks.c:221
msgid "<<<<<<< MINE (select with 'mc')"
msgstr "<<<<<<< MIN (välj med \"mc\")"
-#: ../svn/conflict-callbacks.c:219
+#: ../svn/conflict-callbacks.c:222
msgid ">>>>>>> THEIRS (select with 'tc')"
msgstr ">>>>>>> ANDRAS (välj med \"tc\")"
-#: ../svn/conflict-callbacks.c:253 ../svn/file-merge.c:503
+#: ../svn/conflict-callbacks.c:277
+msgid "<<<<<<< MINE"
+msgstr "<<<<<<< MIN"
+
+#: ../svn/conflict-callbacks.c:278
+msgid ">>>>>>> THEIRS"
+msgstr ">>>>>>> ANDRAS"
+
+#: ../svn/conflict-callbacks.c:333 ../svn/file-merge.c:503
msgid "No editor found."
msgstr "Ingen editor hittades."
-#: ../svn/conflict-callbacks.c:262 ../svn/file-merge.c:515
+#: ../svn/conflict-callbacks.c:342 ../svn/file-merge.c:515
msgid "Error running editor."
msgstr "Fel vid körning av editor."
-#: ../svn/conflict-callbacks.c:272
+#: ../svn/conflict-callbacks.c:352
#, c-format
msgid ""
"Invalid option; there's no merged version to edit.\n"
@@ -8243,15 +8409,15 @@
"Felaktig väljare; det finns ingen sammanslagen version att behandla.\n"
"\n"
-#: ../svn/conflict-callbacks.c:303
+#: ../svn/conflict-callbacks.c:411
msgid "No merge tool found, try '(m) merge' instead.\n"
msgstr "Inget sammanslagningsverktyg hittades; försök istället med \"m (merge)\".\n"
-#: ../svn/conflict-callbacks.c:311
+#: ../svn/conflict-callbacks.c:419
msgid "Error running merge tool, try '(m) merge' instead."
msgstr "Fel vid körning av sammanslagningsverktyg; försök istället med \"(m) merge\"."
-#: ../svn/conflict-callbacks.c:343
+#: ../svn/conflict-callbacks.c:451
msgid "change merged file in an editor [edit]"
msgstr "redigera sammanslagen fil i en editor [edit]"
@@ -8258,186 +8424,233 @@
#. Translators: keep long_desc below 70 characters (wrap with a left
#. margin of 9 spaces if needed); don't translate the words within square
#. brackets.
-#: ../svn/conflict-callbacks.c:343
+#: ../svn/conflict-callbacks.c:451
msgid "edit file"
msgstr "redigera fil"
-#: ../svn/conflict-callbacks.c:346
+#: ../svn/conflict-callbacks.c:454
msgid "show all changes made to merged file"
msgstr "visa alla ändringar i sammanslagen fil"
-#: ../svn/conflict-callbacks.c:346
+#: ../svn/conflict-callbacks.c:454
msgid "show diff"
msgstr "visa skillnader"
-#: ../svn/conflict-callbacks.c:348
+#: ../svn/conflict-callbacks.c:456
msgid "accept merged version of file"
msgstr "godta sammanslagen version av fil"
-#: ../svn/conflict-callbacks.c:348 ../svn/conflict-callbacks.c:422
-#: ../svn/conflict-callbacks.c:437 ../svn/conflict-callbacks.c:453
-#: ../svn/conflict-callbacks.c:469
-msgid "resolved"
+#: ../svn/conflict-callbacks.c:456 ../svn/conflict-callbacks.c:501
+#: ../svn/conflict-callbacks.c:533
+msgid "mark resolved"
msgstr "markera som löst"
-#: ../svn/conflict-callbacks.c:351
+#: ../svn/conflict-callbacks.c:459 ../svn/conflict-callbacks.c:498
msgid "display conflict"
msgstr "visa konflikt"
-#: ../svn/conflict-callbacks.c:351
+#: ../svn/conflict-callbacks.c:459
msgid "show all conflicts (ignoring merged version)"
msgstr "visa alla konflikter (utom sammanslagen version)"
-#: ../svn/conflict-callbacks.c:353
+#: ../svn/conflict-callbacks.c:461
msgid "accept my version for all conflicts (same) [mine-conflict]"
msgstr "godta min version för alla konflikter (likaså) [mine-conflict]"
-#: ../svn/conflict-callbacks.c:353 ../svn/conflict-callbacks.c:434
-#: ../svn/conflict-callbacks.c:450 ../svn/conflict-callbacks.c:466
+#: ../svn/conflict-callbacks.c:461
msgid "my side of conflict"
msgstr "min sida av konflikt"
-#: ../svn/conflict-callbacks.c:356
+#: ../svn/conflict-callbacks.c:464
msgid "accept their version for all conflicts (same) [theirs-conflict]"
msgstr "godta andras version för alla konflikter (likaså) [theirs-conflict]"
-#: ../svn/conflict-callbacks.c:356
+#: ../svn/conflict-callbacks.c:464
msgid "their side of conflict"
msgstr "andras sida av konflikt"
-#: ../svn/conflict-callbacks.c:361 ../svn/conflict-callbacks.c:387
+#: ../svn/conflict-callbacks.c:469 ../svn/conflict-callbacks.c:492
msgid "accept my version of entire file (even non-conflicts) [mine-full]"
msgstr ""
"godta min version av hela filen (allt, inte bara konflikter)\n"
" [mine-full]"
-#: ../svn/conflict-callbacks.c:361 ../svn/conflict-callbacks.c:387
-#: ../svn/conflict-callbacks.c:405
+#: ../svn/conflict-callbacks.c:469 ../svn/conflict-callbacks.c:492
+#: ../svn/conflict-callbacks.c:515
msgid "my version"
msgstr "min version"
-#: ../svn/conflict-callbacks.c:364 ../svn/conflict-callbacks.c:390
+#: ../svn/conflict-callbacks.c:472 ../svn/conflict-callbacks.c:495
msgid "accept their version of entire file (same) [theirs-full]"
msgstr "godta andras version av hela filen (likaså) [theirs-full]"
-#: ../svn/conflict-callbacks.c:364 ../svn/conflict-callbacks.c:390
-#: ../svn/conflict-callbacks.c:408
+#: ../svn/conflict-callbacks.c:472 ../svn/conflict-callbacks.c:495
+#: ../svn/conflict-callbacks.c:518
msgid "their version"
msgstr "andras version"
-#: ../svn/conflict-callbacks.c:368 ../svn/conflict-callbacks.c:384
-#: ../svn/conflict-callbacks.c:402
-msgid "mark the conflict to be resolved later [postpone]"
-msgstr "markera konflikter för senare lösning [postpone]"
-
-#: ../svn/conflict-callbacks.c:368 ../svn/conflict-callbacks.c:384
-#: ../svn/conflict-callbacks.c:402 ../svn/conflict-callbacks.c:420
-#: ../svn/conflict-callbacks.c:432 ../svn/conflict-callbacks.c:448
-#: ../svn/conflict-callbacks.c:464
-msgid "postpone"
-msgstr "lös senare"
-
-#: ../svn/conflict-callbacks.c:371 ../svn/util.c:774
+#: ../svn/conflict-callbacks.c:476 ../svn/util.c:774
msgid "merge"
msgstr "sammanslagning"
-#: ../svn/conflict-callbacks.c:371
+#: ../svn/conflict-callbacks.c:476
msgid "use internal merge tool to resolve conflict"
msgstr "använd interna sammanslagningsverktyget för att lösa konflikten"
-#: ../svn/conflict-callbacks.c:373
+#: ../svn/conflict-callbacks.c:478
msgid "launch external tool to resolve conflict [launch]"
msgstr "använd externt verktyg för att lösa konflikten [launch]"
-#: ../svn/conflict-callbacks.c:373
+#: ../svn/conflict-callbacks.c:478
msgid "launch tool"
msgstr "kör verktyg"
-#: ../svn/conflict-callbacks.c:375 ../svn/conflict-callbacks.c:393
-#: ../svn/conflict-callbacks.c:411 ../svn/conflict-callbacks.c:424
-#: ../svn/conflict-callbacks.c:440 ../svn/conflict-callbacks.c:456
-#: ../svn/conflict-callbacks.c:472
+#: ../svn/conflict-callbacks.c:480 ../svn/conflict-callbacks.c:503
+#: ../svn/conflict-callbacks.c:521
+msgid "mark the conflict to be resolved later [postpone]"
+msgstr "markera konflikter för senare lösning [postpone]"
+
+#: ../svn/conflict-callbacks.c:480 ../svn/conflict-callbacks.c:503
+#: ../svn/conflict-callbacks.c:521 ../svn/conflict-callbacks.c:535
+#: ../svn/conflict-callbacks.c:553 ../svn/conflict-callbacks.c:567
+#: ../svn/conflict-callbacks.c:583 ../svn/conflict-callbacks.c:599
+msgid "postpone"
+msgstr "lös senare"
+
+#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506
+#: ../svn/conflict-callbacks.c:524 ../svn/conflict-callbacks.c:537
+#: ../svn/conflict-callbacks.c:555 ../svn/conflict-callbacks.c:569
+#: ../svn/conflict-callbacks.c:585 ../svn/conflict-callbacks.c:601
msgid "postpone all remaining conflicts"
msgstr "skjut upp lösningen av återstående konflikter"
-#: ../svn/conflict-callbacks.c:375 ../svn/conflict-callbacks.c:393
-#: ../svn/conflict-callbacks.c:411 ../svn/conflict-callbacks.c:424
-#: ../svn/conflict-callbacks.c:440 ../svn/conflict-callbacks.c:456
-#: ../svn/conflict-callbacks.c:472
+#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506
+#: ../svn/conflict-callbacks.c:524 ../svn/conflict-callbacks.c:537
+#: ../svn/conflict-callbacks.c:555 ../svn/conflict-callbacks.c:569
+#: ../svn/conflict-callbacks.c:585 ../svn/conflict-callbacks.c:601
msgid "quit resolution"
msgstr "avbryt lösning"
-#: ../svn/conflict-callbacks.c:377
+#: ../svn/conflict-callbacks.c:485
msgid "show all options"
msgstr "visa alla val"
-#: ../svn/conflict-callbacks.c:377
+#: ../svn/conflict-callbacks.c:485
msgid "show this list (also 'h', '?')"
msgstr "visa denna lista (även \"h\" och \"?\")"
-#: ../svn/conflict-callbacks.c:395 ../svn/conflict-callbacks.c:413
-#: ../svn/conflict-callbacks.c:426 ../svn/conflict-callbacks.c:442
-#: ../svn/conflict-callbacks.c:458 ../svn/conflict-callbacks.c:474
+#: ../svn/conflict-callbacks.c:498
+msgid "show conflicts in this property"
+msgstr "visa konflikter i denna egenskap"
+
+#: ../svn/conflict-callbacks.c:499
+msgid "change merged property value in an editor [edit]"
+msgstr "redigera sammanslagen egenskap i en editor [edit]"
+
+#: ../svn/conflict-callbacks.c:499
+msgid "edit property"
+msgstr "redigera egenskap"
+
+#: ../svn/conflict-callbacks.c:501
+msgid "accept edited version of property"
+msgstr "godta redigerad version av egenskap"
+
+#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:526
+#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:557
+#: ../svn/conflict-callbacks.c:571 ../svn/conflict-callbacks.c:587
+#: ../svn/conflict-callbacks.c:603
msgid "help"
msgstr "hjälp"
-#: ../svn/conflict-callbacks.c:395 ../svn/conflict-callbacks.c:413
-#: ../svn/conflict-callbacks.c:426 ../svn/conflict-callbacks.c:442
-#: ../svn/conflict-callbacks.c:458 ../svn/conflict-callbacks.c:474
+#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:526
+#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:557
+#: ../svn/conflict-callbacks.c:571 ../svn/conflict-callbacks.c:587
+#: ../svn/conflict-callbacks.c:603
msgid "show this help (also '?')"
msgstr "visa denna hjälp (även \"?\")"
-#: ../svn/conflict-callbacks.c:405
+#: ../svn/conflict-callbacks.c:515
msgid "accept pre-existing item (ignore upstream addition) [mine-full]"
msgstr "godta befintligt objekt (strunta i mottaget tillägg) [mine-full]"
-#: ../svn/conflict-callbacks.c:408
+#: ../svn/conflict-callbacks.c:518
msgid "accept incoming item (overwrite pre-existing item) [theirs-full]"
msgstr "godta inkommande objekt (ersätt befintligt objekt) [theirs-full]"
-#: ../svn/conflict-callbacks.c:420 ../svn/conflict-callbacks.c:432
-#: ../svn/conflict-callbacks.c:448 ../svn/conflict-callbacks.c:464
+#: ../svn/conflict-callbacks.c:533
+msgid "accept current working copy state"
+msgstr "godta nuvarande tillstånd i arbetskopia"
+
+#: ../svn/conflict-callbacks.c:535 ../svn/conflict-callbacks.c:553
+#: ../svn/conflict-callbacks.c:567 ../svn/conflict-callbacks.c:583
+#: ../svn/conflict-callbacks.c:599
msgid "resolve the conflict later [postpone]"
msgstr "lös konflikten senare [postpone]"
-#: ../svn/conflict-callbacks.c:422
-msgid "accept current working copy state"
-msgstr "godta nuvarande tillstånd i arbetskopia"
+#: ../svn/conflict-callbacks.c:545
+msgid "apply update (recommended)"
+msgstr "utför uppdateringen (rekommenderas)"
-#: ../svn/conflict-callbacks.c:434
+#: ../svn/conflict-callbacks.c:546
msgid "apply update to the move destination [mine-conflict]"
msgstr "utför uppdateringen på målet för flyttningen [mine-conflict]"
-#: ../svn/conflict-callbacks.c:437
-msgid "mark resolved (the move will become a copy)"
+#: ../svn/conflict-callbacks.c:549
+msgid "discard update (breaks move)"
+msgstr "överge uppdateringen (bryter flyttning)"
+
+#: ../svn/conflict-callbacks.c:549
+msgid "discard update, mark resolved, the move will will become a copy"
+msgstr "överge uppdateringen, markera som löst, flyttningen blir en kopia"
+
+#: ../svn/conflict-callbacks.c:563
+msgid "apply update to move destination"
+msgstr "utför uppdateringen på målet för flyttningen"
+
+#: ../svn/conflict-callbacks.c:564
+msgid "apply incoming update to move destination [mine-conflict]"
+msgstr "utför inkommande uppdatering på målet för flyttningen [mine-conflict]"
+
+#: ../svn/conflict-callbacks.c:577 ../svn/conflict-callbacks.c:593
+msgid "keep affected local moves"
+msgstr "behåll lokala flyttningar som påverkas"
+
+#: ../svn/conflict-callbacks.c:577
+msgid "keep any local moves affected by this deletion [mine-conflict]"
+msgstr ""
+"behåll lokala flyttningar som påverkats av denna radering\n"
+" [mine-conflict]"
+
+#: ../svn/conflict-callbacks.c:580 ../svn/conflict-callbacks.c:596
+msgid "mark resolved (breaks moves)"
msgstr "markera som löst (flyttningen blir en kopia)"
-#: ../svn/conflict-callbacks.c:450
-msgid "keep any moves affected by this deletion [mine-conflict]"
-msgstr "behåll flyttningar som påverkats av denna radering [mine-conflict]"
+#: ../svn/conflict-callbacks.c:580
+msgid "mark resolved, any affected moves will become copies"
+msgstr "markera som löst; påverkade flyttningar blir kopior"
-#: ../svn/conflict-callbacks.c:453 ../svn/conflict-callbacks.c:469
+#: ../svn/conflict-callbacks.c:593
+msgid "keep any moves affected by this replacement [mine-conflict]"
+msgstr "behåll flyttningar påverkade av denna ersättning [mine-conflict]"
+
+#: ../svn/conflict-callbacks.c:596
msgid "mark resolved (any affected moves will become copies)"
msgstr "markera som löst (påverkade flyttningar blir kopior)"
-#: ../svn/conflict-callbacks.c:466
-msgid "keep any moves affected by this replacement [mine-conflict]"
-msgstr "behåll flyttningar påverkade av denna ersättning [mine-conflict]"
-
-#: ../svn/conflict-callbacks.c:503
+#: ../svn/conflict-callbacks.c:632
msgid "Select:"
msgstr "Välj:"
-#: ../svn/conflict-callbacks.c:530
+#: ../svn/conflict-callbacks.c:659
#, c-format
msgid " (%s) %s"
msgstr " (%s) %s"
-#: ../svn/conflict-callbacks.c:570
+#: ../svn/conflict-callbacks.c:699
msgid "Words in square brackets are the corresponding --accept option arguments.\n"
msgstr "Ord inom hakparenteser är motsvarande argument till flaggan --accept.\n"
-#: ../svn/conflict-callbacks.c:609
+#: ../svn/conflict-callbacks.c:738
#, c-format
msgid ""
"Unrecognized option.\n"
@@ -8446,12 +8659,12 @@
"Okänd väljare.\n"
"\n"
-#: ../svn/conflict-callbacks.c:637
+#: ../svn/conflict-callbacks.c:766
#, c-format
msgid "Conflict discovered in file '%s'.\n"
msgstr "Konflikt upptäckt i filen \"%s\".\n"
-#: ../svn/conflict-callbacks.c:707
+#: ../svn/conflict-callbacks.c:836
#, c-format
msgid ""
"Invalid option; cannot display conflicts for a binary file.\n"
@@ -8460,7 +8673,7 @@
"Ogiltig väljare; kan inte visa konflikter för en binärfil.\n"
"\n"
-#: ../svn/conflict-callbacks.c:716
+#: ../svn/conflict-callbacks.c:845
#, c-format
msgid ""
"Invalid option; original files not available.\n"
@@ -8467,7 +8680,7 @@
"\n"
msgstr "Ogiltig väljare; ursprungliga filerna ej tillgängliga.\n"
-#: ../svn/conflict-callbacks.c:728
+#: ../svn/conflict-callbacks.c:857
#, c-format
msgid ""
"Invalid option; there's no merged version to diff.\n"
@@ -8476,7 +8689,7 @@
"Ogiltig väljare; det finns ingen sammanslagen version att jämföra med.\n"
"\n"
-#: ../svn/conflict-callbacks.c:748
+#: ../svn/conflict-callbacks.c:877
#, c-format
msgid ""
"Invalid option; can only resolve text conflicts with the internal merge tool.\n"
@@ -8485,7 +8698,7 @@
"Ogiltig väljare; kan bara lösa textkonflikter med det interna sammanslagningsverktyget.\n"
"\n"
-#: ../svn/conflict-callbacks.c:774 ../svn/conflict-callbacks.c:791
+#: ../svn/conflict-callbacks.c:903 ../svn/conflict-callbacks.c:920
#, c-format
msgid ""
"Invalid option.\n"
@@ -8494,7 +8707,7 @@
"Ogiltig väljare.\n"
"\n"
-#: ../svn/conflict-callbacks.c:800
+#: ../svn/conflict-callbacks.c:929
#, c-format
msgid ""
"Invalid option; cannot choose based on conflicts in a binary file.\n"
@@ -8503,23 +8716,32 @@
"Ogiltig väljare; kan inte välja utifrån konflikter i en binärfil.\n"
"\n"
-#: ../svn/conflict-callbacks.c:814
+#: ../svn/conflict-callbacks.c:943
#, c-format
msgid ""
-"Invalid option; use diff/edit/merge/launch before choosing 'resolved'.\n"
+"Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n"
"\n"
msgstr ""
"Ogiltig väljare; använd \"df\", \"e\", \"m\" eller \"l\" före \"r\".\n"
"\n"
-#: ../svn/conflict-callbacks.c:845
+#: ../svn/conflict-callbacks.c:984
#, c-format
msgid "Conflict for property '%s' discovered on '%s'.\n"
msgstr "Konflikt för egenskapen \"%s\" upptäcktes på \"%s\".\n"
-#: ../svn/conflict-callbacks.c:926
+#: ../svn/conflict-callbacks.c:1042
#, c-format
msgid ""
+"Invalid option; please edit the property first.\n"
+"\n"
+msgstr ""
+"Felaktigt val; redigera egenskapen först.\n"
+"\n"
+
+#: ../svn/conflict-callbacks.c:1079
+#, c-format
+msgid ""
"Tree conflict on '%s'\n"
" > %s\n"
msgstr ""
@@ -8526,7 +8748,7 @@
"Trädkonflikt på \"%s\"\n"
" > %s\n"
-#: ../svn/conflict-callbacks.c:991
+#: ../svn/conflict-callbacks.c:1149
#, c-format
msgid ""
"Conflict discovered when trying to add '%s'.\n"
@@ -8535,19 +8757,19 @@
"En konflikt upptäcktes när \"%s\" skulle läggas till.\n"
"Ett objekt med samma namn finns redan.\n"
-#: ../svn/conflict-callbacks.c:1088
+#: ../svn/conflict-callbacks.c:1247
msgid "No editor found; leaving all conflicts."
msgstr "Ingen editor hittades; alla konflikter har lämnats kvar."
-#: ../svn/conflict-callbacks.c:1097
+#: ../svn/conflict-callbacks.c:1256
msgid "Error running editor; leaving all conflicts."
msgstr "Fel vid körning av editor; alla konflikter har lämnats kvar."
-#: ../svn/conflict-callbacks.c:1133
+#: ../svn/conflict-callbacks.c:1292
msgid "No merge tool found; leaving all conflicts."
msgstr "Inget sammanslagningsverktyg hittades; alla konflikter har lämnats kvar."
-#: ../svn/conflict-callbacks.c:1142
+#: ../svn/conflict-callbacks.c:1301
msgid "Error running merge tool; leaving all conflicts."
msgstr "Fel vid körning av sammanslagningsverktyget; alla konflikter har lämnats kvar."
@@ -8587,7 +8809,7 @@
msgid "Failure occurred processing one or more externals definitions"
msgstr "Fel vid behandlingen av en eller flera externals-definitioner"
-#: ../svn/file-merge.c:135 ../svn/file-merge.c:785
+#: ../svn/file-merge.c:135 ../svn/file-merge.c:805
msgid "Could not write data to merged file"
msgstr "Kunde inte skriva data till sammanslagen fil"
@@ -8612,6 +8834,8 @@
#: ../svn/file-merge.c:657
msgid ""
"Select: (1) use their version, (2) use your version,\n"
+" (12) their version first, then yours,\n"
+" (21) your version first, then theirs,\n"
" (e1) edit their version and use the result,\n"
" (e2) edit your version and use the result,\n"
" (eb) edit both versions and use the result,\n"
@@ -8619,6 +8843,8 @@
" (a) abort file merge and return to main menu: "
msgstr ""
"Välj: (1) använd andras version, (2) använd din version,\n"
+" (12) deras version först, sedan din,\n"
+" (21) din version först, sedan deras,\n"
" (e1) redigera andras version och använd resultatet,\n"
" (e2) redigera din version och använd resultatet,\n"
" (eb) redigera båda versionerna och använd resultatet,\n"
@@ -8625,17 +8851,17 @@
" (p) skjut upp detta konfliktavsnitt och lämna konfliktmarkeringar,\n"
" (a) avbryt sammanslagningen av filen och återgå till huvudmenyn: "
-#: ../svn/file-merge.c:859
+#: ../svn/file-merge.c:888
#, c-format
msgid "Merging '%s'.\n"
msgstr "Sammanslagning av \"%s\".\n"
-#: ../svn/file-merge.c:909
+#: ../svn/file-merge.c:935
#, c-format
msgid "Merge of '%s' aborted.\n"
msgstr "Sammanslagning av \"%s\" avbruten.\n"
-#: ../svn/file-merge.c:921
+#: ../svn/file-merge.c:953
#, c-format
msgid ""
"Could not write merged result to '%s', saved instead at '%s'.\n"
@@ -8644,12 +8870,12 @@
"Kunde inte skriva sammanslaget resultat till \"%s\", istället sparat i \"%s\".\n"
"\"%s\" är fortfarande i konflikt.\n"
-#: ../svn/file-merge.c:943
+#: ../svn/file-merge.c:971
#, c-format
msgid "Merge of '%s' completed (remains in conflict).\n"
msgstr "Sammanslagningen av \"%s\" klar (fortfarande i konflikt).\n"
-#: ../svn/file-merge.c:949
+#: ../svn/file-merge.c:975
#, c-format
msgid "Merge of '%s' completed.\n"
msgstr "Sammanslagningen av \"%s\" klar.\n"
@@ -8690,7 +8916,7 @@
"Subversion är ett verktyg för versionshantering.\n"
"Se http://subversion.apache.org/ för ytterligare information\n"
-#: ../svn/help-cmd.c:73 ../svnrdump/svnrdump.c:659 ../svnsync/svnsync.c:1856
+#: ../svn/help-cmd.c:73 ../svnrdump/svnrdump.c:659 ../svnsync/svnsync.c:1857
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -8723,7 +8949,7 @@
msgid "Resource is not under version control."
msgstr "Resursen är inte versionshanterad."
-#: ../svn/info-cmd.c:266 ../svnadmin/svnadmin.c:1732
+#: ../svn/info-cmd.c:266 ../svnadmin/svnadmin.c:1744
#, c-format
msgid "Path: %s\n"
msgstr "Sökväg: %s\n"
@@ -9058,68 +9284,59 @@
msgid "cannot assign with 'with-revprop' option (drop the '=')"
msgstr "kan inte tilldela med flaggan \"with-revprop\" (ta bort \"=\")"
-#: ../svn/merge-cmd.c:108
+#: ../svn/merge-cmd.c:107 ../svn/merge-cmd.c:131
#, c-format
-msgid "--- Checking branch relationship\n"
-msgstr "--- Kontrollerar grensläktskap\n"
-
-#: ../svn/merge-cmd.c:112 ../svn/mergeinfo-cmd.c:303
-msgid "Source and target must be different but related branches"
-msgstr "Källa och mål måste vara skilda men besläktade grenar"
-
-#: ../svn/merge-cmd.c:116 ../svn/merge-cmd.c:140
-#, c-format
msgid "--- Merging\n"
msgstr "--- Sammanslagning\n"
-#: ../svn/merge-cmd.c:184
+#: ../svn/merge-cmd.c:175
msgid "-r and -c can't be used with --reintegrate"
msgstr "-r och -r kan inte användas tillsammans med --reintegrate"
-#: ../svn/merge-cmd.c:239
+#: ../svn/merge-cmd.c:230
msgid "Merge source required"
msgstr "Sammanslagningens källa måste anges"
-#: ../svn/merge-cmd.c:285
+#: ../svn/merge-cmd.c:276
msgid "Second revision required"
msgstr "En andra revision måste anges"
-#: ../svn/merge-cmd.c:294 ../svn/merge-cmd.c:321 ../svn/mergeinfo-cmd.c:267
-#: ../svnadmin/svnadmin.c:1707 ../svnlook/svnlook.c:2039
-#: ../svnlook/svnlook.c:2232 ../svnlook/svnlook.c:2336
-#: ../svnlook/svnlook.c:2371
+#: ../svn/merge-cmd.c:285 ../svn/merge-cmd.c:312 ../svn/mergeinfo-cmd.c:267
+#: ../svnadmin/svnadmin.c:1719 ../svnlook/svnlook.c:2061
+#: ../svnlook/svnlook.c:2254 ../svnlook/svnlook.c:2358
+#: ../svnlook/svnlook.c:2393
msgid "Too many arguments given"
msgstr "För många argument"
-#: ../svn/merge-cmd.c:311
+#: ../svn/merge-cmd.c:302
msgid "Cannot specify a revision range with two URLs"
msgstr "Ett revisionsområde med två URL:er kan ej anges"
-#: ../svn/merge-cmd.c:415
+#: ../svn/merge-cmd.c:406
msgid "--reintegrate cannot be used with --ignore-ancestry"
msgstr "\"--reintegrate\" kan inte användas tillsammans med \"--ignore-ancestry\""
-#: ../svn/merge-cmd.c:420
+#: ../svn/merge-cmd.c:411
msgid "--reintegrate cannot be used with --record-only"
msgstr "\"--reintegrate\" kan inte användas tillsammans med \"--record-only\""
-#: ../svn/merge-cmd.c:425
+#: ../svn/merge-cmd.c:416
msgid "--depth cannot be used with --reintegrate"
msgstr "\"--depth\" kan inte användas tillsammans med \"--reintegrate\""
-#: ../svn/merge-cmd.c:430
+#: ../svn/merge-cmd.c:421
msgid "--force cannot be used with --reintegrate"
msgstr "\"--force\" kan inte användas tillsammans med \"--reintegrate\""
-#: ../svn/merge-cmd.c:435
+#: ../svn/merge-cmd.c:426
msgid "--reintegrate can only be used with a single merge source"
msgstr "\"--reintegrate\" kan bara användas med en enda sammanslagningskälla"
-#: ../svn/merge-cmd.c:439
+#: ../svn/merge-cmd.c:430
msgid "--allow-mixed-revisions cannot be used with --reintegrate"
msgstr "\"--allow-mixed-revisions\" kan inte användas tillsammans med \"--reintegrate\""
-#: ../svn/merge-cmd.c:454
+#: ../svn/merge-cmd.c:445
msgid ""
"Merge tracking not possible, use --ignore-ancestry or\n"
"fix invalid mergeinfo in target with 'svn propset'"
@@ -9147,11 +9364,11 @@
msgid "Not enough arguments given"
msgstr "För få argument"
-#: ../svn/mergeinfo-cmd.c:337
+#: ../svn/mergeinfo-cmd.c:342
msgid "--revision (-r) option valid only with --show-revs option"
msgstr "Flaggan --revision (-r) är endast tillåten tillsammans med flaggan --show-revs"
-#: ../svn/mergeinfo-cmd.c:341
+#: ../svn/mergeinfo-cmd.c:346
msgid "Depth specification options valid only with --show-revs option"
msgstr "Flaggor för djupangivelse är endast tillåtna tillsammans med --show-revs"
@@ -9163,7 +9380,7 @@
msgid "Try 'svn mkdir --parents' instead?"
msgstr "Försök med \"svn mkdir --parents\" istället?"
-#: ../svn/notify.c:95
+#: ../svn/notify.c:132
#, c-format
msgid "%d remaining"
msgid_plural "%d remaining"
@@ -9170,7 +9387,7 @@
msgstr[0] "%d återstår"
msgstr[1] "%d återstår"
-#: ../svn/notify.c:104
+#: ../svn/notify.c:141
#, c-format
msgid "and %d already resolved"
msgid_plural "and %d already resolved"
@@ -9177,142 +9394,142 @@
msgstr[0] "och %d redan löst"
msgstr[1] "och %d redan lösta"
-#: ../svn/notify.c:126 ../svn/status-cmd.c:90
+#: ../svn/notify.c:163 ../svn/status-cmd.c:93
#, c-format
msgid "Summary of conflicts:\n"
msgstr "Konfliktsammanfattning:\n"
-#: ../svn/notify.c:132
+#: ../svn/notify.c:169
#, c-format
msgid " Text conflicts: %d\n"
msgstr " Textkonflikter: %d\n"
-#: ../svn/notify.c:136
+#: ../svn/notify.c:173
#, c-format
msgid " Property conflicts: %d\n"
msgstr " Egenskapskonflikter: %d\n"
-#: ../svn/notify.c:140
+#: ../svn/notify.c:177
#, c-format
msgid " Tree conflicts: %d\n"
msgstr " Trädkonflikter: %d\n"
-#: ../svn/notify.c:147
+#: ../svn/notify.c:184
#, c-format
msgid " Text conflicts: %s (%s)\n"
msgstr " Textkonflikter: %s (%s)\n"
-#: ../svn/notify.c:152
+#: ../svn/notify.c:189
#, c-format
msgid " Property conflicts: %s (%s)\n"
msgstr " Egenskapskonflikter: %s (%s)\n"
-#: ../svn/notify.c:157
+#: ../svn/notify.c:194
#, c-format
msgid " Tree conflicts: %s (%s)\n"
msgstr " Trädkonflikter: %s (%s)\n"
-#: ../svn/notify.c:163
+#: ../svn/notify.c:200
#, c-format
msgid " Skipped paths: %d\n"
msgstr " Överhoppade sökvägar: %d\n"
-#: ../svn/notify.c:198
+#: ../svn/notify.c:235
#, c-format
msgid "Skipped missing target: '%s'\n"
msgstr "Hoppade över saknat mål: \"%s\"\n"
-#: ../svn/notify.c:205
+#: ../svn/notify.c:242
#, c-format
msgid "Skipped target: '%s' -- copy-source is missing\n"
msgstr "Hoppade över mål: \"%s\" -- kopieringskällan saknas\n"
-#: ../svn/notify.c:212
+#: ../svn/notify.c:249
#, c-format
msgid "Skipped '%s'\n"
msgstr "Hoppade över \"%s\"\n"
-#: ../svn/notify.c:219
+#: ../svn/notify.c:256
#, c-format
msgid "Skipped '%s' -- An obstructing working copy was found\n"
msgstr "Hoppade över \"%s\" -- En arbetskopia hittades som var i vägen\n"
-#: ../svn/notify.c:226
+#: ../svn/notify.c:263
#, c-format
msgid "Skipped '%s' -- Has no versioned parent\n"
msgstr "Hoppade över \"%s\" -- Saknar versionshanterad förälder\n"
-#: ../svn/notify.c:233
+#: ../svn/notify.c:270
#, c-format
msgid "Skipped '%s' -- Access denied\n"
msgstr "Hoppade över \"%s\" -- Åtkomst nekas\n"
-#: ../svn/notify.c:240
+#: ../svn/notify.c:277
#, c-format
msgid "Skipped '%s' -- Node remains in conflict\n"
msgstr "Hoppade över \"%s\" -- Noden är fortfarande i konflikt\n"
-#: ../svn/notify.c:321
+#: ../svn/notify.c:358
#, c-format
msgid "Restored '%s'\n"
msgstr "Återskapade \"%s\"\n"
-#: ../svn/notify.c:327
+#: ../svn/notify.c:364
#, c-format
msgid "Reverted '%s'\n"
msgstr "Återställde \"%s\"\n"
-#: ../svn/notify.c:333
+#: ../svn/notify.c:370
#, c-format
msgid "Failed to revert '%s' -- try updating instead.\n"
msgstr "Misslyckades med att återställa \"%s\" -- försök uppdatera istället.\n"
-#: ../svn/notify.c:358
+#: ../svn/notify.c:378
#, c-format
msgid "Resolved conflicted state of '%s'\n"
msgstr "Löste konflikttillståndet för \"%s\"\n"
-#: ../svn/notify.c:453 ../svn/notify.c:493
+#: ../svn/notify.c:473 ../svn/notify.c:513
#, c-format
msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s"
msgstr "> anbragte stycke ## -%lu,%lu +%lu,%lu ## med förskjutning %s"
-#: ../svn/notify.c:470 ../svn/notify.c:507
+#: ../svn/notify.c:490 ../svn/notify.c:527
#, c-format
msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s"
msgstr "> anbragte stycke @@ -%lu,%lu +%lu,%lu @@ med förskjutning %s"
-#: ../svn/notify.c:528
+#: ../svn/notify.c:548
#, c-format
msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n"
msgstr "> anbragte stycke ## -%lu,%lu +%lu,%lu ## med oskärpa %lu (%s)\n"
-#: ../svn/notify.c:538
+#: ../svn/notify.c:558
#, c-format
msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n"
msgstr "> anbragte stycke @@ -%lu,%lu +%lu,%lu @@ med oskärpa %lu\n"
-#: ../svn/notify.c:556
+#: ../svn/notify.c:576
#, c-format
msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n"
msgstr "> avslog stycke ## -%lu,%lu +%lu,%lu ## (%s)\n"
-#: ../svn/notify.c:565
+#: ../svn/notify.c:585
#, c-format
msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n"
msgstr "> avslog stycke @@ -%lu,%lu +%lu,%lu @@\n"
-#: ../svn/notify.c:579
+#: ../svn/notify.c:599
#, c-format
msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n"
msgstr "> stycke ## -%lu,%lu +%lu,%lu ## redan anbragt (%s)\n"
-#: ../svn/notify.c:589
+#: ../svn/notify.c:609
#, c-format
msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n"
msgstr "> stycke @@ -%lu,%lu +%lu,%lu @@ redan anbragt\n"
-#: ../svn/notify.c:649
+#: ../svn/notify.c:669
#, c-format
msgid ""
"\n"
@@ -9321,87 +9538,87 @@
"\n"
"Hämtar externt objekt till \"%s\":\n"
-#: ../svn/notify.c:675
+#: ../svn/notify.c:695
#, c-format
msgid "Error handling externals definition for '%s':"
msgstr "Fel vid hantering av externa definitionen för \"%s\":"
-#: ../svn/notify.c:688
+#: ../svn/notify.c:708
#, c-format
msgid "Updating '%s':\n"
msgstr "Uppdaterar \"%s\":\n"
-#: ../svn/notify.c:702
+#: ../svn/notify.c:722
#, c-format
msgid "Exported external at revision %ld.\n"
msgstr "Exporterade extern katalog vid revision %ld.\n"
-#: ../svn/notify.c:703
+#: ../svn/notify.c:723
#, c-format
msgid "Exported revision %ld.\n"
msgstr "Exporterade revision %ld.\n"
-#: ../svn/notify.c:711
+#: ../svn/notify.c:731
#, c-format
msgid "Checked out external at revision %ld.\n"
msgstr "Checkade ut extern katalog vid revision %ld.\n"
-#: ../svn/notify.c:712
+#: ../svn/notify.c:732
#, c-format
msgid "Checked out revision %ld.\n"
msgstr "Checkade ut revision %ld.\n"
-#: ../svn/notify.c:723
+#: ../svn/notify.c:743
#, c-format
msgid "Updated external to revision %ld.\n"
msgstr "Uppdaterade extern katalog till revision %ld.\n"
-#: ../svn/notify.c:724
+#: ../svn/notify.c:744
#, c-format
msgid "Updated to revision %ld.\n"
msgstr "Uppdaterade till revision %ld.\n"
-#: ../svn/notify.c:732
+#: ../svn/notify.c:752
#, c-format
msgid "External at revision %ld.\n"
msgstr "Extern katalog är på revision %ld.\n"
-#: ../svn/notify.c:733
+#: ../svn/notify.c:753
#, c-format
msgid "At revision %ld.\n"
msgstr "Är på revision %ld.\n"
-#: ../svn/notify.c:745
+#: ../svn/notify.c:765
#, c-format
msgid "External export complete.\n"
msgstr "Extern export klar.\n"
-#: ../svn/notify.c:746
+#: ../svn/notify.c:766
#, c-format
msgid "Export complete.\n"
msgstr "Export klar.\n"
-#: ../svn/notify.c:753
+#: ../svn/notify.c:773
#, c-format
msgid "External checkout complete.\n"
msgstr "Extern utcheckning klar.\n"
-#: ../svn/notify.c:754
+#: ../svn/notify.c:774
#, c-format
msgid "Checkout complete.\n"
msgstr "Utcheckning klar.\n"
-#: ../svn/notify.c:761
+#: ../svn/notify.c:781
#, c-format
msgid "External update complete.\n"
msgstr "Extern uppdatering klar.\n"
-#: ../svn/notify.c:762
+#: ../svn/notify.c:782
#, c-format
msgid "Update complete.\n"
msgstr "Uppdatering klar.\n"
-#: ../svn/notify.c:778
+#: ../svn/notify.c:798
#, c-format
msgid ""
"\n"
@@ -9410,197 +9627,197 @@
"\n"
"Utför statuskontroll av externt objekt vid \"%s\":\n"
-#: ../svn/notify.c:786
+#: ../svn/notify.c:806
#, c-format
msgid "Status against revision: %6ld\n"
msgstr "Status gentemot revision: %6ld\n"
-#: ../svn/notify.c:795
+#: ../svn/notify.c:815
#, c-format
msgid "Sending copy of %s\n"
msgstr "Skickar kopia av %s\n"
-#: ../svn/notify.c:796
+#: ../svn/notify.c:816
#, c-format
msgid "Sending %s\n"
msgstr "Skickar %s\n"
-#: ../svn/notify.c:807
+#: ../svn/notify.c:827
#, c-format
msgid "Adding copy of (bin) %s\n"
msgstr "Lägger till kopia av (binär) %s\n"
-#: ../svn/notify.c:808
+#: ../svn/notify.c:828
#, c-format
msgid "Adding (bin) %s\n"
msgstr "Lägger till (binär) %s\n"
-#: ../svn/notify.c:816
+#: ../svn/notify.c:836
#, c-format
msgid "Adding copy of %s\n"
msgstr "Lägger till kopia av %s\n"
-#: ../svn/notify.c:817
+#: ../svn/notify.c:837
#, c-format
msgid "Adding %s\n"
msgstr "Lägger till %s\n"
-#: ../svn/notify.c:826
+#: ../svn/notify.c:846
#, c-format
msgid "Deleting copy of %s\n"
msgstr "Raderar kopia av %s\n"
-#: ../svn/notify.c:827
+#: ../svn/notify.c:847
#, c-format
msgid "Deleting %s\n"
msgstr "Raderar %s\n"
-#: ../svn/notify.c:836
+#: ../svn/notify.c:856
#, c-format
msgid "Replacing copy of %s\n"
msgstr "Ersätter kopia av %s\n"
-#: ../svn/notify.c:837
+#: ../svn/notify.c:857
#, c-format
msgid "Replacing %s\n"
msgstr "Ersätter %s\n"
-#: ../svn/notify.c:847 ../svnsync/sync.c:327
+#: ../svn/notify.c:867 ../svnsync/sync.c:327
#, c-format
msgid "Transmitting file data "
msgstr "Skickar filinnehåll "
-#: ../svn/notify.c:856 ../svnadmin/svnadmin.c:1686
+#: ../svn/notify.c:876 ../svnadmin/svnadmin.c:1698
#, c-format
msgid "'%s' locked by user '%s'.\n"
msgstr "\"%s\" låstes av användaren \"%s\".\n"
-#: ../svn/notify.c:862
+#: ../svn/notify.c:882
#, c-format
msgid "'%s' unlocked.\n"
msgstr "\"%s\" låstes upp.\n"
-#: ../svn/notify.c:889
+#: ../svn/notify.c:909
#, c-format
msgid "--- Merging differences between repository URLs into '%s':\n"
msgstr "--- Slår samman skillnader mellan arkiv-URL:er i \"%s\":\n"
-#: ../svn/notify.c:894
+#: ../svn/notify.c:914
#, c-format
msgid "--- Merging r%ld into '%s':\n"
msgstr "--- Sammanslagning av r%ld i \"%s\":\n"
-#: ../svn/notify.c:898
+#: ../svn/notify.c:918
#, c-format
msgid "--- Reverse-merging r%ld into '%s':\n"
msgstr "--- Omvänd sammanslagning av r%ld i \"%s\":\n"
-#: ../svn/notify.c:902
+#: ../svn/notify.c:922
#, c-format
msgid "--- Merging r%ld through r%ld into '%s':\n"
msgstr "--- Sammanslagning av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:908
+#: ../svn/notify.c:928
#, c-format
msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
msgstr "--- Omvänd sammanslagning av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:920
+#: ../svn/notify.c:940
#, c-format
msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n"
msgstr "--- Noterar information om sammanslagning mellan arkiv-URL:er i \"%s\":\n"
-#: ../svn/notify.c:930
+#: ../svn/notify.c:950
#, c-format
msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n"
msgstr "--- Noterar information om sammanslagning av r%ld i \"%s\":\n"
-#: ../svn/notify.c:935
+#: ../svn/notify.c:955
#, c-format
msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n"
msgstr "--- Noterar information om omvänd sammanslagning av r%ld i \"%s\":\n"
-#: ../svn/notify.c:940
+#: ../svn/notify.c:960
#, c-format
msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n"
msgstr "--- Noterar information om sammanslagning av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:945
+#: ../svn/notify.c:965
#, c-format
msgid "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n"
msgstr "--- Noterar information om omvänd sammanslagning av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:955
+#: ../svn/notify.c:975
#, c-format
msgid "--- Eliding mergeinfo from '%s':\n"
msgstr "--- Utelämnar information om sammanslagning från \"%s\":\n"
-#: ../svn/notify.c:963
+#: ../svn/notify.c:983
#, c-format
msgid "--- Merging differences between foreign repository URLs into '%s':\n"
msgstr "--- Sammanslagning av skillnader mellan andra arkiv-URL:er i \"%s\":\n"
-#: ../svn/notify.c:969
+#: ../svn/notify.c:989
#, c-format
msgid "--- Merging (from foreign repository) r%ld into '%s':\n"
msgstr "--- Sammanslagning (från annat arkiv) av r%ld i \"%s\":\n"
-#: ../svn/notify.c:974
+#: ../svn/notify.c:994
#, c-format
msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n"
msgstr "--- Omvänd sammanslagning (från annat arkiv) av r%ld i \"%s\":\n"
-#: ../svn/notify.c:979
+#: ../svn/notify.c:999
#, c-format
msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n"
msgstr "--- Sammanslagning (från annat arkiv) av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:985
+#: ../svn/notify.c:1005
#, c-format
msgid "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n"
msgstr "--- Omvänd sammanslagning (från annat arkiv) av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:1021
+#: ../svn/notify.c:1041
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "satte egenskapen \"%s\" på \"%s\"\n"
-#: ../svn/notify.c:1029
+#: ../svn/notify.c:1049
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "egenskapen \"%s\" raderades från \"%s\".\n"
-#: ../svn/notify.c:1037
+#: ../svn/notify.c:1057
#, c-format
msgid "Attempting to delete nonexistent property '%s' on '%s'\n"
msgstr "Försök att ta bort den icke existerande egenskapen \"%s\" på \"%s\"\n"
-#: ../svn/notify.c:1046
+#: ../svn/notify.c:1066
#, c-format
msgid "property '%s' set on repository revision %ld\n"
msgstr "satte egenskapen \"%s\" på revision %ld i arkivet\n"
-#: ../svn/notify.c:1054
+#: ../svn/notify.c:1074
#, c-format
msgid "property '%s' deleted from repository revision %ld\n"
msgstr "egenskapen \"%s\" raderades från revision %ld i arkivet\n"
-#: ../svn/notify.c:1061
+#: ../svn/notify.c:1081
#, c-format
msgid "Upgraded '%s'\n"
msgstr "Uppgraderade \"%s\"\n"
-#: ../svn/notify.c:1067
+#: ../svn/notify.c:1087
#, c-format
msgid "Redirecting to URL '%s':\n"
msgstr "Omleder till URL \"%s\":\n"
-#: ../svn/notify.c:1095
+#: ../svn/notify.c:1115
#, c-format
msgid "--- Copying from foreign repository URL '%s':\n"
msgstr "--- Kopierar från annat arkiv med URL \"%s\":\n"
-#: ../svn/notify.c:1104
+#: ../svn/notify.c:1124
#, c-format
msgid "Breaking move with source path '%s'\n"
msgstr "Bruten flyttning med källsökväg \"%s\"\n"
@@ -9653,8 +9870,8 @@
msgstr "Fel vid skrivning till ström"
#: ../svn/propget-cmd.c:186 ../svn/proplist-cmd.c:156
-#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1732
-#: ../svnlook/svnlook.c:1886
+#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1754
+#: ../svnlook/svnlook.c:1908
#, c-format
msgid ""
"Inherited properties on '%s',\n"
@@ -9665,7 +9882,7 @@
#. Not a --revprop
#: ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:175
-#: ../svnlook/svnlook.c:1768 ../svnlook/svnlook.c:1921
+#: ../svnlook/svnlook.c:1790 ../svnlook/svnlook.c:1943
#, c-format
msgid "Properties on '%s':\n"
msgstr "Egenskaper på \"%s\":\n"
@@ -9787,15 +10004,15 @@
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr "Mål måste anges (\"%s\" tolkas som egenskapsvärde)"
-#: ../svn/resolve-cmd.c:82
+#: ../svn/resolve-cmd.c:79
msgid "missing --accept option"
msgstr "flaggan --accept saknas"
-#: ../svn/resolve-cmd.c:87
+#: ../svn/resolve-cmd.c:84
msgid "invalid 'accept' ARG"
msgstr "ogiltigt \"accept\"-argument"
-#: ../svn/resolve-cmd.c:149
+#: ../svn/resolve-cmd.c:127
msgid "Failure occurred resolving one or more conflicts"
msgstr "Fel vid lösning av en eller flera konflikter"
@@ -9803,22 +10020,22 @@
msgid "Try 'svn revert --depth infinity' instead?"
msgstr "Försök med \"svn revert --depth infinity\" istället?"
-#: ../svn/status-cmd.c:94
+#: ../svn/status-cmd.c:97
#, c-format
msgid " Text conflicts: %u\n"
msgstr " Textkonflikter: %u\n"
-#: ../svn/status-cmd.c:98
+#: ../svn/status-cmd.c:101
#, c-format
msgid " Property conflicts: %u\n"
msgstr " Egenskapskonflikter: %u\n"
-#: ../svn/status-cmd.c:102
+#: ../svn/status-cmd.c:105
#, c-format
msgid " Tree conflicts: %u\n"
msgstr " Trädkonflikter: %u\n"
-#: ../svn/status-cmd.c:388
+#: ../svn/status-cmd.c:397
#, c-format
msgid ""
"\n"
@@ -9827,55 +10044,55 @@
"\n"
"--- Ändringslista \"%s\":\n"
-#: ../svn/status.c:302
+#: ../svn/status.c:318
#, c-format
msgid "swapped places with %s"
msgstr "bytt plats med %s"
-#: ../svn/status.c:316
+#: ../svn/status.c:333
#, c-format
msgid "moved from %s"
msgstr "flyttad från %s"
-#: ../svn/status.c:327
+#: ../svn/status.c:345
#, c-format
msgid "moved to %s"
msgstr "flyttad till %s"
-#: ../svn/svn.c:146
+#: ../svn/svn.c:147
msgid "force operation to run"
msgstr "tvinga operationen att utföras"
-#: ../svn/svn.c:148
+#: ../svn/svn.c:149
msgid "force validity of log message source"
msgstr "acceptera alltid det angivna loggmeddelandet"
-#: ../svn/svn.c:149 ../svn/svn.c:150 ../svnadmin/svnadmin.c:208
-#: ../svnadmin/svnadmin.c:211 ../svndumpfilter/svndumpfilter.c:1018
-#: ../svndumpfilter/svndumpfilter.c:1021 ../svnlook/svnlook.c:111
-#: ../svnlook/svnlook.c:123 ../svnsync/svnsync.c:243 ../svnsync/svnsync.c:245
+#: ../svn/svn.c:150 ../svn/svn.c:151 ../svnadmin/svnadmin.c:208
+#: ../svnadmin/svnadmin.c:211 ../svndumpfilter/svndumpfilter.c:1019
+#: ../svndumpfilter/svndumpfilter.c:1022 ../svnlook/svnlook.c:114
+#: ../svnlook/svnlook.c:126 ../svnsync/svnsync.c:244 ../svnsync/svnsync.c:246
msgid "show help on a subcommand"
msgstr "visa hjälp för ett underkommando"
-#: ../svn/svn.c:151
+#: ../svn/svn.c:152
msgid "specify log message ARG"
msgstr "ange loggmeddelande ARG"
-#: ../svn/svn.c:152
+#: ../svn/svn.c:153
msgid "print nothing, or only summary information"
msgstr "ingen utmatning, eller bara sammanfattning"
-#: ../svn/svn.c:153
+#: ../svn/svn.c:154
msgid "descend recursively, same as --depth=infinity"
msgstr "gå ner rekursivt, som --depth=infinity"
-#: ../svn/svn.c:154
+#: ../svn/svn.c:155
msgid "obsolete; try --depth=files or --depth=immediates"
msgstr ""
"föråldrat; försök med --depth=files\n"
" eller --depth=immediates"
-#: ../svn/svn.c:156
+#: ../svn/svn.c:157
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1\n"
@@ -9888,7 +10105,7 @@
" Om ARG är på formen ARG1-ARG2 så är detta samma\n"
" som ARG1:ARG2, där ARG1 ingår"
-#: ../svn/svn.c:164
+#: ../svn/svn.c:165
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -9911,44 +10128,44 @@
" arkiveringen vid eller före BASE\n"
" \"PREV\" revisionen före COMMITTED"
-#: ../svn/svn.c:179
+#: ../svn/svn.c:180
msgid "read log message from file ARG"
msgstr "läs loggmeddelande från filen ARG"
-#: ../svn/svn.c:181
+#: ../svn/svn.c:182
msgid "give output suitable for concatenation"
msgstr "skapa utdata som kan slås ihop"
-#: ../svn/svn.c:183
+#: ../svn/svn.c:184
msgid "treat value as being in charset encoding ARG"
msgstr ""
"betrakta värdet som om det använder\n"
" teckenkodningen ARG"
-#: ../svn/svn.c:184 ../svnadmin/svnadmin.c:214
-#: ../svndumpfilter/svndumpfilter.c:1024 ../svnlook/svnlook.c:165
-#: ../svnrdump/svnrdump.c:144 ../svnserve/svnserve.c:287
-#: ../svnsync/svnsync.c:241 ../svnversion/svnversion.c:140
+#: ../svn/svn.c:185 ../svnadmin/svnadmin.c:214
+#: ../svndumpfilter/svndumpfilter.c:1025 ../svnlook/svnlook.c:168
+#: ../svnrdump/svnrdump.c:144 ../svnserve/svnserve.c:289
+#: ../svnsync/svnsync.c:242 ../svnversion/svnversion.c:141
msgid "show program version information"
msgstr "visa programversionsinformation"
-#: ../svn/svn.c:185
+#: ../svn/svn.c:186
msgid "print extra information"
msgstr "visa extrainformation"
-#: ../svn/svn.c:186
+#: ../svn/svn.c:187
msgid "display update information"
msgstr "visa uppdateringsinformation"
-#: ../svn/svn.c:187 ../svnrdump/svnrdump.c:128
+#: ../svn/svn.c:188 ../svnrdump/svnrdump.c:128
msgid "specify a username ARG"
msgstr "ange ett användarnamn ARG"
-#: ../svn/svn.c:188 ../svnrdump/svnrdump.c:130
+#: ../svn/svn.c:189 ../svnrdump/svnrdump.c:130
msgid "specify a password ARG"
msgstr "ange ett lösenord ARG"
-#: ../svn/svn.c:190
+#: ../svn/svn.c:191
msgid ""
"Specify differencing options for external diff or\n"
" internal diff or blame. Default: '-u'. Options are\n"
@@ -9974,13 +10191,13 @@
" Bortse från ändringar av radslutstecken\n"
" -p, --show-c-function: Visa funktionsnamn i C"
-#: ../svn/svn.c:208
+#: ../svn/svn.c:209
msgid "pass contents of file ARG as additional args"
msgstr ""
"använd innehållet i filen ARG som ytterligare\n"
" argument"
-#: ../svn/svn.c:210
+#: ../svn/svn.c:211
msgid ""
"limit operation by depth ARG ('empty', 'files',\n"
" 'immediates', or 'infinity')"
@@ -9988,7 +10205,7 @@
"begränsa kommandot till djupet ARG (\"empty\",\n"
" \"files\", \"immediates\" eller \"infinity\")"
-#: ../svn/svn.c:214
+#: ../svn/svn.c:215
msgid ""
"set new working copy depth to ARG ('exclude',\n"
" 'empty', 'files', 'immediates', or 'infinity')"
@@ -9996,19 +10213,19 @@
"sätt arbetskopians djup till ARG (\"exclude\",\n"
" \"empty\", \"files\", \"immediates\" eller \"infinity\")"
-#: ../svn/svn.c:217 ../svnlook/svnlook.c:168
+#: ../svn/svn.c:218 ../svnlook/svnlook.c:171
msgid "output in XML"
msgstr "visa information som XML"
-#: ../svn/svn.c:218
+#: ../svn/svn.c:219
msgid "use strict semantics"
msgstr "använd strikt semantik"
-#: ../svn/svn.c:220
+#: ../svn/svn.c:221
msgid "do not cross copies while traversing history"
msgstr "följ inte kopieringar när historiken gås igenom"
-#: ../svn/svn.c:222
+#: ../svn/svn.c:223
msgid ""
"disregard default and svn:ignore and\n"
" svn:global-ignores property ignores"
@@ -10016,11 +10233,11 @@
"bortse ifrån svn:ignore, svn:global-ignores och\n"
" standarduteslutningar"
-#: ../svn/svn.c:226 ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:187
+#: ../svn/svn.c:227 ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:188
msgid "do not cache authentication tokens"
msgstr "cacha inte autentiseringsinformation"
-#: ../svn/svn.c:228 ../svnrdump/svnrdump.c:154 ../svnsync/svnsync.c:197
+#: ../svn/svn.c:229 ../svnrdump/svnrdump.c:154 ../svnsync/svnsync.c:198
msgid ""
"accept SSL server certificates from unknown\n"
" certificate authorities without prompting (but only\n"
@@ -10029,7 +10246,7 @@
"godta SSL-servercertifikat från okända utfärdare\n"
" utan att fråga (men bara med \"--non-interactive\")"
-#: ../svn/svn.c:234 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:179
+#: ../svn/svn.c:235 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:180
msgid ""
"do no interactive prompting (default is to prompt\n"
" only if standard input is a terminal device)"
@@ -10037,7 +10254,7 @@
"ingen interaktiv fråga (vanligtvis ställs frågor\n"
" bara om standardinmatningen är en terminal)"
-#: ../svn/svn.c:238 ../svnrdump/svnrdump.c:136 ../svnsync/svnsync.c:183
+#: ../svn/svn.c:239 ../svnrdump/svnrdump.c:136 ../svnsync/svnsync.c:184
msgid ""
"do interactive prompting even if standard input\n"
" is not a terminal device"
@@ -10045,58 +10262,58 @@
"ställ interaktiva frågor även om\n"
" standardinmatningen inte är en terminal"
-#: ../svn/svn.c:242
+#: ../svn/svn.c:243
msgid "try operation but make no changes"
msgstr "testa operationen, men gör inga ändringar"
-#: ../svn/svn.c:244
+#: ../svn/svn.c:245
msgid "disable merge tracking; diff nodes as if related"
msgstr ""
"stäng av sammanslagningsföljning; jämför som om\n"
" noderna var besläktade"
-#: ../svn/svn.c:246
+#: ../svn/svn.c:247
msgid "ignore externals definitions"
msgstr "bortse ifrån externals-definitioner"
-#: ../svn/svn.c:247
+#: ../svn/svn.c:248
msgid "use ARG as merge command"
msgstr "använd ARG som merge-kommando"
-#: ../svn/svn.c:248
+#: ../svn/svn.c:249
msgid "use ARG as external editor"
msgstr "använd ARG som extern editor"
-#: ../svn/svn.c:250
+#: ../svn/svn.c:251
msgid "merge only mergeinfo differences"
msgstr ""
"slå bara ihop skillnader i\n"
" sammanslagningsinformationen"
-#: ../svn/svn.c:251
+#: ../svn/svn.c:252
msgid "use ARG as the older target"
msgstr "använd ARG som det äldre målet"
-#: ../svn/svn.c:252
+#: ../svn/svn.c:253
msgid "use ARG as the newer target"
msgstr "använd ARG som det nyare målet"
-#: ../svn/svn.c:254
+#: ../svn/svn.c:255
msgid "operate on a revision property (use with -r)"
msgstr "arbeta med en revisionsegenskap (används med -r)"
-#: ../svn/svn.c:255
+#: ../svn/svn.c:256
msgid "relocate via URL-rewriting"
msgstr "omlokalisera genom att skriva om URL:er"
-#: ../svn/svn.c:257 ../svnadmin/svnadmin.c:256 ../svnrdump/svnrdump.c:126
-#: ../svnsync/svnsync.c:211
+#: ../svn/svn.c:258 ../svnadmin/svnadmin.c:256 ../svnrdump/svnrdump.c:126
+#: ../svnsync/svnsync.c:212
msgid "read user configuration files from directory ARG"
msgstr ""
"läs användarens konfigurationsfiler från katalogen\n"
" ARG"
-#: ../svn/svn.c:259 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:213
+#: ../svn/svn.c:260 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:214
msgid ""
"set user configuration option in the format:\n"
" FILE:SECTION:OPTION=[VALUE]\n"
@@ -10108,15 +10325,15 @@
" Till exempel:\n"
" servers:global:http-library=serf"
-#: ../svn/svn.c:266
+#: ../svn/svn.c:267
msgid "enable automatic properties"
msgstr "aktivera automatiska egenskaper"
-#: ../svn/svn.c:267
+#: ../svn/svn.c:268
msgid "disable automatic properties"
msgstr "deaktivera automatiska egenskaper"
-#: ../svn/svn.c:269
+#: ../svn/svn.c:270
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -10128,39 +10345,39 @@
" \"eol-style\" satt till \"native\". ARG kan vara\n"
" något av \"LF\", \"CR\" och \"CRLF\""
-#: ../svn/svn.c:276
+#: ../svn/svn.c:277
msgid "maximum number of log entries"
msgstr "maximalt antal loggposter"
-#: ../svn/svn.c:277
+#: ../svn/svn.c:278
msgid "don't unlock the targets"
msgstr "lås inte upp målen"
-#: ../svn/svn.c:278
+#: ../svn/svn.c:279
msgid "remove changelist association"
msgstr "ta bort koppling till ändringslista"
-#: ../svn/svn.c:280
+#: ../svn/svn.c:281
msgid "operate only on members of changelist ARG"
msgstr "arbeta endast med medlemmar av ändringslistan ARG"
-#: ../svn/svn.c:282
+#: ../svn/svn.c:283
msgid "don't delete changelists after commit"
msgstr "ta inte bort ändringslistor efter arkivering"
-#: ../svn/svn.c:283
+#: ../svn/svn.c:284
msgid "keep path in working copy"
msgstr "behåll sökväg i arbetskopia"
-#: ../svn/svn.c:285
+#: ../svn/svn.c:286
msgid "retrieve all revision properties"
msgstr "hämta alla revisionsegenskaper"
-#: ../svn/svn.c:287
+#: ../svn/svn.c:288
msgid "retrieve no revision properties"
msgstr "hämta inga revisionsegenskaper"
-#: ../svn/svn.c:289
+#: ../svn/svn.c:290
msgid ""
"set revision property ARG in new revision\n"
" using the name[=value] format"
@@ -10168,11 +10385,11 @@
"sätt revisionsegenskapen ARG i ny revision\n"
" på formatet namn[=värde]"
-#: ../svn/svn.c:292
+#: ../svn/svn.c:293
msgid "make intermediate directories"
msgstr "skapa mellanliggande kataloger"
-#: ../svn/svn.c:294
+#: ../svn/svn.c:295
msgid ""
"use/display additional information from merge\n"
" history"
@@ -10180,7 +10397,7 @@
"använd/visa ytterligare information från\n"
" sammanslagningshistorien"
-#: ../svn/svn.c:298
+#: ../svn/svn.c:299
msgid ""
"specify automatic conflict resolution action\n"
" ('postpone', 'working', 'base', 'mine-conflict',\n"
@@ -10195,7 +10412,7 @@
" (förkortningar: \"p\", \"mc\", \"tc\", \"mf\", \"tf\",\n"
" \"e\", \"l\")"
-#: ../svn/svn.c:309
+#: ../svn/svn.c:310
msgid ""
"specify which collection of revisions to display\n"
" ('merged', 'eligible')"
@@ -10203,11 +10420,11 @@
"ange slag av revisioner att visa\n"
" (\"merged\", \"eligible\")"
-#: ../svn/svn.c:313
+#: ../svn/svn.c:314
msgid "deprecated"
msgstr "avrådes"
-#: ../svn/svn.c:315
+#: ../svn/svn.c:316
msgid ""
"number of leading path components to strip from\n"
" paths parsed from the patch file. --strip 0\n"
@@ -10227,67 +10444,67 @@
" Katalogseparatorn är \"/\" på alla plattformar.\n"
" Ett \"/\" i början räknas som en katalog."
-#: ../svn/svn.c:331
+#: ../svn/svn.c:332
msgid "don't expand keywords"
msgstr "expandera inte nyckelord"
-#: ../svn/svn.c:333
+#: ../svn/svn.c:334
msgid "apply the unidiff in reverse"
msgstr "anbringa unidiffen baklänges"
-#: ../svn/svn.c:335
+#: ../svn/svn.c:336
msgid "ignore whitespace during pattern matching"
msgstr "strunta i tomrum vid mönstermatchning"
-#: ../svn/svn.c:336
+#: ../svn/svn.c:337
msgid "produce diff output"
msgstr "utdata i form av skillnader"
#. maps to show_diff
#. diff options
-#: ../svn/svn.c:338 ../svnlook/svnlook.c:135
+#: ../svn/svn.c:339 ../svnlook/svnlook.c:138
msgid "use ARG as diff command"
msgstr "använd ARG som diff-kommando"
-#: ../svn/svn.c:340
+#: ../svn/svn.c:341
msgid "override diff-cmd specified in config file"
msgstr "kringgå \"diff-cmd\" angiven i inställningsfilen"
-#: ../svn/svn.c:342 ../svnlook/svnlook.c:129
+#: ../svn/svn.c:343 ../svnlook/svnlook.c:132
msgid "do not print differences for added files"
msgstr "visa inte skillnader för tillagda filer"
-#: ../svn/svn.c:344 ../svnlook/svnlook.c:132
+#: ../svn/svn.c:345 ../svnlook/svnlook.c:135
msgid "do not print differences for deleted files"
msgstr "visa inte skillnader för raderade filer"
-#: ../svn/svn.c:346
+#: ../svn/svn.c:347
msgid "don't diff copied or moved files with their source"
msgstr ""
"jämför inte kopierade eller flyttade filer\n"
" med deras källa"
-#: ../svn/svn.c:348
+#: ../svn/svn.c:349
msgid "diff unrelated nodes as delete and add"
msgstr "jämför obesläktade noder som radering och tillägg"
-#: ../svn/svn.c:349
+#: ../svn/svn.c:350
msgid "show a summary of the results"
msgstr "visa en sammanfattning av resultatet"
-#: ../svn/svn.c:351
+#: ../svn/svn.c:352
msgid "use git's extended diff format"
msgstr "använd git:s utökade format"
-#: ../svn/svn.c:353 ../svnlook/svnlook.c:138
+#: ../svn/svn.c:354 ../svnlook/svnlook.c:141
msgid "ignore properties during the operation"
msgstr "strunta i egenskaper"
-#: ../svn/svn.c:355 ../svnlook/svnlook.c:141
+#: ../svn/svn.c:356 ../svnlook/svnlook.c:144
msgid "show only properties during the operation"
msgstr "visa endast egenskaper"
-#: ../svn/svn.c:357
+#: ../svn/svn.c:358
msgid ""
"generate diff suitable for generic third-party\n"
" patch tools; currently the same as\n"
@@ -10297,7 +10514,7 @@
" patch-verktyg; för närvarande samma som\n"
" \"--show-copies-as-adds --ignore-properties\""
-#: ../svn/svn.c:365
+#: ../svn/svn.c:366
msgid ""
"Allow operation on mixed-revision working copy.\n"
" Use of this option is not recommended!\n"
@@ -10307,7 +10524,7 @@
" Användning av denna flagga rekommenderas inte!\n"
" Kör \"svn update\" istället."
-#: ../svn/svn.c:371
+#: ../svn/svn.c:372
msgid ""
"Also commit file and dir externals reached by\n"
" recursion. This does not include externals with a\n"
@@ -10317,19 +10534,19 @@
" rekursivt, utom externa objekt med en\n"
" angiven revision. (Se egenskapen svn:externals)"
-#: ../svn/svn.c:377
+#: ../svn/svn.c:378
msgid "retrieve target's inherited properties"
msgstr "hämta målets ärvda egenskaper"
-#: ../svn/svn.c:379
+#: ../svn/svn.c:380
msgid "use ARG as search pattern (glob syntax)"
msgstr "använd ARG som sökmönster (skalsyntax)"
-#: ../svn/svn.c:381
+#: ../svn/svn.c:382
msgid "combine ARG with the previous search pattern"
msgstr "kombinera ARG med föregående sökmönster"
-#: ../svn/svn.c:429
+#: ../svn/svn.c:430
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -10339,11 +10556,11 @@
"läggas till i arkivet. De kommer att läggas till vid nästa arkivering.\n"
"användning: add PATH...\n"
-#: ../svn/svn.c:434
+#: ../svn/svn.c:435
msgid "add intermediate parents"
msgstr "skapa mellanliggande förälderkataloger"
-#: ../svn/svn.c:437
+#: ../svn/svn.c:438
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -10358,7 +10575,7 @@
"\n"
"Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
-#: ../svn/svn.c:446
+#: ../svn/svn.c:447
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -10371,7 +10588,7 @@
"\n"
"Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
-#: ../svn/svn.c:454
+#: ../svn/svn.c:455
msgid ""
"Associate (or dissociate) changelist CLNAME with the named files.\n"
"usage: 1. changelist CLNAME PATH...\n"
@@ -10382,7 +10599,7 @@
"användning: 1. changelist ÄLNAMN SÖKVÄG...\n"
" 2. changelist --remove SÖKVÄG...\n"
-#: ../svn/svn.c:460
+#: ../svn/svn.c:461
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -10432,17 +10649,37 @@
" Se även \"svn help update\" för en lista av möjliga tecken i rapporten\n"
" om vilken åtgärd som utfördes.\n"
-#: ../svn/svn.c:487
+#: ../svn/svn.c:488
msgid ""
-"Recursively clean up the working copy, removing locks, resuming\n"
+"Recursively clean up the working copy, removing write locks, resuming\n"
"unfinished operations, etc.\n"
"usage: cleanup [WCPATH...]\n"
+"\n"
+" Finish any unfinished business in the working copy at WCPATH, and remove\n"
+" write locks (shown as 'L' by the 'svn status' command) from the working\n"
+" copy. Usually, this is only necessary if a Subversion client has crashed\n"
+" while using the working copy, leaving it in an unusable state.\n"
+"\n"
+" WARNING: There is no mechanism that will protect write locks still\n"
+" being used by other Subversion clients. Running this command\n"
+" while another client is using the working copy can corrupt\n"
+" the working copy beyond repair!\n"
msgstr ""
-"Städa i arbetskopian och dess underkataloger rekursivt. Lås tas bort,\n"
-"avbrutna operationer återupptas o.s.v.\n"
+"Städa i arbetskopian och dess underkataloger rekursivt.\n"
+"Skrivlås tas bort, avbrutet arbete återupptas o.s.v.\n"
"användning: cleanup [AKSÖKVÄG...]\n"
+"\n"
+" Slutför ofullbordat arbete i arbetskopian i AKSÖKVÄG och ta bort skrivlås\n"
+" (visade som \"L\" av kommandot \"svn status\") från arbetskopian. Vanligtvis\n"
+" är detta bara nödvändigt om en Subversionklient kraschade medan en\n"
+" arbetskopia användes och lämnade den i ett oanvändbart tillstånd.\n"
+"\n"
+" VARNING: Det finns ingen mekanism som skyddar skrivlås som fortfarande\n"
+" används av en annan Subversionklient. Om detta kommando körs\n"
+" medan en annan klient använder arbetskopian kan denna förstöras\n"
+" utan möjlighet till reparation!\n"
-#: ../svn/svn.c:493
+#: ../svn/svn.c:504
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -10460,7 +10697,7 @@
" Om något mål är låst (eller innehåller låsta objekt), kommer dessa att\n"
" låsas upp efter en lyckad arkivering.\n"
-#: ../svn/svn.c:504
+#: ../svn/svn.c:515
msgid ""
"Copy files and directories in a working copy or repository.\n"
"usage: copy SRC[@REV]... DST\n"
@@ -10497,7 +10734,7 @@
" (AK -> AK). Därför kommer normalt inte information för sammanslagnings-\n"
" följning överföras från kopieringens källa till dess mål.\n"
-#: ../svn/svn.c:523
+#: ../svn/svn.c:534
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -10527,7 +10764,7 @@
" 2. Varje objekt som anges med en URL raderas från arkivet genom en\n"
" omedelbar arkivering.\n"
-#: ../svn/svn.c:539
+#: ../svn/svn.c:550
msgid ""
"Display local changes or differences between two revisions or paths.\n"
"usage: 1. diff\n"
@@ -10610,7 +10847,7 @@
" 6. Kortare sätt att skriva\n"
" \"svn diff --old=GAMMAL-SÖKVÄG[@GAMMALREV] --new=NY-URL[@NYREV]\".\n"
-#: ../svn/svn.c:580
+#: ../svn/svn.c:591
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -10647,7 +10884,7 @@
"\n"
" Om FIXREV är angiven, anger den i vilken revision målet först letas upp.\n"
-#: ../svn/svn.c:602
+#: ../svn/svn.c:613
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -10655,7 +10892,7 @@
"Visa hur detta program eller dess underkommandon används.\n"
"användning: help [UNDERKOMMANDO...]\n"
-#: ../svn/svn.c:608
+#: ../svn/svn.c:619
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -10678,7 +10915,7 @@
" Objekt som ej kan versionshanteras, såsom enhetsfiler och rörledningar,\n"
" hoppas över om --force anges.\n"
-#: ../svn/svn.c:622
+#: ../svn/svn.c:633
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -10694,7 +10931,7 @@
" MÅL kan antingen vara en arbetskopia eller en URL. Om REV anges, avgör\n"
" den i vilken revision målet letas upp.\n"
-#: ../svn/svn.c:632
+#: ../svn/svn.c:643
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -10733,11 +10970,11 @@
" Storlek (i byte)\n"
" Datum och tid för senaste arkiveringen\n"
-#: ../svn/svn.c:652
+#: ../svn/svn.c:663
msgid "include externals definitions"
msgstr "tag med externals-definitioner"
-#: ../svn/svn.c:655
+#: ../svn/svn.c:666
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -10752,19 +10989,19 @@
" Använd flaggan --force för att stjäla ett lås från en annan användare eller\n"
" arbetskopia.\n"
-#: ../svn/svn.c:661
+#: ../svn/svn.c:672
msgid "read lock comment from file ARG"
msgstr "läs låskommentar från filen ARG"
-#: ../svn/svn.c:662
+#: ../svn/svn.c:673
msgid "specify lock comment ARG"
msgstr "ange låskommentar ARG"
-#: ../svn/svn.c:663
+#: ../svn/svn.c:674
msgid "force validity of lock comment source"
msgstr "acceptera alltid den angivna låskommentaren"
-#: ../svn/svn.c:666
+#: ../svn/svn.c:677
msgid ""
"Show the log messages for a set of revision(s) and/or path(s).\n"
"usage: 1. log [PATH][@REV]\n"
@@ -10908,11 +11145,11 @@
" Visa loggmeddelandet för revisionen då /branches/gren skapades:\n"
" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/gren\n"
-#: ../svn/svn.c:744
+#: ../svn/svn.c:755
msgid "retrieve revision property ARG"
msgstr "hämta revisionsegenskapen ARG"
-#: ../svn/svn.c:745
+#: ../svn/svn.c:756
msgid "the change made in revision ARG"
msgstr "ändringen gjord i revision ARG"
@@ -10919,11 +11156,11 @@
#. For this large section, let's keep it unindented for easier
#. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw'
#. * (with quotes and newlines removed).
-#: ../svn/svn.c:751
+#: ../svn/svn.c:762
msgid ""
"Merge changes into a working copy.\n"
"usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n"
-" (the 'automatic' merge)\n"
+" (the 'complete' merge)\n"
" 2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
" (the 'cherry-pick' merge)\n"
" 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
@@ -10930,11 +11167,11 @@
" (the '2-URL' merge)\n"
"\n"
" 1. This form, with one source path and no revision range, is called\n"
-" an 'automatic' merge:\n"
+" a 'complete' merge:\n"
"\n"
" svn merge SOURCE[@REV] [TARGET_WCPATH]\n"
"\n"
-" The automatic merge is used for the 'sync' and 'reintegrate' merges\n"
+" The complete merge is used for the 'sync' and 'reintegrate' merges\n"
" in the 'feature branch' pattern described below. It finds all the\n"
" changes on the source branch that have not already been merged to the\n"
" target branch, and merges them into the working copy. Merge tracking\n"
@@ -11073,7 +11310,7 @@
" of 'REV' is the base revision (usually the revision last updated to).\n"
"\n"
" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
-" assumed. The special cases noted above in the 'automatic' merge form\n"
+" assumed. The special cases noted above in the 'complete' merge form\n"
" also apply here.\n"
"\n"
" The revision ranges to be merged are specified by the '-r' and/or '-c'\n"
@@ -11144,7 +11381,7 @@
" The three branches involved can be completely unrelated.\n"
"\n"
" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
-" assumed. The special cases noted above in the 'automatic' merge form\n"
+" assumed. The special cases noted above in the 'complete' merge form\n"
" also apply here.\n"
"\n"
" SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n"
@@ -11251,7 +11488,7 @@
msgstr ""
"Sammanslagning av ändringar i en arbetskopia.\n"
"användning: 1. merge KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n"
-" (\"automatisk\" sammanslagning)\n"
+" (\"fullständig\" sammanslagning)\n"
" 2. merge [-c M[,N...] | -r N:M ...] KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n"
" (sammanslagning av utvalda ändringar)\n"
" 3. merge KÄLLA1[@REV1] KÄLLA2[@REV2] [AKSÖKVÄGSMÅL]\n"
@@ -11258,11 +11495,11 @@
" (sammanslagning av skillnaden mellan 2 URL:er)\n"
"\n"
" 1. Denna form, med en källsökväg och utan revisionsområde, kallas en\n"
-" \"automatisk\" sammanslagning:\n"
+" \"fullständig\" sammanslagning:\n"
"\n"
" svn merge KÄLLA[@REV] [AKSÖKVÄGSMÅL]\n"
"\n"
-" Den automatiska sammanslagningen används för synkronisering och\n"
+" Den fullständiga sammanslagningen används för synkronisering och\n"
" återförening enligt mönstret av \"karaktärsgrenar\" beskrivet nedan.\n"
" Alla ändringar i källgrenen ännu ej införda i målgrenen kommer att\n"
" slås samman med arbetskopian. Sammanslagningsföljning används\n"
@@ -11402,7 +11639,7 @@
" uppdateringen).\n"
"\n"
" AKSÖKVÄGSMÅL är en sökväg till en arbetskopia; om ej angiven antas \".\".\n"
-" De särskilda fallen ovan för den \"automatiska\" sammanslagningsformen\n"
+" De särskilda fallen ovan för den \"fullständiga\" sammanslagningsformen\n"
" gäller även här.\n"
"\n"
" Revisionerna som införas anges med flaggorna \"-r\" och/eller \"-c\".\n"
@@ -11471,7 +11708,7 @@
" De tre inblandade grenarna kan vara helt obesläktade.\n"
"\n"
" AKSÖKVÄGSMÅL är en sökväg till en arbetskopia; om ej angiven antas \".\".\n"
-" De särskilda fallen ovan för den \"automatiska\" sammanslagningsformen\n"
+" De särskilda fallen ovan för den \"fullständiga\" sammanslagningsformen\n"
" gäller även här.\n"
"\n"
" KÄLLA1 och/eller KÄLLA2 kan också anges som sökvägar i en arbetskopia,\n"
@@ -11573,7 +11810,7 @@
" Vidare stöds inte sammanslagningsföljning för sammanslagningar från\n"
" andra arkiv.\n"
-#: ../svn/svn.c:1083
+#: ../svn/svn.c:1094
msgid ""
"Display merge-related information.\n"
"usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
@@ -11583,7 +11820,7 @@
" shows, from left to right:\n"
" the youngest common ancestor of the branches;\n"
" the latest full merge in either direction, and thus the common base\n"
-" that will be used for the next automatic merge;\n"
+" that will be used for the next complete merge;\n"
" the repository path and revision number of the tip of each branch.\n"
"\n"
" 2. Print the revision numbers on SOURCE that have been merged to TARGET\n"
@@ -11612,7 +11849,7 @@
" visar, från vänster till höger:\n"
" grenarnas yngsta gemensamma ursprung;\n"
" den senaste fulla sammanslagningen i endera riktningen, och alltså\n"
-" den gemensamma basen som kommer användas för nästa automatiska\n"
+" den gemensamma basen som kommer användas för nästa fullständiga\n"
" sammanslagning;\n"
" arkivsökväg och revisionsnummer för varje grenspets.\n"
"\n"
@@ -11634,7 +11871,7 @@
"\n"
" Djupet kan vara \"empty\" eller \"infinity\"; standardvärdet är \"empty\".\n"
-#: ../svn/svn.c:1114
+#: ../svn/svn.c:1125
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -11666,7 +11903,7 @@
" I båda fallen måste katalogerna ovanför de angivna redan finnas,\n"
" såvida inte flaggan --parents anges.\n"
-#: ../svn/svn.c:1131
+#: ../svn/svn.c:1142
msgid ""
"Move (rename) an item in a working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -11708,7 +11945,7 @@
" Flaggan --allow-mixed-revision finns till för bakåtkompatibilitet.\n"
" Flaggan --revision saknar användning och bör ej användas.\n"
-#: ../svn/svn.c:1153
+#: ../svn/svn.c:1164
msgid ""
"Apply a patch to a working copy.\n"
"usage: patch PATCHFILE [WCPATH]\n"
@@ -11798,7 +12035,7 @@
" anbringa ändringsfilen, och uppdatera sedan tillbaka till revisionen\n"
" HEAD. På så kan kommer konflikter lösas interaktivt.\n"
-#: ../svn/svn.c:1201
+#: ../svn/svn.c:1212
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -11817,7 +12054,7 @@
" arkivet.\n"
" MÅL används endast för att avgöra vilket arkiv som ska användas.\n"
-#: ../svn/svn.c:1211
+#: ../svn/svn.c:1222
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -11840,7 +12077,7 @@
"\n"
" Se \"svn help propset\" för mer om att sätta egenskaper.\n"
-#: ../svn/svn.c:1223
+#: ../svn/svn.c:1234
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -11882,15 +12119,15 @@
" användas för att slå av detta radslut (bland annat användbart när\n"
" binära egenskaper skickas till en fil).\n"
-#: ../svn/svn.c:1243 ../svn/svn.c:1260
+#: ../svn/svn.c:1254 ../svn/svn.c:1271
msgid "print path, name and value on separate lines"
msgstr "skriv sökväg, namn och värde på skilda rader"
-#: ../svn/svn.c:1244
+#: ../svn/svn.c:1255
msgid "don't print an extra newline"
msgstr "skriv inte ett extra radslut"
-#: ../svn/svn.c:1247
+#: ../svn/svn.c:1258
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -11918,11 +12155,11 @@
" Med --verbose skrivs egenskapsvärdena också ut, som med \"svn propget\n"
" --verbose\". Med --quiet skrivs inte sökvägarna ut.\n"
-#: ../svn/svn.c:1261
+#: ../svn/svn.c:1272
msgid "don't print the path"
msgstr "skriv inte sökvägen"
-#: ../svn/svn.c:1264
+#: ../svn/svn.c:1275
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -12085,11 +12322,11 @@
" \"relativ_URL relativ_sökväg\" med stöd för fixerad revision.\n"
" Rader som börjar med tecknet \"#\" hoppas över.\n"
-#: ../svn/svn.c:1343
+#: ../svn/svn.c:1354
msgid "read property value from file ARG"
msgstr "läs egenskapsvärde från filen ARG"
-#: ../svn/svn.c:1346
+#: ../svn/svn.c:1357
msgid ""
"Relocate the working copy to point to a different repository root URL.\n"
"usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
@@ -12133,7 +12370,7 @@
" svn relocate http://www.exempel.se/arkiv/projekt \\\n"
" svn://svn.exempel.se/arkiv/projekt\n"
-#: ../svn/svn.c:1369
+#: ../svn/svn.c:1380
msgid ""
"Resolve conflicts on working copy files or directories.\n"
"usage: resolve [PATH...]\n"
@@ -12155,7 +12392,7 @@
" konflikter i PATH att lösas enligt ARG.\n"
" Kört på detta sätt är kommandot normalt inte rekursivt (djup \"empty\").\n"
-#: ../svn/svn.c:1379
+#: ../svn/svn.c:1390
msgid ""
"specify automatic conflict resolution source\n"
" ('base', 'working', 'mine-conflict',\n"
@@ -12165,7 +12402,7 @@
" (\"base\", \"working\", \"mine-conflict\",\n"
" \"theirs-conflict\", \"mine-full\", \"theirs-full\")"
-#: ../svn/svn.c:1386
+#: ../svn/svn.c:1397
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -12183,7 +12420,7 @@
" uppstod och gör så att det går att arkivera SÖKVÄG igen. Det rekommenderas\n"
" att använda \"svn resolve --accept working\" istället.\n"
-#: ../svn/svn.c:1396
+#: ../svn/svn.c:1407
msgid ""
"Restore pristine working copy state (undo local changes).\n"
"usage: revert PATH...\n"
@@ -12205,7 +12442,7 @@
" För information om att göra det, kör \"svn help merge\" och sök efter\n"
" \"upphäva\".\n"
-#: ../svn/svn.c:1408
+#: ../svn/svn.c:1419
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -12232,9 +12469,10 @@
" ' ' no modifications\n"
" 'C' Conflicted\n"
" 'M' Modified\n"
-" Third column: Whether the working copy directory is locked\n"
-" ' ' not locked\n"
-" 'L' locked\n"
+" Third column: Whether the working copy is locked for writing by\n"
+" another Subversion client modifying the working copy\n"
+" ' ' not locked for writing\n"
+" 'L' locked for writing\n"
" Fourth column: Scheduled commit will contain addition-with-history\n"
" ' ' no history scheduled with commit\n"
" '+' history scheduled with commit\n"
@@ -12242,16 +12480,16 @@
" ' ' normal\n"
" 'S' the item has a Switched URL relative to the parent\n"
" 'X' a versioned file created by an eXternals definition\n"
-" Sixth column: Repository lock token\n"
+" Sixth column: Whether the item is locked in repository for exclusive commit\n"
" (without -u)\n"
-" ' ' no lock token\n"
-" 'K' lock token present\n"
+" ' ' not locked by this working copy\n"
+" 'K' locked by this working copy, but lock might be stolen or broken\n"
" (with -u)\n"
-" ' ' not locked in repository, no lock token\n"
-" 'K' locked in repository, lock toKen present\n"
-" 'O' locked in repository, lock token in some Other working copy\n"
-" 'T' locked in repository, lock token present but sTolen\n"
-" 'B' not locked in repository, lock token present but Broken\n"
+" ' ' not locked in repository, not locked by this working copy\n"
+" 'K' locked in repository, lock owned by this working copy\n"
+" 'O' locked in repository, lock owned by another working copy\n"
+" 'T' locked in repository, lock owned by this working copy was stolen\n"
+" 'B' not locked in repository, lock owned by this working copy is broken\n"
" Seventh column: Whether the item is the victim of a tree conflict\n"
" ' ' normal\n"
" 'C' tree-Conflicted\n"
@@ -12325,9 +12563,10 @@
" \" \" inga ändringar\n"
" \"C\" i konflikt\n"
" \"M\" det finns ändringar\n"
-" Tredje kolumen: Visar om katalogen i arbetskopian är låst\n"
-" \" \" olåst\n"
-" \"L\" låst\n"
+" Tredje kolumen: Visar om arbetskopian är låst för skrivning av en\n"
+" annan Subversionklient som ändrar arbetskopian\n"
+" \" \" ej låst för skrivning\n"
+" \"L\" låst för skrivning\n"
" Fjärde kolumnen: Kommande arkiveringar kommer att innehålla tillägg med\n"
" historik\n"
" \" \" ingen historik schemalagd\n"
@@ -12336,16 +12575,17 @@
" \" \" normalt\n"
" \"S\" objektet är växlat med avseende på dess föräldrakatalog\n"
" \"X\" en versionshanterad fil skapad av en extern-definition\n"
-" Sjätte kolumnen: Arkivlås\n"
+" Sjätte kolumnen: Visar om objektet är låst i arkivet för exklusiv\n"
+" arkivering\n"
" (utan -u)\n"
-" \" \" ingen låsidentifierare\n"
-" \"K\" låsidentifierare finns\n"
+" \" \" inte låst av denna arbetskopia\n"
+" \"K\" låst av denna arbetskopia, men låset kan stjälas eller brytas upp\n"
" (med -u)\n"
-" \" \" ej låst i arkivet, ingen låsidentifierare\n"
-" \"K\" låst i arkivet, låsidentifierare finns\n"
-" \"O\" låst i arkivet, låsidentifierare i någon annan arbetskopia\n"
-" \"T\" låst i arkivet; låsidentifierare finns, men låset är stulet\n"
-" \"B\" ej låst i arkivet, låsidentifierare finns, men låset är uppbrutet\n"
+" \" \" ej låst i arkivet, ej låst av denna arbetskopia\n"
+" \"K\" låst i arkivet, lås ägt av denna arbetskopia\n"
+" \"O\" låst i arkivet, lås ägt av någon annan arbetskopia\n"
+" \"T\" låst i arkivet, lås ägt av denna arbetskopia men är stulet\n"
+" \"B\" ej låst i arkivet, lås ägt av denna arbetskopia men är uppbrutet\n"
" Sjunde kolumnen: Huruvida objektet är föremål för en trädkonflikt\n"
" \" \" normalt\n"
" \"C\" trädkonflikt\n"
@@ -12392,11 +12632,11 @@
" > lokal fil saknas, inkommande fil ändrad vid uppdatering\n"
" D ak/delta.c\n"
-#: ../svn/svn.c:1500
+#: ../svn/svn.c:1512
msgid "don't print unversioned items"
msgstr "visa inte icke versionshanterade objekt"
-#: ../svn/svn.c:1503
+#: ../svn/svn.c:1515
msgid ""
"Update the working copy to a different URL within the same repository.\n"
"usage: 1. switch URL[@PEGREV] [PATH]\n"
@@ -12478,11 +12718,11 @@
" svn switch --relocate http://www.exempel.se/arkiv/projekt \\\n"
" svn://svn.exempel.se/arkiv/projekt\n"
-#: ../svn/svn.c:1545
+#: ../svn/svn.c:1557
msgid "allow switching to a node with no common ancestor"
msgstr "tillåt växling till en nod utan gemensamt ursprung"
-#: ../svn/svn.c:1549
+#: ../svn/svn.c:1561
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -12494,7 +12734,7 @@
"\n"
"Använd --force för att \"bryta upp\" låset.\n"
-#: ../svn/svn.c:1556
+#: ../svn/svn.c:1568
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -12587,7 +12827,7 @@
" Använd väljaren --set-depth för att ange ett nytt arbetskopiedjup för\n"
" målet för denna handling.\n"
-#: ../svn/svn.c:1606
+#: ../svn/svn.c:1618
msgid ""
"Upgrade the metadata storage format for a working copy.\n"
"usage: upgrade [WCPATH...]\n"
@@ -12599,105 +12839,105 @@
"\n"
" Lokala ändringar behålls som de är.\n"
-#: ../svn/svn.c:1652 ../svnadmin/svnadmin.c:90 ../svnlook/svnlook.c:377
-#: ../svnrdump/svnrdump.c:65 ../svnsync/svnsync.c:296
+#: ../svn/svn.c:1664 ../svnadmin/svnadmin.c:90 ../svnlook/svnlook.c:380
+#: ../svnrdump/svnrdump.c:65 ../svnsync/svnsync.c:297
msgid "Caught signal"
msgstr "Fångade signal"
-#: ../svn/svn.c:1803 ../svnlook/svnlook.c:2543
+#: ../svn/svn.c:1817 ../svnlook/svnlook.c:2565
msgid "Non-numeric limit argument given"
msgstr "Argumentet till limit-flaggan är inget tal"
-#: ../svn/svn.c:1809 ../svnlook/svnlook.c:2549
+#: ../svn/svn.c:1823 ../svnlook/svnlook.c:2571
msgid "Argument to --limit must be positive"
msgstr "Argumentet till --limit måste vara positivt"
-#: ../svn/svn.c:1830 ../svn/svn.c:2107
+#: ../svn/svn.c:1844 ../svn/svn.c:2121
msgid "Can't specify -c with --old"
msgstr "Kan inte ange -c med --old"
-#: ../svn/svn.c:1861
+#: ../svn/svn.c:1875
#, c-format
msgid "Negative number in range (%s) not supported with -c"
msgstr "Negativt tal i område (%s) stöds ej med -c"
-#: ../svn/svn.c:1874
+#: ../svn/svn.c:1888
#, c-format
msgid "Non-numeric change argument (%s) given to -c"
msgstr "Argumentet till flaggan -c (%s) är inget tal"
-#: ../svn/svn.c:1882
+#: ../svn/svn.c:1896
msgid "There is no change 0"
msgstr "Ändring 0 finns inte"
-#: ../svn/svn.c:1925 ../svnadmin/svnadmin.c:2025 ../svnrdump/svnrdump.c:937
-#: ../svnsync/svnsync.c:2051
+#: ../svn/svn.c:1939 ../svnadmin/svnadmin.c:2037 ../svnrdump/svnrdump.c:937
+#: ../svnsync/svnsync.c:2052
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Syntaxfel i revisionsargumentet \"%s\""
-#: ../svn/svn.c:1991 ../svn/svn.c:2010
+#: ../svn/svn.c:2005 ../svn/svn.c:2024
#, c-format
msgid "Error converting depth from locale to UTF-8"
msgstr "Fel vid konvertering av djupet från lokal kodning till UTF-8"
-#: ../svn/svn.c:1999
+#: ../svn/svn.c:2013
#, c-format
msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
msgstr "\"%s\" är inget giltigt djup; försök med \"empty\", \"files\", \"immediates\" eller \"infinity\""
-#: ../svn/svn.c:2018
+#: ../svn/svn.c:2032
#, c-format
msgid "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or 'infinity'"
msgstr "\"%s\" är inget giltigt djup; försök med \"exclude\", \"empty\", \"files\", \"immediates\" eller \"infinity\""
-#: ../svn/svn.c:2147
+#: ../svn/svn.c:2161
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Syntaxfel i native-eol-argumentet \"%s\""
-#: ../svn/svn.c:2167
+#: ../svn/svn.c:2181
msgid "Changelist names must not be empty"
msgstr "Ändringslistor får inte ha tomma namn"
-#: ../svn/svn.c:2201
+#: ../svn/svn.c:2215
#, c-format
msgid "'%s' is not a valid --accept value"
msgstr "\"%s\" är inte ett giltigt värde för --accept"
-#: ../svn/svn.c:2209
+#: ../svn/svn.c:2223
#, c-format
msgid "'%s' is not a valid --show-revs value"
msgstr "\"%s\" är inte ett giltigt värde för --show-revs"
-#: ../svn/svn.c:2221
+#: ../svn/svn.c:2235
#, c-format
msgid "Invalid strip count '%s'"
msgstr "Ogiltigt antal att ta bort: \"%s\""
-#: ../svn/svn.c:2227
+#: ../svn/svn.c:2241
msgid "Argument to --strip must be positive"
msgstr "Argumentet till --strip måste vara positivt"
-#: ../svn/svn.c:2282 ../svnmucc/svnmucc.c:1207 ../svnrdump/svnrdump.c:993
-#: ../svnsync/svnsync.c:2095
+#: ../svn/svn.c:2296 ../svnmucc/svnmucc.c:1208 ../svnrdump/svnrdump.c:993
+#: ../svnsync/svnsync.c:2096
msgid "--non-interactive and --force-interactive are mutually exclusive"
msgstr "--non-interactive och --force-interactive kan inte användas samtidigt"
-#: ../svn/svn.c:2336 ../svndumpfilter/svndumpfilter.c:1509
-#: ../svnlook/svnlook.c:2645
+#: ../svn/svn.c:2350 ../svndumpfilter/svndumpfilter.c:1510
+#: ../svnlook/svnlook.c:2667
#, c-format
msgid "Subcommand argument required\n"
msgstr "Argument för underkommando krävs\n"
-#: ../svn/svn.c:2353 ../svnadmin/svnadmin.c:2208
-#: ../svndumpfilter/svndumpfilter.c:1529 ../svnlook/svnlook.c:2664
+#: ../svn/svn.c:2367 ../svnadmin/svnadmin.c:2220
+#: ../svndumpfilter/svndumpfilter.c:1530 ../svnlook/svnlook.c:2686
#: ../svnrdump/svnrdump.c:1039
#, c-format
msgid "Unknown subcommand: '%s'\n"
msgstr "Okänt underkommando: \"%s\"\n"
-#: ../svn/svn.c:2362
+#: ../svn/svn.c:2376
#, c-format
msgid "Undo is done using either the 'svn revert' or the 'svn merge' command.\n"
msgstr ""
@@ -12704,7 +12944,7 @@
"Återgång till tidigare tillstånd görs med antingen \"svn revert\"\n"
"eller \"svn merge\".\n"
-#: ../svn/svn.c:2397
+#: ../svn/svn.c:2411
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -12713,94 +12953,94 @@
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svn help %s\" för användning.\n"
-#: ../svn/svn.c:2411
+#: ../svn/svn.c:2425
msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r"
msgstr "Flera revisionsargument påträffades; -c kan inte anges flera gånger; -c och -r kan inte användas samtidigt"
-#: ../svn/svn.c:2423
+#: ../svn/svn.c:2437
msgid "--depth and --set-depth are mutually exclusive"
msgstr "--depth och --set-depth kan inte användas samtidigt"
-#: ../svn/svn.c:2433
+#: ../svn/svn.c:2447
msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
msgstr "--with-all-revprops och --with-no-revprops kan inte användas samtidigt"
-#: ../svn/svn.c:2443
+#: ../svn/svn.c:2457
msgid "--with-revprop and --with-no-revprops are mutually exclusive"
msgstr "--with-revprop och --with-no-revprops kan inte användas samtidigt"
-#: ../svn/svn.c:2456
+#: ../svn/svn.c:2470
msgid "--message (-m) and --file (-F) are mutually exclusive"
msgstr "--message (-m) och --file (-F) kan inte användas samtidigt"
-#: ../svn/svn.c:2465 ../svnmucc/svnmucc.c:1218 ../svnrdump/svnrdump.c:1098
-#: ../svnsync/svnsync.c:2146
+#: ../svn/svn.c:2479 ../svnmucc/svnmucc.c:1219 ../svnrdump/svnrdump.c:1098
+#: ../svnsync/svnsync.c:2147
msgid "--trust-server-cert requires --non-interactive"
msgstr "--trust-server-cert kräver --non-interactive"
-#: ../svn/svn.c:2475
+#: ../svn/svn.c:2489
msgid "--diff-cmd and --internal-diff are mutually exclusive"
msgstr "--diff-cmd och --internal-diff kan inte användas samtidigt"
-#: ../svn/svn.c:2517
+#: ../svn/svn.c:2531
msgid "--relocate and --depth are mutually exclusive"
msgstr "--relocate och --depth kan inte användas samtidigt"
-#: ../svn/svn.c:2525
+#: ../svn/svn.c:2539
msgid "--relocate and --non-recursive (-N) are mutually exclusive"
msgstr "--relocate och --non-recursive (-N) kan inte användas samtidigt"
-#: ../svn/svn.c:2647
+#: ../svn/svn.c:2661
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr "Filen med loggmeddelandet är versionshanterad; använd --force-log för att kringgå"
-#: ../svn/svn.c:2654
+#: ../svn/svn.c:2668
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr "Filen med låskommentaren är versionshanterad; använd --force-log för att kringgå"
-#: ../svn/svn.c:2675
+#: ../svn/svn.c:2689
msgid "The log message is a pathname (was -F intended?); use '--force-log' to override"
msgstr "Loggmeddelandet är en sökväg (avsågs -F?); använd --force-log för att kringgå"
-#: ../svn/svn.c:2682
+#: ../svn/svn.c:2696
msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override"
msgstr "Låskommentaren är en sökväg (avsågs -F?); använd --force-log för att kringgå"
-#: ../svn/svn.c:2706
+#: ../svn/svn.c:2720
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props och --no-auto-props kan inte användas samtidigt"
-#: ../svn/svn.c:2811 ../svn/svn.c:2818
+#: ../svn/svn.c:2825 ../svn/svn.c:2832
#, c-format
msgid "--accept=%s incompatible with --non-interactive"
msgstr "--accept=%s kan inte användas med --non-interactive"
-#: ../svn/svn.c:2874
+#: ../svn/svn.c:2888
#, c-format
msgid "Try 'svn help %s' for more information"
msgstr "Skriv \"svn help %s\" för vidare information"
-#: ../svn/svn.c:2880
+#: ../svn/svn.c:2894
msgid "Please see the 'svn upgrade' command"
msgstr "Se kommandot \"svn upgrade\""
-#: ../svn/svn.c:2886 ../svnmucc/svnmucc.c:1449 ../svnrdump/svnrdump.c:1175
+#: ../svn/svn.c:2900 ../svnmucc/svnmucc.c:1457 ../svnrdump/svnrdump.c:1175
msgid "Authentication failed and interactive prompting is disabled; see the --force-interactive option"
msgstr "Autentisering misslyckades och interaktiva frågor är avstängda; se flaggan --force-interactive"
-#: ../svn/svn.c:2891
+#: ../svn/svn.c:2905
msgid "Reading file from standard input because of -F option; this can interfere with interactive prompting"
msgstr "Läser filen från standardinmatningen eftersom flaggan -F angavs; detta kan påverka interaktiva frågor"
-#: ../svn/svn.c:2902
+#: ../svn/svn.c:2916
msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)"
msgstr "Kör \"svn cleanup\" för att ta bort lås (skriv \"svn help cleanup\" för mer information)"
-#: ../svn/svn.c:2909
+#: ../svn/svn.c:2923
msgid "Another process is blocking the working copy database, or the underlying filesystem does not support file locking; if the working copy is on a network filesystem, make sure file locking has been enabled on the file server"
msgstr "En annan process blockerar arbetskopians databas, eller så stöder det underliggande filsystemet inte fillåsning; om arbetskopian ligger på ett nätverksfilsystem, se till att filservern har fillåsning påslagen"
-#: ../svn/svn.c:2922
+#: ../svn/svn.c:2936
msgid "When using svn+ssh:// URLs, keep in mind that the --username and --password options are ignored because authentication is performed by SSH, not Subversion"
msgstr "När URL:er på formen svn+ssh:// används, kom ihåg att flaggorna --username och --password ej beaktas eftersom autentisering görs av SSH, inte av Subversion"
@@ -12884,7 +13124,7 @@
msgid "Error normalizing log message to internal format"
msgstr "Fel vid normalisering av loggmeddelande till det interna formatet"
-#: ../svn/util.c:447 ../svnmucc/svnmucc.c:763
+#: ../svn/util.c:447 ../svnmucc/svnmucc.c:764
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr "Kan inte köra editorn för att erhålla loggmeddelande i icke-interaktivt läge"
@@ -12930,13 +13170,8 @@
msgid "(invalid date)"
msgstr "(felaktigt datum)"
-#: ../svn/util.c:1047
+#: ../svn/util.c:1056
#, c-format
-msgid "Source and target have no common ancestor: '%s' and '%s'"
-msgstr "Källa och mål saknar gemensamt ursprung: \"%s\" och \"%s\""
-
-#: ../svn/util.c:1096
-#, c-format
msgid "svn: warning: '%s' is a binary mime-type but file '%s' looks like text; diff, merge, blame, and other operations will stop working on this file\n"
msgstr "svn: varning: \"%s\" är en binär mime-typ men filen \"%s\" ser ut som text; \"diff\", \"merge\", \"blame\" och andra kommandon kommer sluta fungera med denna fil\n"
@@ -12944,7 +13179,7 @@
msgid "specify revision number ARG (or X:Y range)"
msgstr "ange revisionsnummer ARG (eller ett område X:Y)"
-#: ../svnadmin/svnadmin.c:220 ../svnlook/svnlook.c:159
+#: ../svnadmin/svnadmin.c:220 ../svnlook/svnlook.c:162
msgid "specify transaction name ARG"
msgstr "ange transaktionsnamn ARG"
@@ -12964,9 +13199,9 @@
msgid "bypass property validation logic"
msgstr "förbigå logik för egenskapskontroll"
-#: ../svnadmin/svnadmin.c:235 ../svnlook/svnlook.c:190
-#: ../svnrdump/svnrdump.c:122 ../svnserve/svnserve.c:289
-#: ../svnversion/svnversion.c:142
+#: ../svnadmin/svnadmin.c:235 ../svnlook/svnlook.c:193
+#: ../svnrdump/svnrdump.c:122 ../svnserve/svnserve.c:291
+#: ../svnversion/svnversion.c:143
msgid "no progress (only errors) to stderr"
msgstr ""
"ingen förloppsinformation (endast fel) till\n"
@@ -13436,48 +13671,52 @@
msgid "%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s\" instead.\n"
msgstr "%svarning: Arkivmekanismen \"%s\" är föråldrad; överväg att använda \"%s\" istället.\n"
-#: ../svnadmin/svnadmin.c:727 ../svnadmin/svnadmin.c:999
-#: ../svnadmin/svnadmin.c:1180
+#: ../svnadmin/svnadmin.c:696
+msgid "Repositories compatible with 1.0.x must use --fs-type=bdb"
+msgstr "Arkiv kompatibla med 1.0.x måste använda --fs-type=bdb"
+
+#: ../svnadmin/svnadmin.c:739 ../svnadmin/svnadmin.c:1011
+#: ../svnadmin/svnadmin.c:1192
msgid "First revision cannot be higher than second"
msgstr "Den första revisionen kan inte vara högre än den andra"
-#: ../svnadmin/svnadmin.c:736
+#: ../svnadmin/svnadmin.c:748
#, c-format
msgid "Deltifying revision %ld..."
msgstr "Deltifierar revision %ld..."
-#: ../svnadmin/svnadmin.c:740 ../svnadmin/svnadmin.c:800
-#: ../svnadmin/svnadmin.c:815
+#: ../svnadmin/svnadmin.c:752 ../svnadmin/svnadmin.c:812
+#: ../svnadmin/svnadmin.c:827
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: ../svnadmin/svnadmin.c:781
+#: ../svnadmin/svnadmin.c:793
#, c-format
msgid "* Verifying repository metadata ...\n"
msgstr "* Kontrollerar arkivmetadata...\n"
-#: ../svnadmin/svnadmin.c:784
+#: ../svnadmin/svnadmin.c:796
#, c-format
msgid "* Verifying metadata at revision %ld ...\n"
msgstr "* Kontrollerar metadata i revision %ld...\n"
-#: ../svnadmin/svnadmin.c:794
+#: ../svnadmin/svnadmin.c:806
#, c-format
msgid "Packing revisions in shard %s..."
msgstr "Packar revision i skärva %s..."
-#: ../svnadmin/svnadmin.c:809
+#: ../svnadmin/svnadmin.c:821
#, c-format
msgid "Packing revprops in shard %s..."
msgstr "Packar revisionsegenskaper i skärva %s..."
-#: ../svnadmin/svnadmin.c:886
+#: ../svnadmin/svnadmin.c:898
#, c-format
msgid "<<< Skipped original revision %ld\n"
msgstr "<<< Hoppade över ursprungliga revisionen %ld\n"
-#: ../svnadmin/svnadmin.c:903
+#: ../svnadmin/svnadmin.c:915
#, c-format
msgid ""
"Repository lock acquired.\n"
@@ -13486,7 +13725,7 @@
"Arkivlåset har erhållits.\n"
"Vänta; det kan ta tid att återskapa arkivet...\n"
-#: ../svnadmin/svnadmin.c:910
+#: ../svnadmin/svnadmin.c:922
msgid ""
"Repository lock acquired.\n"
"Please wait; upgrading the repository may take some time...\n"
@@ -13494,11 +13733,11 @@
"Arkivlåset har erhållits.\n"
"Vänta; det kan ta tid att uppgradera arkivet...\n"
-#: ../svnadmin/svnadmin.c:1060
+#: ../svnadmin/svnadmin.c:1072
msgid "No program provided"
msgstr "Inget program angivet"
-#: ../svnadmin/svnadmin.c:1096
+#: ../svnadmin/svnadmin.c:1108
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -13513,8 +13752,8 @@
"\n"
"Tillgängliga underkommandon:\n"
-#: ../svnadmin/svnadmin.c:1103 ../svnlook/svnlook.c:2204
-#: ../svnserve/svnserve.c:335
+#: ../svnadmin/svnadmin.c:1115 ../svnlook/svnlook.c:2226
+#: ../svnserve/svnserve.c:337
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -13522,20 +13761,20 @@
"Följande arkivåtkomstmoduler är tillgängliga:\n"
"\n"
-#: ../svnadmin/svnadmin.c:1132
+#: ../svnadmin/svnadmin.c:1144
#, c-format
msgid "Invalid revision number (%ld) specified"
msgstr "Ogiltigt revisionsnummer (%ld) angivet"
-#: ../svnadmin/svnadmin.c:1142
+#: ../svnadmin/svnadmin.c:1154
msgid "Non-numeric revision specified"
msgstr "Ickenumerisk revision angiven"
-#: ../svnadmin/svnadmin.c:1201
+#: ../svnadmin/svnadmin.c:1213
msgid "Invalid property value found in dumpstream; consider repairing the source or using --bypass-prop-validation while loading."
msgstr "Ogiltigt egenskapsvärde hittat i dumpströmmen; reparera källan eller använd --bypass-prop-validation vid inläsningen."
-#: ../svnadmin/svnadmin.c:1267 ../svnadmin/svnadmin.c:1899
+#: ../svnadmin/svnadmin.c:1279 ../svnadmin/svnadmin.c:1911
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -13543,12 +13782,12 @@
"Kunde inte erhålla enskild åtkomst till arkivet; kanske någon annan process,\n"
"såsom httpd, svnserve eller svn har det öppet?"
-#: ../svnadmin/svnadmin.c:1272 ../svnadmin/svnadmin.c:1904
+#: ../svnadmin/svnadmin.c:1284 ../svnadmin/svnadmin.c:1916
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr "Väntar på arkivlås; kanske någon annan process har arkivet öppen?\n"
-#: ../svnadmin/svnadmin.c:1280
+#: ../svnadmin/svnadmin.c:1292
#, c-format
msgid ""
"\n"
@@ -13557,52 +13796,52 @@
"\n"
"Återskapande klart.\n"
-#: ../svnadmin/svnadmin.c:1287
+#: ../svnadmin/svnadmin.c:1299
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "Den senaste revisionen i arkivet är %ld.\n"
-#: ../svnadmin/svnadmin.c:1402
+#: ../svnadmin/svnadmin.c:1414
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Transaktionen \"%s\" borttagen.\n"
-#: ../svnadmin/svnadmin.c:1464 ../svnadmin/svnadmin.c:1509
+#: ../svnadmin/svnadmin.c:1476 ../svnadmin/svnadmin.c:1521
#, c-format
msgid "Missing revision"
msgstr "Revision saknas"
-#: ../svnadmin/svnadmin.c:1467 ../svnadmin/svnadmin.c:1512
+#: ../svnadmin/svnadmin.c:1479 ../svnadmin/svnadmin.c:1524
#, c-format
msgid "Only one revision allowed"
msgstr "Endast en revision tillåts"
-#: ../svnadmin/svnadmin.c:1566
+#: ../svnadmin/svnadmin.c:1578
#, c-format
msgid "--revision (-r) and --transaction (-t) are mutually exclusive"
msgstr "--revision (-r) och --transaction (-t) kan inte användas samtidigt"
-#: ../svnadmin/svnadmin.c:1733 ../svnlook/svnlook.c:2267
+#: ../svnadmin/svnadmin.c:1745 ../svnlook/svnlook.c:2289
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID-identifierare: %s\n"
-#: ../svnadmin/svnadmin.c:1734 ../svnlook/svnlook.c:2268
+#: ../svnadmin/svnadmin.c:1746 ../svnlook/svnlook.c:2290
#, c-format
msgid "Owner: %s\n"
msgstr "Ägare: %s\n"
-#: ../svnadmin/svnadmin.c:1735 ../svnlook/svnlook.c:2269
+#: ../svnadmin/svnadmin.c:1747 ../svnlook/svnlook.c:2291
#, c-format
msgid "Created: %s\n"
msgstr "Skapat: %s\n"
-#: ../svnadmin/svnadmin.c:1736 ../svnlook/svnlook.c:2270
+#: ../svnadmin/svnadmin.c:1748 ../svnlook/svnlook.c:2292
#, c-format
msgid "Expires: %s\n"
msgstr "Går ut: %s\n"
-#: ../svnadmin/svnadmin.c:1738
+#: ../svnadmin/svnadmin.c:1750
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -13621,34 +13860,34 @@
"%s\n"
"\n"
-#: ../svnadmin/svnadmin.c:1784
+#: ../svnadmin/svnadmin.c:1796
msgid "No paths to unlock provided"
msgstr "Ingen sökväg till upplåsning tillhandahölls"
-#: ../svnadmin/svnadmin.c:1802
+#: ../svnadmin/svnadmin.c:1814
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "Sökvägen \"%s\" är inte låst.\n"
-#: ../svnadmin/svnadmin.c:1814
+#: ../svnadmin/svnadmin.c:1826
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "Tog bort lås på \"%s\".\n"
-#: ../svnadmin/svnadmin.c:1867
+#: ../svnadmin/svnadmin.c:1879
#, c-format
msgid "'%s' unlocked by user '%s'.\n"
msgstr "\"%s\" låstes upp av användaren \"%s\".\n"
-#: ../svnadmin/svnadmin.c:1914
+#: ../svnadmin/svnadmin.c:1926
msgid "Upgrade of this repository's underlying versioned filesystem is not supported; consider dumping and loading the data elsewhere"
msgstr "Uppgradering av det versionshanterade filsystemet som används av detta arkiv stöds ej; skriv ut och återställ informationen någon annanstans"
-#: ../svnadmin/svnadmin.c:1921
+#: ../svnadmin/svnadmin.c:1933
msgid "Upgrade of this repository is not supported; consider dumping and loading the data elsewhere"
msgstr "Uppgradering av detta arkiv stöds ej; skriv ut och återställ informationen någon annanstans"
-#: ../svnadmin/svnadmin.c:1927
+#: ../svnadmin/svnadmin.c:1939
#, c-format
msgid ""
"\n"
@@ -13657,35 +13896,35 @@
"\n"
"Uppdatering klar.\n"
-#: ../svnadmin/svnadmin.c:2012 ../svnrdump/svnrdump.c:923
+#: ../svnadmin/svnadmin.c:2024 ../svnrdump/svnrdump.c:923
msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr "Flera revisionsargument påträffades; försök med \"-r M:N\" istället för \"-r M -r N\""
-#: ../svnadmin/svnadmin.c:2090
+#: ../svnadmin/svnadmin.c:2102
#, c-format
msgid "Cannot create pre-1.0-compatible repositories"
msgstr "Kan inte skapa arkiv kompatibelt med versioner äldre än 1.0"
-#: ../svnadmin/svnadmin.c:2103
+#: ../svnadmin/svnadmin.c:2115
#, c-format
msgid "Cannot guarantee compatibility beyond the current running version (%s)"
msgstr "Kan inte garantera kompatibilitet bortom versionen som nu körs (%s)"
-#: ../svnadmin/svnadmin.c:2192
+#: ../svnadmin/svnadmin.c:2204
#, c-format
msgid "subcommand argument required\n"
msgstr "argument för underkommando krävs\n"
-#: ../svnadmin/svnadmin.c:2227
+#: ../svnadmin/svnadmin.c:2239
msgid "Repository argument required"
msgstr "Argument för arkiv krävs"
-#: ../svnadmin/svnadmin.c:2240
+#: ../svnadmin/svnadmin.c:2252
#, c-format
msgid "'%s' is a URL when it should be a local path"
msgstr "\"%s\" är en URL när den skulle vara en lokal sökväg"
-#: ../svnadmin/svnadmin.c:2271
+#: ../svnadmin/svnadmin.c:2283
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -13694,74 +13933,74 @@
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnadmin help %s\" för användning.\n"
-#: ../svnadmin/svnadmin.c:2314
+#: ../svnadmin/svnadmin.c:2326
msgid "Try 'svnadmin help' for more info"
msgstr "Skriv \"svnadmin help\" för mer information"
-#: ../svndumpfilter/svndumpfilter.c:78
+#: ../svndumpfilter/svndumpfilter.c:79
#, c-format
msgid "Can't open stdio file"
msgstr "Kan inte öppna stdio-fil"
-#: ../svndumpfilter/svndumpfilter.c:405
+#: ../svndumpfilter/svndumpfilter.c:406
msgid "This is an empty revision for padding."
msgstr "Detta är en tom revision för att fylla ut."
-#: ../svndumpfilter/svndumpfilter.c:488
+#: ../svndumpfilter/svndumpfilter.c:489
#, c-format
msgid "Revision %ld committed as %ld.\n"
msgstr "Revision %ld arkiverad som %ld.\n"
-#: ../svndumpfilter/svndumpfilter.c:511
+#: ../svndumpfilter/svndumpfilter.c:512
#, c-format
msgid "Revision %ld skipped.\n"
msgstr "Revision %ld hoppades över.\n"
-#: ../svndumpfilter/svndumpfilter.c:605
+#: ../svndumpfilter/svndumpfilter.c:606
#, c-format
msgid "Invalid copy source path '%s'"
msgstr "Ogiltig sökväg som källa för kopiering \"%s\""
-#: ../svndumpfilter/svndumpfilter.c:662
+#: ../svndumpfilter/svndumpfilter.c:663
#, c-format
msgid "No valid copyfrom revision in filtered stream"
msgstr "Ingen giltig ursprungsrevision för kopiering i den filtrerade strömmen"
-#: ../svndumpfilter/svndumpfilter.c:787
+#: ../svndumpfilter/svndumpfilter.c:788
#, c-format
msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources"
msgstr "Källsökvägen \"%s\" för sammanslagning saknas; försök med --skip-missing-merge-sources"
-#: ../svndumpfilter/svndumpfilter.c:809
+#: ../svndumpfilter/svndumpfilter.c:810
#, c-format
msgid "No valid revision range 'start' in filtered stream"
msgstr "Början av revisionsområdet finns inte i den filtrerade strömmen"
-#: ../svndumpfilter/svndumpfilter.c:816
+#: ../svndumpfilter/svndumpfilter.c:817
#, c-format
msgid "No valid revision range 'end' in filtered stream"
msgstr "Slutet av revisionsområdet finns inte i den filtrerade strömmen"
-#: ../svndumpfilter/svndumpfilter.c:862 ../svndumpfilter/svndumpfilter.c:893
+#: ../svndumpfilter/svndumpfilter.c:863 ../svndumpfilter/svndumpfilter.c:894
#, c-format
msgid "Delta property block detected, but deltas are not enabled for node '%s' in original revision %ld"
msgstr "Deltaegenskapsblock upptäcktes, men deltan är inte påslagna för noden \"%s\" i originalrevisionen %ld"
-#: ../svndumpfilter/svndumpfilter.c:1026
+#: ../svndumpfilter/svndumpfilter.c:1027
msgid "Do not display filtering statistics."
msgstr "Visa inte filtreringsstatistik."
-#: ../svndumpfilter/svndumpfilter.c:1028
+#: ../svndumpfilter/svndumpfilter.c:1029
msgid "Treat the path prefixes as file glob patterns."
msgstr "Behandla sökvägsprefix som skalmönster."
-#: ../svndumpfilter/svndumpfilter.c:1030
+#: ../svndumpfilter/svndumpfilter.c:1031
msgid "Remove revisions emptied by filtering."
msgstr ""
"Ta bort revisioner som har blivit tomma på grund\n"
" av filtrering."
-#: ../svndumpfilter/svndumpfilter.c:1032
+#: ../svndumpfilter/svndumpfilter.c:1033
msgid ""
"Remove all empty revisions found in dumpstream\n"
" except revision 0."
@@ -13769,21 +14008,21 @@
"Ta bort alla tomma revisioner funna i dumpströmmen\n"
" utom revision 0."
-#: ../svndumpfilter/svndumpfilter.c:1035
+#: ../svndumpfilter/svndumpfilter.c:1036
msgid "Renumber revisions left after filtering."
msgstr ""
"Numrera om de revisioner som finns kvar efter\n"
" filtrering."
-#: ../svndumpfilter/svndumpfilter.c:1038
+#: ../svndumpfilter/svndumpfilter.c:1039
msgid "Skip missing merge sources."
msgstr "Hoppa över sammanslagningskällor som saknas."
-#: ../svndumpfilter/svndumpfilter.c:1040
+#: ../svndumpfilter/svndumpfilter.c:1041
msgid "Don't filter revision properties."
msgstr "Filtrera inte revisionsegenskaper."
-#: ../svndumpfilter/svndumpfilter.c:1042
+#: ../svndumpfilter/svndumpfilter.c:1043
msgid ""
"Read additional prefixes, one per line, from\n"
" file ARG."
@@ -13791,7 +14030,7 @@
"Läs ytterligare prefix, ett per rad, från\n"
" filen ARG."
-#: ../svndumpfilter/svndumpfilter.c:1054
+#: ../svndumpfilter/svndumpfilter.c:1055
msgid ""
"Filter out nodes with given prefixes from dumpstream.\n"
"usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -13799,7 +14038,7 @@
"Filtrera bort noder med angivna prefix från dumpströmmen.\n"
"användning: svndumpfilter exclude SÖKVÄGS_PREFIX...\n"
-#: ../svndumpfilter/svndumpfilter.c:1063
+#: ../svndumpfilter/svndumpfilter.c:1064
msgid ""
"Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"
@@ -13807,7 +14046,7 @@
"Filtrera bort noder utan angivna prefix från dumpströmmen.\n"
"användning: svndumpfilter include SÖKVÄGS_PREFIX...\n"
-#: ../svndumpfilter/svndumpfilter.c:1072
+#: ../svndumpfilter/svndumpfilter.c:1073
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -13815,7 +14054,7 @@
"Visa hur detta program eller dess underkommandon används.\n"
"användning: svndumpfilter help [UNDERKOMMANDO...]\n"
-#: ../svndumpfilter/svndumpfilter.c:1148
+#: ../svndumpfilter/svndumpfilter.c:1149
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -13830,47 +14069,47 @@
"\n"
"Tillgängliga underkommandon:\n"
-#: ../svndumpfilter/svndumpfilter.c:1206
+#: ../svndumpfilter/svndumpfilter.c:1207
#, c-format
msgid "Excluding (and dropping empty revisions for) prefix patterns:\n"
msgstr "Utesluter (och tar bort tomma revisioner för) prefixmönster:\n"
-#: ../svndumpfilter/svndumpfilter.c:1208
+#: ../svndumpfilter/svndumpfilter.c:1209
#, c-format
msgid "Excluding prefix patterns:\n"
msgstr "Utesluter prefixmönster:\n"
-#: ../svndumpfilter/svndumpfilter.c:1211
+#: ../svndumpfilter/svndumpfilter.c:1212
#, c-format
msgid "Including (and dropping empty revisions for) prefix patterns:\n"
msgstr "Tar med (och tar bort tomma revisioner för) prefixmönster:\n"
-#: ../svndumpfilter/svndumpfilter.c:1213
+#: ../svndumpfilter/svndumpfilter.c:1214
#, c-format
msgid "Including prefix patterns:\n"
msgstr "Tar med prefixmönster:\n"
-#: ../svndumpfilter/svndumpfilter.c:1221
+#: ../svndumpfilter/svndumpfilter.c:1222
#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "Utesluter (och tar bort tomma revisioner för) prefix:\n"
-#: ../svndumpfilter/svndumpfilter.c:1223
+#: ../svndumpfilter/svndumpfilter.c:1224
#, c-format
msgid "Excluding prefixes:\n"
msgstr "Utesluter prefix:\n"
-#: ../svndumpfilter/svndumpfilter.c:1226
+#: ../svndumpfilter/svndumpfilter.c:1227
#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "Tar med (och tar bort tomma revisioner för) prefix:\n"
-#: ../svndumpfilter/svndumpfilter.c:1228
+#: ../svndumpfilter/svndumpfilter.c:1229
#, c-format
msgid "Including prefixes:\n"
msgstr "Tar med prefix:\n"
-#: ../svndumpfilter/svndumpfilter.c:1256
+#: ../svndumpfilter/svndumpfilter.c:1257
#, c-format
msgid ""
"Dropped %d revision.\n"
@@ -13885,16 +14124,16 @@
"Hoppade över %d revisioner.\n"
"\n"
-#: ../svndumpfilter/svndumpfilter.c:1264
+#: ../svndumpfilter/svndumpfilter.c:1265
msgid "Revisions renumbered as follows:\n"
msgstr "Revisionerna har numrerats om enligt följande:\n"
-#: ../svndumpfilter/svndumpfilter.c:1292
+#: ../svndumpfilter/svndumpfilter.c:1293
#, c-format
msgid " %ld => (dropped)\n"
msgstr " %ld => (borttagen)\n"
-#: ../svndumpfilter/svndumpfilter.c:1307
+#: ../svndumpfilter/svndumpfilter.c:1308
#, c-format
msgid "Dropped %d node:\n"
msgid_plural "Dropped %d nodes:\n"
@@ -13901,11 +14140,11 @@
msgstr[0] "Tog bort %d noder:\n"
msgstr[1] "Tog bort %d noder:\n"
-#: ../svndumpfilter/svndumpfilter.c:1476
+#: ../svndumpfilter/svndumpfilter.c:1477
msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs"
msgstr "--drop-empty-revs kan inte användas tillsammans med --drop-all-empty-revs"
-#: ../svndumpfilter/svndumpfilter.c:1596
+#: ../svndumpfilter/svndumpfilter.c:1597
#, c-format
msgid ""
"\n"
@@ -13914,7 +14153,7 @@
"\n"
"Fel: inga prefix angivna.\n"
-#: ../svndumpfilter/svndumpfilter.c:1627
+#: ../svndumpfilter/svndumpfilter.c:1628
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -13923,53 +14162,53 @@
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svndumpfilter help %s\" för användning.\n"
-#: ../svndumpfilter/svndumpfilter.c:1645
+#: ../svndumpfilter/svndumpfilter.c:1646
msgid "Try 'svndumpfilter help' for more info"
msgstr "Skriv \"svndumpfilter help\" för med information"
-#: ../svnlook/svnlook.c:114
+#: ../svnlook/svnlook.c:117
msgid "show details for copies"
msgstr "visa detaljer för kopior"
-#: ../svnlook/svnlook.c:117
+#: ../svnlook/svnlook.c:120
msgid "print differences against the copy source"
msgstr "visa skillnad gentemot kopians ursprung"
-#: ../svnlook/svnlook.c:120
+#: ../svnlook/svnlook.c:123
msgid "show full paths instead of indenting them"
msgstr "visa fullständiga sökvägar istället för indrag"
-#: ../svnlook/svnlook.c:126
+#: ../svnlook/svnlook.c:129
msgid "maximum number of history entries"
msgstr "maximalt antal historikposter"
-#: ../svnlook/svnlook.c:144
+#: ../svnlook/svnlook.c:147
msgid "operate on single directory only"
msgstr "arbeta endast med en katalog"
-#: ../svnlook/svnlook.c:147
+#: ../svnlook/svnlook.c:150
msgid "specify revision number ARG"
msgstr "ange revisionsnummer ARG"
-#: ../svnlook/svnlook.c:150
+#: ../svnlook/svnlook.c:153
msgid "operate on a revision property (use with -r or -t)"
msgstr ""
"arbeta med en revisionsegenskap (används med\n"
" -r eller -t)"
-#: ../svnlook/svnlook.c:153
+#: ../svnlook/svnlook.c:156
msgid "show node revision ids for each path"
msgstr "visa nodrevisions-ID:n för varje sökväg"
-#: ../svnlook/svnlook.c:156
+#: ../svnlook/svnlook.c:159
msgid "show path's inherited properties"
msgstr "visa sökvägens ärvda egenskaper"
-#: ../svnlook/svnlook.c:162
+#: ../svnlook/svnlook.c:165
msgid "be verbose"
msgstr "var utförlig"
-#: ../svnlook/svnlook.c:171
+#: ../svnlook/svnlook.c:174
msgid ""
"Specify differencing options for external diff or\n"
" internal diff. Default: '-u'. Options are\n"
@@ -13993,7 +14232,7 @@
" radbrytningstecken\n"
" -p, --show-c-function: Visa funktionsnamn i C"
-#: ../svnlook/svnlook.c:202
+#: ../svnlook/svnlook.c:205
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -14003,7 +14242,7 @@
"\n"
"Visa författaren.\n"
-#: ../svnlook/svnlook.c:207
+#: ../svnlook/svnlook.c:210
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -14013,7 +14252,7 @@
"\n"
"Visa innehållet i en fil. Inledande \"/\" är valfritt för FIL_SÖKVÄG.\n"
-#: ../svnlook/svnlook.c:212
+#: ../svnlook/svnlook.c:215
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -14023,7 +14262,7 @@
"\n"
"Visa vilka sökvägar som har ändrats.\n"
-#: ../svnlook/svnlook.c:217
+#: ../svnlook/svnlook.c:220
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -14033,7 +14272,7 @@
"\n"
"Visa datumstämpel.\n"
-#: ../svnlook/svnlook.c:222
+#: ../svnlook/svnlook.c:225
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -14043,7 +14282,7 @@
"\n"
"Visa diffar i GNU-stil för ändrade filer och egenskaper.\n"
-#: ../svnlook/svnlook.c:229
+#: ../svnlook/svnlook.c:232
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -14055,7 +14294,7 @@
"Visa kataloger som själva har ändrats (egenskapsändringar) eller vars\n"
"barnfiler har ändrats.\n"
-#: ../svnlook/svnlook.c:235
+#: ../svnlook/svnlook.c:238
msgid ""
"usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -14067,7 +14306,7 @@
"Visa storleken (i byte) av filen i SÖKVÄG_I_ARKIV sådan den representeras\n"
"i arkivet.\n"
-#: ../svnlook/svnlook.c:241
+#: ../svnlook/svnlook.c:244
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -14077,7 +14316,7 @@
"\n"
"Beskriv användningen av detta program eller dess underkommandon.\n"
-#: ../svnlook/svnlook.c:246
+#: ../svnlook/svnlook.c:249
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -14089,7 +14328,7 @@
"Visa information om historiken för en sökväg i arkivet (eller rotkatalogen\n"
"om ingen sökväg anges).\n"
-#: ../svnlook/svnlook.c:252
+#: ../svnlook/svnlook.c:255
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -14100,7 +14339,7 @@
"Visa författaren, datumstämpeln, loggmeddelandets storlek samt\n"
"själva loggmeddelandet.\n"
-#: ../svnlook/svnlook.c:257
+#: ../svnlook/svnlook.c:260
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -14110,7 +14349,7 @@
"\n"
"Om ett lås finns på en sökväg i arkivet, visa information om det.\n"
-#: ../svnlook/svnlook.c:262
+#: ../svnlook/svnlook.c:265
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -14120,7 +14359,7 @@
"\n"
"Visa loggmeddelandet.\n"
-#: ../svnlook/svnlook.c:267
+#: ../svnlook/svnlook.c:270
msgid ""
"usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n"
" 2. svnlook propget --revprop REPOS_PATH PROPNAME\n"
@@ -14135,7 +14374,7 @@
"Skriv ut det råa värdet för en egenskap på en sökväg i arkivet.\n"
"Om --revprop används, skriv ut det råa värdet på en revisionsegenskap.\n"
-#: ../svnlook/svnlook.c:276
+#: ../svnlook/svnlook.c:279
msgid ""
"usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n"
" 2. svnlook proplist --revprop REPOS_PATH\n"
@@ -14150,7 +14389,7 @@
"Lista egenskaperna för en sökväg i arkivet eller, om --revprop anges,\n"
"visa revisionsegenskaper. -v visar även egenskapernas värden.\n"
-#: ../svnlook/svnlook.c:287
+#: ../svnlook/svnlook.c:290
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -14162,7 +14401,7 @@
"Visa trädet, med början i SÖKVÄG_I_ARKIV (om den anges, annars används trädets\n"
"rot). Visa även nodrevisions-ID:n om så önskas.\n"
-#: ../svnlook/svnlook.c:293
+#: ../svnlook/svnlook.c:296
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -14172,7 +14411,7 @@
"\n"
"Visa arkivets UUID.\n"
-#: ../svnlook/svnlook.c:298
+#: ../svnlook/svnlook.c:301
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -14182,28 +14421,28 @@
"\n"
"Visa det yngsta revisionsnumret.\n"
-#: ../svnlook/svnlook.c:858
+#: ../svnlook/svnlook.c:861
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Kopierad: %s (från revision %ld, %s)\n"
-#: ../svnlook/svnlook.c:926
+#: ../svnlook/svnlook.c:929
msgid "Added"
msgstr "Tillagd"
-#: ../svnlook/svnlook.c:927
+#: ../svnlook/svnlook.c:930
msgid "Deleted"
msgstr "Raderad"
-#: ../svnlook/svnlook.c:928
+#: ../svnlook/svnlook.c:931
msgid "Modified"
msgstr "Ändrad"
-#: ../svnlook/svnlook.c:929
+#: ../svnlook/svnlook.c:932
msgid "Index"
msgstr "Index"
-#: ../svnlook/svnlook.c:940
+#: ../svnlook/svnlook.c:943
msgid ""
"(Binary files differ)\n"
"\n"
@@ -14211,30 +14450,30 @@
"(Binära filer skiljer sig åt)\n"
"\n"
-#: ../svnlook/svnlook.c:1207
+#: ../svnlook/svnlook.c:1222
msgid "unknown"
msgstr "okänd"
-#: ../svnlook/svnlook.c:1257
+#: ../svnlook/svnlook.c:1279
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "Transaktionen \"%s\" är inte baserad på en revision; skumt"
-#: ../svnlook/svnlook.c:1400
+#: ../svnlook/svnlook.c:1422
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "\"%s\" är en URL; ska troligen vara en sökväg"
-#: ../svnlook/svnlook.c:1423 ../svnlook/svnlook.c:1446
+#: ../svnlook/svnlook.c:1445 ../svnlook/svnlook.c:1468
#, c-format
msgid "Path '%s' is not a file"
msgstr "Sökvägen \"%s\" är inte en fil"
-#: ../svnlook/svnlook.c:1582
+#: ../svnlook/svnlook.c:1604
msgid "History item limit reached"
msgstr "Gräns nådd för element i historiken"
-#: ../svnlook/svnlook.c:1601
+#: ../svnlook/svnlook.c:1623
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -14243,7 +14482,7 @@
"REVISION SÖKVÄG <ID>\n"
"-------- -----------\n"
-#: ../svnlook/svnlook.c:1606
+#: ../svnlook/svnlook.c:1628
#, c-format
msgid ""
"REVISION PATH\n"
@@ -14252,36 +14491,36 @@
"REVISION SÖKVÄG\n"
"-------- ------\n"
-#: ../svnlook/svnlook.c:1678
+#: ../svnlook/svnlook.c:1700
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Egenskapen \"%s\" finns inte för revision %ld"
-#: ../svnlook/svnlook.c:1687
+#: ../svnlook/svnlook.c:1709
#, c-format
msgid "Property '%s' not found on path '%s' or inherited from a parent in revision %ld"
msgstr "Egenskapen \"%s\" finns inte på sökvägen \"%s\" eller ärvd från en förälder i revision %ld"
-#: ../svnlook/svnlook.c:1693
+#: ../svnlook/svnlook.c:1715
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Egenskapen \"%s\" finns inte på sökvägen \"%s\" i revision %ld"
-#: ../svnlook/svnlook.c:1701
+#: ../svnlook/svnlook.c:1723
#, c-format
msgid "Property '%s' not found on path '%s' or inherited from a parent in transaction %s"
msgstr "Egenskapen \"%s\" finns inte på sökvägen \"%s\" eller ärvd från en förälder i transaktion %s"
-#: ../svnlook/svnlook.c:1707
+#: ../svnlook/svnlook.c:1729
#, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Egenskapen \"%s\" finns inte på sökvägen \"%s\" i transaktion %s"
-#: ../svnlook/svnlook.c:2042
+#: ../svnlook/svnlook.c:2064
msgid "Missing repository path argument"
msgstr "Arkivargument saknas"
-#: ../svnlook/svnlook.c:2194
+#: ../svnlook/svnlook.c:2216
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -14301,7 +14540,7 @@
"\n"
"Tillgängliga underkommandon:\n"
-#: ../svnlook/svnlook.c:2272
+#: ../svnlook/svnlook.c:2294
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -14316,48 +14555,48 @@
"Kommentar (%i rader):\n"
"%s\n"
-#: ../svnlook/svnlook.c:2324
+#: ../svnlook/svnlook.c:2346
#, c-format
msgid "Missing propname argument"
msgstr "Egenskapsargument saknas"
-#: ../svnlook/svnlook.c:2325
+#: ../svnlook/svnlook.c:2347
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Egenskapsnamns- och arkivsökvägsargument saknas"
-#: ../svnlook/svnlook.c:2331
+#: ../svnlook/svnlook.c:2353
msgid "Missing propname or repository path argument"
msgstr "Egenskapsnamns- eller arkivsökvägsargument saknas"
-#: ../svnlook/svnlook.c:2495
+#: ../svnlook/svnlook.c:2517
msgid "Invalid revision number supplied"
msgstr "Ogiltigt revisionsnummer angivet"
-#: ../svnlook/svnlook.c:2607
+#: ../svnlook/svnlook.c:2629
msgid "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist"
msgstr "Flaggorna \"--transaction\" (-t) och \"--revision\" (-r) kan inte anges samtidigt"
-#: ../svnlook/svnlook.c:2614
+#: ../svnlook/svnlook.c:2636
msgid "Cannot use the '--show-inherited-props' option with the '--revprop' option"
msgstr "Kan inte använda flaggan \"--show-inherited-props\" tillsammans med \"--revprop\""
-#: ../svnlook/svnlook.c:2673
+#: ../svnlook/svnlook.c:2695
#, c-format
msgid "Try 'svnadmin verify' instead.\n"
msgstr "Försök med \"svnadmin verify\" istället.\n"
-#: ../svnlook/svnlook.c:2707
+#: ../svnlook/svnlook.c:2729
#, c-format
msgid "Repository argument required\n"
msgstr "Arkivargument krävs\n"
-#: ../svnlook/svnlook.c:2716
+#: ../svnlook/svnlook.c:2738
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "\"%s\" är en URL när den skulle vara en sökväg\n"
-#: ../svnlook/svnlook.c:2768
+#: ../svnlook/svnlook.c:2790
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -14366,11 +14605,11 @@
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnlook help %s\" för användning.\n"
-#: ../svnlook/svnlook.c:2811
+#: ../svnlook/svnlook.c:2833
msgid "Try 'svnlook help' for more info"
msgstr "Skriv \"svnlook help\" för mer information"
-#: ../svnmucc/svnmucc.c:926
+#: ../svnmucc/svnmucc.c:927
msgid ""
"Subversion multiple URL command client\n"
"usage: svnmucc ACTION...\n"
@@ -14401,7 +14640,7 @@
" NAME[=VALUE]\n"
" --non-interactive : do no interactive prompting (default is to\n"
" prompt only if standard input is a terminal)\n"
-" --force-interactive : do interactive propmting even if standard\n"
+" --force-interactive : do interactive prompting even if standard\n"
" input is not a terminal\n"
" --trust-server-cert : accept SSL server certificates from unknown\n"
" certificate authorities without prompting (but\n"
@@ -14455,11 +14694,11 @@
" --no-auth-cache : cacha inte autentiseringsinformation\n"
" --version : visa versionsinformation\n"
-#: ../svnmucc/svnmucc.c:1002
+#: ../svnmucc/svnmucc.c:1003
msgid "--message (-m), --file (-F), and --with-revprop=svn:log are mutually exclusive"
msgstr "--message (-m), --file (-F) och --with-revprop=svn:log kan inte användas samtidigt"
-#: ../svnrdump/load_editor.c:382 ../svnsync/svnsync.c:326
+#: ../svnrdump/load_editor.c:382 ../svnsync/svnsync.c:327
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr "Kunde inte låsa destinationsarkivet; det är för närvarande låst av \"%s\"\n"
@@ -14506,8 +14745,8 @@
msgid "dump incrementally"
msgstr "dumpa inkrementellt"
-#: ../svnrdump/svnrdump.c:142 ../svnserve/svnserve.c:281
-#: ../svnversion/svnversion.c:138
+#: ../svnrdump/svnrdump.c:142 ../svnserve/svnserve.c:283
+#: ../svnversion/svnversion.c:139
msgid "display this help"
msgstr "visa denna hjälp"
@@ -14565,58 +14804,58 @@
msgid "Couldn't obtain the authenticated username"
msgstr "Kan inte erhålla autentiserat användarnamn"
-#: ../svnserve/serve.c:2042
+#: ../svnserve/serve.c:2043
msgid "Path is not a string"
msgstr "Sökvägen är inte en sträng"
-#: ../svnserve/serve.c:2199
+#: ../svnserve/serve.c:2200
msgid "Log revprop entry not a string"
msgstr "Revisionsegenskapsposten för loggning är ej en sträng"
-#: ../svnserve/serve.c:2205
+#: ../svnserve/serve.c:2206
#, c-format
msgid "Unknown revprop word '%s' in log command"
msgstr "Okänt revisionsegenskapsord \"%s\" i log-kommandot"
-#: ../svnserve/serve.c:2221
+#: ../svnserve/serve.c:2222
msgid "Log path entry not a string"
msgstr "Sökvägsposten för loggning är ej en sträng"
-#: ../svnserve/svnserve.c:160
+#: ../svnserve/svnserve.c:162
msgid "daemon mode"
msgstr "demonläge"
-#: ../svnserve/svnserve.c:161
+#: ../svnserve/svnserve.c:163
msgid "inetd mode"
msgstr "inetd-läge"
-#: ../svnserve/svnserve.c:162
+#: ../svnserve/svnserve.c:164
msgid "tunnel mode"
msgstr "tunnel-läge"
-#: ../svnserve/svnserve.c:163
+#: ../svnserve/svnserve.c:165
msgid "listen-once mode (useful for debugging)"
msgstr "engångslyssningsläge (användbart för felsökning)"
-#: ../svnserve/svnserve.c:166
+#: ../svnserve/svnserve.c:168
msgid "Windows service mode (Service Control Manager)"
msgstr "Windows-tjänst-läge (Tjänstehanteraren)"
-#: ../svnserve/svnserve.c:168
+#: ../svnserve/svnserve.c:170
msgid "root of directory to serve"
msgstr "serverns rotkatalog"
-#: ../svnserve/svnserve.c:170
+#: ../svnserve/svnserve.c:172
msgid "force read only, overriding repository config file"
msgstr ""
"tillåt endast läsning; överskuggar värdet i\n"
" arkivets konfigurationsfil"
-#: ../svnserve/svnserve.c:172
+#: ../svnserve/svnserve.c:174
msgid "read configuration from file ARG"
msgstr "läs konfiguration från filen ARG"
-#: ../svnserve/svnserve.c:175
+#: ../svnserve/svnserve.c:177
msgid ""
"listen port. The default port is 3690.\n"
" [mode: daemon, service, listen-once]"
@@ -14624,7 +14863,7 @@
"port att lyssna på. Förvald är 3690.\n"
" [läge: demon, tjänst, engångslyssning]"
-#: ../svnserve/svnserve.c:179
+#: ../svnserve/svnserve.c:181
msgid ""
"listen port. The default port is 3690.\n"
" [mode: daemon, listen-once]"
@@ -14632,7 +14871,7 @@
"port att lyssna på. Förvald är 3690.\n"
" [läge: demon, engångslyssning]"
-#: ../svnserve/svnserve.c:185
+#: ../svnserve/svnserve.c:187
msgid ""
"listen hostname or IP address\n"
" By default svnserve listens on all addresses.\n"
@@ -14642,7 +14881,7 @@
" Normalt lyssnar svnserve på alla adresser.\n"
" [läge: demon, tjänst, engångslyssning]"
-#: ../svnserve/svnserve.c:191
+#: ../svnserve/svnserve.c:193
msgid ""
"listen hostname or IP address\n"
" By default svnserve listens on all addresses.\n"
@@ -14652,7 +14891,7 @@
" Normalt lyssnar svnserve på alla adresser.\n"
" [läge: demon, engångslyssning]"
-#: ../svnserve/svnserve.c:198
+#: ../svnserve/svnserve.c:200
msgid ""
"prefer IPv6 when resolving the listen hostname\n"
" [IPv4 is preferred by default. Using IPv4 and IPv6\n"
@@ -14665,7 +14904,7 @@
" Använd inetd-läge eller tunnelläge om detta\n"
" behövs.]"
-#: ../svnserve/svnserve.c:206
+#: ../svnserve/svnserve.c:208
msgid ""
"compression level to use for network transmissions\n"
" [0 .. no compression, 5 .. default, \n"
@@ -14675,7 +14914,7 @@
" [0: ingen kompression, 5: normalnivå,\n"
" 9: maximal kompression]"
-#: ../svnserve/svnserve.c:212
+#: ../svnserve/svnserve.c:214
msgid ""
"size of the extra in-memory cache in MB used to\n"
" minimize redundant operations.\n"
@@ -14689,7 +14928,7 @@
" icke-trådat läge.\n"
" [endast använt för FSFS-arkiv]"
-#: ../svnserve/svnserve.c:222
+#: ../svnserve/svnserve.c:224
msgid ""
"enable or disable caching of deltas between older\n"
" revisions.\n"
@@ -14701,7 +14940,7 @@
" Normalvärdet är \"no\" (avstängt).\n"
" [endast använt för FSFS-arkiv]"
-#: ../svnserve/svnserve.c:230
+#: ../svnserve/svnserve.c:232
msgid ""
"enable or disable caching of file contents\n"
" Default is yes.\n"
@@ -14712,7 +14951,7 @@
" Normalvärdet är \"yes\" (påslaget).\n"
" [endast använt för FSFS-arkiv]"
-#: ../svnserve/svnserve.c:236
+#: ../svnserve/svnserve.c:238
msgid ""
"enable or disable caching of revision properties.\n"
" Consult the documentation before activating this.\n"
@@ -14724,7 +14963,7 @@
" Normalvärdet är \"no\" (avstängt).\n"
" [endast använt för FSFS-arkiv]"
-#: ../svnserve/svnserve.c:244
+#: ../svnserve/svnserve.c:246
msgid ""
"Optimize network handling based on the assumption\n"
" that most clients are connected with a bitrate of\n"
@@ -14738,13 +14977,13 @@
#. ### Making the assumption here that WIN32 never has fork and so
#. * ### this option never exists when --service exists.
-#: ../svnserve/svnserve.c:254
+#: ../svnserve/svnserve.c:256
msgid "use threads instead of fork [mode: daemon]"
msgstr ""
"använd trådar istället för att skapa nya processer\n"
" [läge: demon]"
-#: ../svnserve/svnserve.c:258
+#: ../svnserve/svnserve.c:260
msgid ""
"run in foreground (useful for debugging)\n"
" [mode: daemon]"
@@ -14752,7 +14991,7 @@
"kör i förgrunden (användbart för felsökning)\n"
" [läge: demon]"
-#: ../svnserve/svnserve.c:262
+#: ../svnserve/svnserve.c:264
msgid ""
"handle one connection at a time in the parent process\n"
" (useful for debugging)"
@@ -14760,11 +14999,11 @@
"hantera en anslutning i taget i föräldraprocessen\n"
" (användbart för felsökning)"
-#: ../svnserve/svnserve.c:266
+#: ../svnserve/svnserve.c:268
msgid "svnserve log file"
msgstr "loggfil för svnserve"
-#: ../svnserve/svnserve.c:269
+#: ../svnserve/svnserve.c:271
msgid ""
"write server process ID to file ARG\n"
" [mode: daemon, listen-once, service]"
@@ -14772,7 +15011,7 @@
"skriv serverprocessens process-ID till filen ARG\n"
" [läge: demon, engångslyssning, tjänst]"
-#: ../svnserve/svnserve.c:273
+#: ../svnserve/svnserve.c:275
msgid ""
"write server process ID to file ARG\n"
" [mode: daemon, listen-once]"
@@ -14780,7 +15019,7 @@
"skriv serverprocessens process-ID till filen ARG\n"
" [läge: demon, engångslyssning]"
-#: ../svnserve/svnserve.c:278
+#: ../svnserve/svnserve.c:280
msgid ""
"tunnel username (default is current uid's name)\n"
" [mode: tunnel]"
@@ -14788,7 +15027,7 @@
"användarnamn för tunnel (standard är aktuell\n"
" användares namn) [läge: tunnel]"
-#: ../svnserve/svnserve.c:283
+#: ../svnserve/svnserve.c:285
msgid ""
"virtual host mode (look for repo in directory\n"
" of provided hostname)"
@@ -14796,12 +15035,12 @@
"virtuell värddator-läge (leta efter arkiv i\n"
" katalog med samma namn som använt värddatornamn)"
-#: ../svnserve/svnserve.c:300
+#: ../svnserve/svnserve.c:302
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Skriv \"%s --help\" för användning.\n"
-#: ../svnserve/svnserve.c:310
+#: ../svnserve/svnserve.c:312
msgid ""
"usage: svnserve [-d | -i | -t | -X | --service] [options]\n"
"\n"
@@ -14811,7 +15050,7 @@
"\n"
"Giltiga flaggor:\n"
-#: ../svnserve/svnserve.c:316
+#: ../svnserve/svnserve.c:318
msgid ""
"usage: svnserve [-d | -i | -t | -X] [options]\n"
"\n"
@@ -14821,7 +15060,7 @@
"\n"
"Giltiga flaggor:\n"
-#: ../svnserve/svnserve.c:344
+#: ../svnserve/svnserve.c:346
msgid ""
"\n"
"Cyrus SASL authentication is available.\n"
@@ -14829,74 +15068,74 @@
"\n"
"Cyrus-SASL-autentisering finns tillgänglig.\n"
-#: ../svnserve/svnserve.c:581
+#: ../svnserve/svnserve.c:618
#, c-format
msgid "Invalid port '%s'"
msgstr "Ogiltig port \"%s\""
-#: ../svnserve/svnserve.c:622
+#: ../svnserve/svnserve.c:659
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: Rotsökvägen \"%s\" finns inte eller är ingen katalog.\n"
-#: ../svnserve/svnserve.c:735
+#: ../svnserve/svnserve.c:772
msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n"
msgstr "Du måste ange precis en av -d, -i, -t, --service eller -X.\n"
-#: ../svnserve/svnserve.c:738
+#: ../svnserve/svnserve.c:775
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Du måste ange precis en av -d, -i, -t eller -X.\n"
-#: ../svnserve/svnserve.c:747
+#: ../svnserve/svnserve.c:784
msgid "You may only specify one of -T or --single-thread\n"
msgstr "Du kan bara ange en av -T eller --single-thread\n"
-#: ../svnserve/svnserve.c:775
+#: ../svnserve/svnserve.c:812
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "Flaggan --tunnel-user är endast giltig i tunnel-läge.\n"
-#: ../svnserve/svnserve.c:794
+#: ../svnserve/svnserve.c:831
#, c-format
msgid "Can't open stdout"
msgstr "Kan inte öppna standard ut"
-#: ../svnserve/svnserve.c:848
+#: ../svnserve/svnserve.c:885
#, c-format
msgid "svnserve: The --service flag is only valid if the process is started by the Service Control Manager.\n"
msgstr "svnserve: Flaggan --service är endast tillåten om processen startas av tjänstehanteraren (SCM).\n"
-#: ../svnserve/svnserve.c:898
+#: ../svnserve/svnserve.c:935
#, c-format
msgid "Can't get address info"
msgstr "Kan inte erhålla adressinfo"
-#: ../svnserve/svnserve.c:912
+#: ../svnserve/svnserve.c:949
#, c-format
msgid "Can't create server socket"
msgstr "Kan inte skapa uttag (socket) för servern"
-#: ../svnserve/svnserve.c:923
+#: ../svnserve/svnserve.c:960
#, c-format
msgid "Can't bind server socket"
msgstr "Kan inte knyta adress till serveruttaget (socket)"
-#: ../svnserve/svnserve.c:1019
+#: ../svnserve/svnserve.c:1058
#, c-format
msgid "Can't accept client connection"
msgstr "Kan inte acceptera anslutning från klient"
-#: ../svnserve/svnserve.c:1099
+#: ../svnserve/svnserve.c:1139
#, c-format
msgid "Can't create threadattr"
msgstr "Kan inte skapa trådattribut"
-#: ../svnserve/svnserve.c:1107
+#: ../svnserve/svnserve.c:1147
#, c-format
msgid "Can't set detached state"
msgstr "Kan inte koppla loss tråd"
-#: ../svnserve/svnserve.c:1120
+#: ../svnserve/svnserve.c:1160
#, c-format
msgid "Can't create thread"
msgstr "Kan inte skapa tråd"
@@ -14921,7 +15160,7 @@
msgid "The service failed to start; an internal error occurred while starting the service"
msgstr "Tjänsten kunde inte starta; ett internt fel inträffade då tjänsten skulle startas"
-#: ../svnsync/svnsync.c:91
+#: ../svnsync/svnsync.c:92
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -14966,7 +15205,7 @@
"bör destinationsarkivet vara en spegling av källarkivet som endast används\n"
"för läsning.\n"
-#: ../svnsync/svnsync.c:117
+#: ../svnsync/svnsync.c:118
msgid ""
"usage: svnsync synchronize DEST_URL [SOURCE_URL]\n"
"\n"
@@ -14989,7 +15228,7 @@
"speciellt när icke betrodda användare eller förvaltare kan ha skrivande\n"
"åtkomst till arkivet DEST-URL.\n"
-#: ../svnsync/svnsync.c:130
+#: ../svnsync/svnsync.c:131
msgid ""
"usage:\n"
"\n"
@@ -15026,7 +15265,7 @@
"speciellt när icke betrodda användare eller förvaltare kan ha skrivande\n"
"åtkomst till arkivet DEST-URL.\n"
-#: ../svnsync/svnsync.c:151
+#: ../svnsync/svnsync.c:152
msgid ""
"usage: svnsync info DEST_URL\n"
"\n"
@@ -15037,7 +15276,7 @@
"\n"
"Visa information om destinationsarkivet för synkronisering i DEST-URL.\n"
-#: ../svnsync/svnsync.c:157
+#: ../svnsync/svnsync.c:158
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -15047,11 +15286,11 @@
"\n"
"Visa hur detta program eller dess underkommandon används.\n"
-#: ../svnsync/svnsync.c:167
+#: ../svnsync/svnsync.c:168
msgid "print as little as possible"
msgstr "visa så lite information som möjligt"
-#: ../svnsync/svnsync.c:169
+#: ../svnsync/svnsync.c:170
msgid ""
"operate on revision ARG (or range ARG1:ARG2)\n"
" A revision argument can be one of:\n"
@@ -15063,11 +15302,11 @@
" TAL revisionsnummer\n"
" \"HEAD\" senaste i arkivet"
-#: ../svnsync/svnsync.c:177
+#: ../svnsync/svnsync.c:178
msgid "allow a non-empty destination repository"
msgstr "tillåt ett icke-tomt destinationsarkiv"
-#: ../svnsync/svnsync.c:189
+#: ../svnsync/svnsync.c:190
msgid ""
"specify a username ARG (deprecated;\n"
" see --source-username and --sync-username)"
@@ -15075,7 +15314,7 @@
"ange användarnamnet ARG (föråldrat;\n"
" se --source-username och --sync-username)"
-#: ../svnsync/svnsync.c:193
+#: ../svnsync/svnsync.c:194
msgid ""
"specify a password ARG (deprecated;\n"
" see --source-password and --sync-password)"
@@ -15083,25 +15322,25 @@
"ange lösenordet ARG (föråldrat;\n"
" se --source-password and --sync-password)"
-#: ../svnsync/svnsync.c:203
+#: ../svnsync/svnsync.c:204
msgid "connect to source repository with username ARG"
msgstr "anslut till källarkivet med användarnamn ARG"
-#: ../svnsync/svnsync.c:205
+#: ../svnsync/svnsync.c:206
msgid "connect to source repository with password ARG"
msgstr "anslut till källarkivet med lösenord ARG"
-#: ../svnsync/svnsync.c:207
+#: ../svnsync/svnsync.c:208
msgid "connect to sync repository with username ARG"
msgstr ""
"anslut till synkroniseringsarkiv med\n"
" användarnamn ARG"
-#: ../svnsync/svnsync.c:209
+#: ../svnsync/svnsync.c:210
msgid "connect to sync repository with password ARG"
msgstr "anslut till synkroniseringsarkiv med lösenord ARG"
-#: ../svnsync/svnsync.c:221
+#: ../svnsync/svnsync.c:222
msgid ""
"convert translatable properties from encoding ARG\n"
" to UTF-8. If not specified, then properties are\n"
@@ -15111,7 +15350,7 @@
" kodning ARG till UTF-8. Om ej angiven antas\n"
" egenskaper vara kodade i UTF-8."
-#: ../svnsync/svnsync.c:227
+#: ../svnsync/svnsync.c:228
msgid ""
"Disable built-in locking. Use of this option can\n"
" corrupt the mirror unless you ensure that no other\n"
@@ -15122,7 +15361,7 @@
" säkert att ingen annan körning av svnsync sker\n"
" samtidigt."
-#: ../svnsync/svnsync.c:233
+#: ../svnsync/svnsync.c:234
msgid ""
"Steal locks as necessary. Use, with caution,\n"
" if your mirror repository contains stale locks\n"
@@ -15133,120 +15372,120 @@
" om spegelarkivet innehåller utgångna lås och\n"
" ingen annan körning av svnsync sker samtidigt."
-#: ../svnsync/svnsync.c:356
+#: ../svnsync/svnsync.c:357
msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7 or using an external locking program"
msgstr "Målservern stöder inte atomisk ändring av revisionsegenskaper; uppgradera den till 1.7 eller använd ett externt låsprogram."
-#: ../svnsync/svnsync.c:370
+#: ../svnsync/svnsync.c:371
#, c-format
msgid "Stole lock previously held by '%s'\n"
msgstr "Stal lås som tidigare ägdes av \"%s\"\n"
-#: ../svnsync/svnsync.c:459
+#: ../svnsync/svnsync.c:460
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "Sessionens rot är \"%s\", men arkivets rot är \"%s\""
-#: ../svnsync/svnsync.c:601
+#: ../svnsync/svnsync.c:602
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr "Kopierade egenskaper för revision %ld (%s*-egenskaper hoppades över).\n"
-#: ../svnsync/svnsync.c:606
+#: ../svnsync/svnsync.c:607
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Kopierade egenskaper för revision %ld.\n"
-#: ../svnsync/svnsync.c:622
+#: ../svnsync/svnsync.c:623
#, c-format
msgid "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-props).\n"
msgstr "ANMÄRKNING: %s*-egenskaper normaliserade till LF-radslut (%d revisionsegenskaper, %d nodegenskaper).\n"
-#: ../svnsync/svnsync.c:752
+#: ../svnsync/svnsync.c:753
msgid "Destination repository already contains revision history; consider using --allow-non-empty if the repository's revisions are known to mirror their respective revisions in the source repository"
msgstr "Destinationsarkivet innehåller redan en revisionshistorik; använd --allow-non-empty om det är känt att arkivets revisioner motsvarar dem i källarkivet"
-#: ../svnsync/svnsync.c:761
+#: ../svnsync/svnsync.c:762
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Destinationsarkivet synkroniseras redan från \"%s\""
-#: ../svnsync/svnsync.c:796
+#: ../svnsync/svnsync.c:797
msgid "Destination repository has more revisions than source repository"
msgstr "Destinationsarkivet har fler revisioner än källarkivet"
-#: ../svnsync/svnsync.c:861 ../svnsync/svnsync.c:864 ../svnsync/svnsync.c:1517
-#: ../svnsync/svnsync.c:1524 ../svnsync/svnsync.c:1761
-#: ../svnsync/svnsync.c:1764 ../svnsync/svnsync.c:1808
+#: ../svnsync/svnsync.c:862 ../svnsync/svnsync.c:865 ../svnsync/svnsync.c:1518
+#: ../svnsync/svnsync.c:1525 ../svnsync/svnsync.c:1762
+#: ../svnsync/svnsync.c:1765 ../svnsync/svnsync.c:1809
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Sökvägen \"%s\" är inte en URL"
-#: ../svnsync/svnsync.c:891
+#: ../svnsync/svnsync.c:892
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Arkiverade revision %ld.\n"
-#: ../svnsync/svnsync.c:934
+#: ../svnsync/svnsync.c:935
msgid "Destination repository has not been initialized"
msgstr "Destinationsarkivet har ej initierats"
-#: ../svnsync/svnsync.c:1300
+#: ../svnsync/svnsync.c:1301
#, c-format
-msgid "Commit created rev %ld but should have created %ld"
-msgstr "Arkiveringen skapade revision %ld, men den borde ha skapat %ld"
+msgid "Commit created r%ld but should have created r%ld"
+msgstr "Arkiveringen skapade r%ld, men den borde ha skapat r%ld"
-#: ../svnsync/svnsync.c:1415
+#: ../svnsync/svnsync.c:1416
#, c-format
msgid "Revision being currently copied (%ld), last merged revision (%ld), and destination HEAD (%ld) are inconsistent; have you committed to the destination without using svnsync?"
msgstr "Revisionen som nu kopieras (%ld), senaste sammanslagna revisionen (%ld) och målets HEAD (%ld) är inkonsistenta. Har du arkiverat till destinationen utan att använda svnsync?"
-#: ../svnsync/svnsync.c:1452
+#: ../svnsync/svnsync.c:1453
#, c-format
msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you committed to the destination without using svnsync?"
msgstr "HEAD i målarkivet (%ld) är inte den senaste sammanslagna revisionen (%ld). Har du arkiverat till destinationen utan att använda svnsync?"
-#: ../svnsync/svnsync.c:1575 ../svnsync/svnsync.c:1580
+#: ../svnsync/svnsync.c:1576 ../svnsync/svnsync.c:1581
#, c-format
msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr "Kan inte kopiera revisionsegenskaper för en revision (%ld) som ej har synkroniserats"
-#: ../svnsync/svnsync.c:1644 ../svnsync/svnsync.c:1664
+#: ../svnsync/svnsync.c:1645 ../svnsync/svnsync.c:1665
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Ogiltigt revisionsnummer (%ld)"
-#: ../svnsync/svnsync.c:1714
+#: ../svnsync/svnsync.c:1715
msgid "Cannot specify revisions via both command-line arguments and the --revision (-r) option"
msgstr "Kan inte ange revisioner både som kommandoradsargument och med flaggan --revision (-r)"
-#: ../svnsync/svnsync.c:1722 ../svnsync/svnsync.c:2065
+#: ../svnsync/svnsync.c:1723 ../svnsync/svnsync.c:2066
#, c-format
msgid "Invalid revision range '%s' provided"
msgstr "Ogiltigt revisionsområde \"%s\" angivet"
-#: ../svnsync/svnsync.c:1821
+#: ../svnsync/svnsync.c:1822
#, c-format
msgid "Repository '%s' is not initialized for synchronization"
msgstr "Arkivet \"%s\" har inte initierats för synkronisering"
#. Print the info.
-#: ../svnsync/svnsync.c:1827
+#: ../svnsync/svnsync.c:1828
#, c-format
msgid "Source URL: %s\n"
msgstr "Käll-URL: %s\n"
-#: ../svnsync/svnsync.c:1829
+#: ../svnsync/svnsync.c:1830
#, c-format
msgid "Source Repository UUID: %s\n"
msgstr "Källarkivets UUID: %s\n"
-#: ../svnsync/svnsync.c:1832
+#: ../svnsync/svnsync.c:1833
#, c-format
msgid "Last Merged Revision: %s\n"
msgstr "Senast sammanslagen revision: %s\n"
-#: ../svnsync/svnsync.c:1849
+#: ../svnsync/svnsync.c:1850
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -15260,15 +15499,15 @@
"\n"
"Tillgängliga underkommandon:\n"
-#: ../svnsync/svnsync.c:2113
+#: ../svnsync/svnsync.c:2114
msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n"
msgstr "Kan inte använda --username eller --password tillsammans med någon av flaggorna --source-username, --source-password, --sync-username eller --sync-password.\n"
-#: ../svnsync/svnsync.c:2137
+#: ../svnsync/svnsync.c:2138
msgid "--disable-locking and --steal-lock are mutually exclusive"
msgstr "--disable-locking och --steal-lock kan inte användas samtidigt"
-#: ../svnsync/svnsync.c:2213
+#: ../svnsync/svnsync.c:2214
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -15277,16 +15516,16 @@
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnsync help %s\" för användning.\n"
-#: ../svnsync/svnsync.c:2296
+#: ../svnsync/svnsync.c:2297
msgid "Try 'svnsync help' for more info"
msgstr "Skriv \"svnsync help\" för mer information"
-#: ../svnversion/svnversion.c:49
+#: ../svnversion/svnversion.c:50
#, c-format
msgid "Type 'svnversion --help' for usage.\n"
msgstr "Skriv \"svnversion --help\" för användning.\n"
-#: ../svnversion/svnversion.c:60
+#: ../svnversion/svnversion.c:61
#, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
@@ -15350,41 +15589,41 @@
"\n"
"Giltiga flaggor:\n"
-#: ../svnversion/svnversion.c:136
+#: ../svnversion/svnversion.c:137
msgid "do not output the trailing newline"
msgstr "skriv inte ut det avslutande radslutet"
-#: ../svnversion/svnversion.c:137
+#: ../svnversion/svnversion.c:138
msgid "last changed rather than current revisions"
msgstr "senast ändrade istället för aktuella revisioner"
-#: ../svnversion/svnversion.c:245
+#: ../svnversion/svnversion.c:246
#, c-format
msgid "Unversioned symlink%s"
msgstr "Ej versionshanterad symbolisk länk%s"
-#: ../svnversion/svnversion.c:248
+#: ../svnversion/svnversion.c:249
#, c-format
msgid "Unversioned directory%s"
msgstr "Ej versionshanterad katalog%s"
-#: ../svnversion/svnversion.c:251
+#: ../svnversion/svnversion.c:252
#, c-format
msgid "Unversioned file%s"
msgstr "Ej versionshanterad fil%s"
-#: ../svnversion/svnversion.c:257
+#: ../svnversion/svnversion.c:258
#, c-format
msgid "'%s' doesn't exist\n"
msgstr "\"%s\" finns inte\n"
-#: ../svnversion/svnversion.c:258
+#: ../svnversion/svnversion.c:259
#, c-format
msgid "'%s' is of unknown type\n"
msgstr "\"%s\" är av okänd typ\n"
#. Local uncommitted modifications, no revision info was found.
-#: ../svnversion/svnversion.c:273
+#: ../svnversion/svnversion.c:274
#, c-format
msgid "Uncommitted local addition, copy or move%s"
msgstr "Oarkiverad lokalt tillagd, kopierad eller flyttad fil eller katalog%s"
Modified: trunk/contrib/subversion/subversion/svn/cl.h
===================================================================
--- trunk/contrib/subversion/subversion/svn/cl.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svn/cl.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -424,12 +424,12 @@
Increment *TEXT_CONFLICTS, *PROP_CONFLICTS, or *TREE_CONFLICTS if
a conflict was encountered.
- Use CWD_ABSPATH -- the absolute path of the current working
- directory -- to shorten PATH into something relative to that
- directory as necessary.
+ Use TARGET_ABSPATH and TARGET_PATH to shorten PATH into something
+ relative to the target as necessary.
*/
svn_error_t *
-svn_cl__print_status(const char *cwd_abspath,
+svn_cl__print_status(const char *target_abspath,
+ const char *target_path,
const char *path,
const svn_client_status_t *status,
svn_boolean_t suppress_externals_placeholders,
@@ -447,12 +447,12 @@
/* Print STATUS for PATH in XML to stdout. Use POOL for temporary
allocations.
- Use CWD_ABSPATH -- the absolute path of the current working
- directory -- to shorten PATH into something relative to that
- directory as necessary.
+ Use TARGET_ABSPATH and TARGET_PATH to shorten PATH into something
+ relative to the target as necessary.
*/
svn_error_t *
-svn_cl__print_status_xml(const char *cwd_abspath,
+svn_cl__print_status_xml(const char *target_abspath,
+ const char *target_path,
const char *path,
const svn_client_status_t *status,
svn_client_ctx_t *ctx,
Modified: trunk/contrib/subversion/subversion/svn/conflict-callbacks.c
===================================================================
--- trunk/contrib/subversion/subversion/svn/conflict-callbacks.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svn/conflict-callbacks.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -489,10 +489,10 @@
/* Resolver options for a property conflict */
static const resolver_option_t prop_conflict_options[] =
{
- { "mf", N_("my version"), N_("accept my version of entire file (even "
+ { "mf", N_("my version"), N_("accept my version of entire property (even "
"non-conflicts) [mine-full]"),
svn_wc_conflict_choose_mine_full },
- { "tf", N_("their version"), N_("accept their version of entire file "
+ { "tf", N_("their version"), N_("accept their version of entire property "
"(same) [theirs-full]"),
svn_wc_conflict_choose_theirs_full },
{ "dc", N_("display conflict"), N_("show conflicts in this property"), -1 },
@@ -935,7 +935,7 @@
/* We only allow the user accept the merged version of
the file if they've edited it, or at least looked at
the diff. */
- if (result->choice == svn_wc_conflict_choose_merged
+ if (opt->choice == svn_wc_conflict_choose_merged
&& ! knows_something)
{
SVN_ERR(svn_cmdline_fprintf(
Modified: trunk/contrib/subversion/subversion/svn/status-cmd.c
===================================================================
--- trunk/contrib/subversion/subversion/svn/status-cmd.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svn/status-cmd.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -51,7 +51,8 @@
{
/* These fields all correspond to the ones in the
svn_cl__print_status() interface. */
- const char *cwd_abspath;
+ const char *target_abspath;
+ const char *target_path;
svn_boolean_t suppress_externals_placeholders;
svn_boolean_t detailed;
svn_boolean_t show_last_committed;
@@ -77,6 +78,8 @@
struct status_cache
{
const char *path;
+ const char *target_abspath;
+ const char *target_path;
svn_client_status_t *status;
};
@@ -152,10 +155,11 @@
struct status_baton *sb = baton;
if (sb->xml_mode)
- return svn_cl__print_status_xml(sb->cwd_abspath, path, status,
- sb->ctx, pool);
+ return svn_cl__print_status_xml(sb->target_abspath, sb->target_path,
+ path, status, sb->ctx, pool);
else
- return svn_cl__print_status(sb->cwd_abspath, path, status,
+ return svn_cl__print_status(sb->target_abspath, sb->target_path,
+ path, status,
sb->suppress_externals_placeholders,
sb->detailed,
sb->show_last_committed,
@@ -239,6 +243,8 @@
const char *cl_key = apr_pstrdup(sb->cl_pool, status->changelist);
struct status_cache *scache = apr_pcalloc(sb->cl_pool, sizeof(*scache));
scache->path = apr_pstrdup(sb->cl_pool, path);
+ scache->target_abspath = apr_pstrdup(sb->cl_pool, sb->target_abspath);
+ scache->target_path = apr_pstrdup(sb->cl_pool, sb->target_path);
scache->status = svn_client_status_dup(status, sb->cl_pool);
path_array =
@@ -303,7 +309,6 @@
"mode"));
}
- SVN_ERR(svn_dirent_get_absolute(&(sb.cwd_abspath), "", scratch_pool));
sb.suppress_externals_placeholders = (opt_state->quiet
&& (! opt_state->verbose));
sb.detailed = (opt_state->verbose || opt_state->update);
@@ -328,6 +333,10 @@
svn_pool_clear(iterpool);
+ SVN_ERR(svn_dirent_get_absolute(&(sb.target_abspath), target,
+ scratch_pool));
+ sb.target_path = target;
+
SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
if (opt_state->xml)
@@ -349,7 +358,8 @@
NULL, opt_state->quiet,
/* not versioned: */
SVN_ERR_WC_NOT_WORKING_COPY,
- SVN_ERR_WC_PATH_NOT_FOUND));
+ SVN_ERR_WC_PATH_NOT_FOUND,
+ SVN_NO_ERROR));
if (opt_state->xml)
SVN_ERR(print_finish_target_xml(repos_rev, iterpool));
@@ -392,6 +402,8 @@
{
struct status_cache *scache =
APR_ARRAY_IDX(path_array, j, struct status_cache *);
+ sb.target_abspath = scache->target_abspath;
+ sb.target_path = scache->target_path;
SVN_ERR(print_status_normal_or_xml(&sb, scache->path,
scache->status, scratch_pool));
}
Modified: trunk/contrib/subversion/subversion/svn/status.c
===================================================================
--- trunk/contrib/subversion/subversion/svn/status.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svn/status.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -137,62 +137,75 @@
}
/* Make a relative path containing '..' elements as needed.
- RELATIVE_TO_PATH must be the path to a directory (not a file!) and
- TARGET_PATH must be the path to any file or directory. Both
- RELATIVE_TO_PATH and TARGET_PATH must be based on the same parent path,
- i.e. they can either both be absolute or they can both be relative to the
- same parent directory. Both paths are expected to be canonical.
+ TARGET_ABSPATH shall be the absolute version of TARGET_PATH.
+ TARGET_ABSPATH, TARGET_PATH and PATH shall be canonical.
- If above conditions are met, a relative path that leads to TARGET_ABSPATH
- from RELATIVE_TO_PATH is returned, but there is no error checking involved.
+ If above conditions are met, a relative path that leads to PATH
+ from TARGET_PATH is returned, but there is no error checking involved.
- The returned path is allocated from RESULT_POOL, all other allocations are
- made in SCRATCH_POOL. */
+ The returned path is allocated from RESULT_POOL, all other
+ allocations are made in SCRATCH_POOL. */
static const char *
-make_relpath(const char *relative_to_path,
+make_relpath(const char *target_abspath,
const char *target_path,
+ const char *path,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
const char *la;
const char *parent_dir_els = "";
+ const char *abspath, *relative;
+ svn_error_t *err = svn_dirent_get_absolute(&abspath, path, scratch_pool);
+ if (err)
+ {
+ /* We probably got passed some invalid path. */
+ svn_error_clear(err);
+ return apr_pstrdup(result_pool, path);
+ }
+
+ relative = svn_dirent_skip_ancestor(target_abspath, abspath);
+ if (relative)
+ {
+ return svn_dirent_join(target_path, relative, result_pool);
+ }
+
/* An example:
* relative_to_path = /a/b/c
- * target_path = /a/x/y/z
+ * path = /a/x/y/z
* result = ../../x/y/z
*
* Another example (Windows specific):
* relative_to_path = F:/wc
- * target_path = C:/wc
+ * path = C:/wc
* result = C:/wc
*/
/* Skip the common ancestor of both paths, here '/a'. */
- la = svn_dirent_get_longest_ancestor(relative_to_path, target_path,
+ la = svn_dirent_get_longest_ancestor(target_abspath, abspath,
scratch_pool);
if (*la == '\0')
{
/* Nothing in common: E.g. C:/ vs F:/ on Windows */
- return apr_pstrdup(result_pool, target_path);
+ return apr_pstrdup(result_pool, path);
}
- relative_to_path = svn_dirent_skip_ancestor(la, relative_to_path);
- target_path = svn_dirent_skip_ancestor(la, target_path);
+ relative = svn_dirent_skip_ancestor(la, target_abspath);
+ path = svn_dirent_skip_ancestor(la, path);
/* In above example, we'd now have:
* relative_to_path = b/c
- * target_path = x/y/z */
+ * path = x/y/z */
/* Count the elements of relative_to_path and prepend as many '..' elements
- * to target_path. */
- while (*relative_to_path)
+ * to path. */
+ while (*relative)
{
- svn_dirent_split(&relative_to_path, NULL, relative_to_path,
+ svn_dirent_split(&relative, NULL, relative,
scratch_pool);
parent_dir_els = svn_dirent_join(parent_dir_els, "..", scratch_pool);
}
- return svn_dirent_join(parent_dir_els, target_path, result_pool);
+ return svn_dirent_join(parent_dir_els, path, result_pool);
}
@@ -199,7 +212,9 @@
/* Print STATUS and PATH in a format determined by DETAILED and
SHOW_LAST_COMMITTED. */
static svn_error_t *
-print_status(const char *cwd_abspath, const char *path,
+print_status(const char *target_abspath,
+ const char *target_path,
+ const char *path,
svn_boolean_t detailed,
svn_boolean_t show_last_committed,
svn_boolean_t repos_locks,
@@ -217,7 +232,7 @@
const char *moved_from_line = "";
const char *moved_to_line = "";
- path = make_relpath(cwd_abspath, path, pool, pool);
+ path = make_relpath(target_abspath, target_path, path, pool, pool);
/* For historic reasons svn ignores the property status for added nodes, even
if these nodes were copied and have local property changes.
@@ -294,7 +309,8 @@
{
const char *relpath;
- relpath = make_relpath(cwd_abspath, status->moved_from_abspath,
+ relpath = make_relpath(target_abspath, target_path,
+ status->moved_from_abspath,
pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
moved_from_line = apr_pstrcat(pool, "\n > ",
@@ -309,7 +325,8 @@
if (status->moved_from_abspath)
{
- relpath = make_relpath(cwd_abspath, status->moved_from_abspath,
+ relpath = make_relpath(target_abspath, target_path,
+ status->moved_from_abspath,
pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
moved_from_line = apr_pstrcat(pool, "\n > ",
@@ -320,7 +337,8 @@
if (status->moved_to_abspath)
{
- relpath = make_relpath(cwd_abspath, status->moved_to_abspath,
+ relpath = make_relpath(target_abspath, target_path,
+ status->moved_to_abspath,
pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
moved_to_line = apr_pstrcat(pool, "\n > ",
@@ -330,6 +348,8 @@
}
}
+ path = svn_dirent_local_style(path, pool);
+
if (detailed)
{
char ood_status, lock_status;
@@ -447,7 +467,8 @@
svn_error_t *
-svn_cl__print_status_xml(const char *cwd_abspath,
+svn_cl__print_status_xml(const char *target_abspath,
+ const char *target_path,
const char *path,
const svn_client_status_t *status,
svn_client_ctx_t *ctx,
@@ -466,7 +487,7 @@
SVN_ERR(svn_wc_conflicted_p3(NULL, NULL, &tree_conflicted,
ctx->wc_ctx, local_abspath, pool));
- path = make_relpath(cwd_abspath, path, pool, pool);
+ path = make_relpath(target_abspath, target_path, path, pool, pool);
svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "entry",
"path", svn_dirent_local_style(path, pool), NULL);
@@ -499,7 +520,8 @@
if (status->moved_from_abspath)
{
- relpath = make_relpath(cwd_abspath, status->moved_from_abspath,
+ relpath = make_relpath(target_abspath, target_path,
+ status->moved_from_abspath,
pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
svn_hash_sets(att_hash, "moved-from", relpath);
@@ -506,7 +528,8 @@
}
if (status->moved_to_abspath)
{
- relpath = make_relpath(cwd_abspath, status->moved_to_abspath,
+ relpath = make_relpath(target_abspath, target_path,
+ status->moved_to_abspath,
pool, pool);
relpath = svn_dirent_local_style(relpath, pool);
svn_hash_sets(att_hash, "moved-to", relpath);
@@ -551,7 +574,8 @@
/* Called by status-cmd.c */
svn_error_t *
-svn_cl__print_status(const char *cwd_abspath,
+svn_cl__print_status(const char *target_abspath,
+ const char *target_path,
const char *path,
const svn_client_status_t *status,
svn_boolean_t suppress_externals_placeholders,
@@ -600,7 +624,7 @@
return SVN_NO_ERROR;
}
- return print_status(cwd_abspath, svn_dirent_local_style(path, pool),
+ return print_status(target_abspath, target_path, path,
detailed, show_last_committed, repos_locks, status,
text_conflicts, prop_conflicts, tree_conflicts,
ctx, pool);
Modified: trunk/contrib/subversion/subversion/svn/svn.c
===================================================================
--- trunk/contrib/subversion/subversion/svn/svn.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svn/svn.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -56,6 +56,7 @@
#include "private/svn_opt_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -1640,7 +1641,7 @@
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
@@ -2938,6 +2939,10 @@
"Subversion"));
}
+ /* Ensure that stdout is flushed, so the user will see any write errors.
+ This makes sure that output is not silently lost. */
+ err = svn_error_compose_create(err, svn_cmdline_fflush(stdout));
+
return EXIT_ERROR(err);
}
else
Modified: trunk/contrib/subversion/subversion/svnadmin/svnadmin.c
===================================================================
--- trunk/contrib/subversion/subversion/svnadmin/svnadmin.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svnadmin/svnadmin.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -140,7 +140,7 @@
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
@@ -756,40 +756,7 @@
return SVN_NO_ERROR;
}
-static void
-cmdline_stream_printf(svn_stream_t *stream,
- apr_pool_t *pool,
- const char *fmt,
- ...)
- __attribute__((format(printf, 3, 4)));
-static void
-cmdline_stream_printf(svn_stream_t *stream,
- apr_pool_t *pool,
- const char *fmt,
- ...)
-{
- const char *message;
- va_list ap;
- svn_error_t *err;
- const char *out;
-
- va_start(ap, fmt);
- message = apr_pvsprintf(pool, fmt, ap);
- va_end(ap);
-
- err = svn_cmdline_cstring_from_utf8(&out, message, pool);
-
- if (err)
- {
- svn_error_clear(err);
- out = svn_cmdline_cstring_from_utf8_fuzzy(message, pool);
- }
-
- svn_error_clear(svn_stream_puts(stream, out));
-}
-
-
/* Implementation of svn_repos_notify_func_t to wrap the output to a
response stream for svn_repos_dump_fs2() and svn_repos_verify_fs() */
static void
@@ -798,35 +765,36 @@
apr_pool_t *scratch_pool)
{
svn_stream_t *feedback_stream = baton;
+ apr_size_t len;
switch (notify->action)
{
case svn_repos_notify_warning:
- cmdline_stream_printf(feedback_stream, scratch_pool,
- "WARNING 0x%04x: %s\n", notify->warning,
- notify->warning_str);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ "WARNING 0x%04x: %s\n", notify->warning,
+ notify->warning_str));
return;
case svn_repos_notify_dump_rev_end:
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("* Dumped revision %ld.\n"),
- notify->revision);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("* Dumped revision %ld.\n"),
+ notify->revision));
return;
case svn_repos_notify_verify_rev_end:
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("* Verified revision %ld.\n"),
- notify->revision);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("* Verified revision %ld.\n"),
+ notify->revision));
return;
case svn_repos_notify_verify_rev_structure:
if (notify->revision == SVN_INVALID_REVNUM)
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("* Verifying repository metadata ...\n"));
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("* Verifying repository metadata ...\n")));
else
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("* Verifying metadata at revision %ld ...\n"),
- notify->revision);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("* Verifying metadata at revision %ld ...\n"),
+ notify->revision));
return;
case svn_repos_notify_pack_shard_start:
@@ -834,14 +802,14 @@
const char *shardstr = apr_psprintf(scratch_pool,
"%" APR_INT64_T_FMT,
notify->shard);
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("Packing revisions in shard %s..."),
- shardstr);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("Packing revisions in shard %s..."),
+ shardstr));
}
return;
case svn_repos_notify_pack_shard_end:
- cmdline_stream_printf(feedback_stream, scratch_pool, _("done.\n"));
+ svn_error_clear(svn_stream_puts(feedback_stream, _("done.\n")));
return;
case svn_repos_notify_pack_shard_start_revprop:
@@ -849,30 +817,30 @@
const char *shardstr = apr_psprintf(scratch_pool,
"%" APR_INT64_T_FMT,
notify->shard);
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("Packing revprops in shard %s..."),
- shardstr);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("Packing revprops in shard %s..."),
+ shardstr));
}
return;
case svn_repos_notify_pack_shard_end_revprop:
- cmdline_stream_printf(feedback_stream, scratch_pool, _("done.\n"));
+ svn_error_clear(svn_stream_puts(feedback_stream, _("done.\n")));
return;
case svn_repos_notify_load_txn_committed:
if (notify->old_revision == SVN_INVALID_REVNUM)
{
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("\n------- Committed revision %ld >>>\n\n"),
- notify->new_revision);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("\n------- Committed revision %ld >>>\n\n"),
+ notify->new_revision));
}
else
{
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("\n------- Committed new rev %ld"
- " (loaded from original rev %ld"
- ") >>>\n\n"), notify->new_revision,
- notify->old_revision);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("\n------- Committed new rev %ld"
+ " (loaded from original rev %ld"
+ ") >>>\n\n"), notify->new_revision,
+ notify->old_revision));
}
return;
@@ -881,27 +849,27 @@
switch (notify->node_action)
{
case svn_node_action_change:
- cmdline_stream_printf(feedback_stream, scratch_pool,
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
_(" * editing path : %s ..."),
- notify->path);
+ notify->path));
break;
case svn_node_action_delete:
- cmdline_stream_printf(feedback_stream, scratch_pool,
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
_(" * deleting path : %s ..."),
- notify->path);
+ notify->path));
break;
case svn_node_action_add:
- cmdline_stream_printf(feedback_stream, scratch_pool,
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
_(" * adding path : %s ..."),
- notify->path);
+ notify->path));
break;
case svn_node_action_replace:
- cmdline_stream_printf(feedback_stream, scratch_pool,
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
_(" * replacing path : %s ..."),
- notify->path);
+ notify->path));
break;
}
@@ -909,30 +877,32 @@
return;
case svn_repos_notify_load_node_done:
- cmdline_stream_printf(feedback_stream, scratch_pool, _(" done.\n"));
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ "%s", _(" done.\n")));
return;
case svn_repos_notify_load_copied_node:
- cmdline_stream_printf(feedback_stream, scratch_pool, "COPIED...");
+ len = 9;
+ svn_error_clear(svn_stream_write(feedback_stream, "COPIED...", &len));
return;
case svn_repos_notify_load_txn_start:
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("<<< Started new transaction, based on "
- "original revision %ld\n"),
- notify->old_revision);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("<<< Started new transaction, based on "
+ "original revision %ld\n"),
+ notify->old_revision));
return;
case svn_repos_notify_load_skipped_rev:
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("<<< Skipped original revision %ld\n"),
- notify->old_revision);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("<<< Skipped original revision %ld\n"),
+ notify->old_revision));
return;
case svn_repos_notify_load_normalized_mergeinfo:
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _(" removing '\\r' from %s ..."),
- SVN_PROP_MERGEINFO);
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _(" removing '\\r' from %s ..."),
+ SVN_PROP_MERGEINFO));
return;
case svn_repos_notify_mutex_acquired:
@@ -941,17 +911,17 @@
return;
case svn_repos_notify_recover_start:
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("Repository lock acquired.\n"
- "Please wait; recovering the"
- " repository may take some time...\n"));
+ svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+ _("Repository lock acquired.\n"
+ "Please wait; recovering the"
+ " repository may take some time...\n")));
return;
case svn_repos_notify_upgrade_start:
- cmdline_stream_printf(feedback_stream, scratch_pool,
- _("Repository lock acquired.\n"
- "Please wait; upgrading the"
- " repository may take some time...\n"));
+ svn_error_clear(svn_stream_puts(feedback_stream,
+ _("Repository lock acquired.\n"
+ "Please wait; upgrading the"
+ " repository may take some time...\n")));
return;
default:
Modified: trunk/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
===================================================================
--- trunk/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -45,6 +45,7 @@
#include "private/svn_mergeinfo_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
#ifdef _WIN32
typedef apr_status_t (__stdcall *open_fn_t)(apr_file_t **, apr_pool_t *);
@@ -569,6 +570,9 @@
}
else
{
+ const char *kind;
+ const char *action;
+
tcl = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH);
/* Test if this node was copied from dropped source. */
@@ -583,7 +587,6 @@
dumpfile should contain the new contents of the file. In this
scenario, we'll just do an add without history using the new
contents. */
- const char *kind;
kind = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_KIND);
/* If there is a Text-content-length header, and the kind is
@@ -622,6 +625,30 @@
if (! nb->rb->writing_begun)
SVN_ERR(output_revision(nb->rb));
+ /* A node record is required to begin with 'Node-path', skip the
+ leading '/' to match the form used by 'svnadmin dump'. */
+ SVN_ERR(svn_stream_printf(nb->rb->pb->out_stream,
+ pool, "%s: %s\n",
+ SVN_REPOS_DUMPFILE_NODE_PATH, node_path + 1));
+
+ /* Node-kind is next and is optional. */
+ kind = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_KIND);
+ if (kind)
+ SVN_ERR(svn_stream_printf(nb->rb->pb->out_stream,
+ pool, "%s: %s\n",
+ SVN_REPOS_DUMPFILE_NODE_KIND, kind));
+
+ /* Node-action is next and required. */
+ action = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_ACTION);
+ if (action)
+ SVN_ERR(svn_stream_printf(nb->rb->pb->out_stream,
+ pool, "%s: %s\n",
+ SVN_REPOS_DUMPFILE_NODE_ACTION, action));
+ else
+ return svn_error_createf(SVN_ERR_INCOMPLETE_DATA, 0,
+ _("Missing Node-action for path '%s'"),
+ node_path);
+
for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi))
{
const char *key = svn__apr_hash_index_key(hi);
@@ -637,7 +664,10 @@
if ((!strcmp(key, SVN_REPOS_DUMPFILE_CONTENT_LENGTH))
|| (!strcmp(key, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH))
- || (!strcmp(key, SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH)))
+ || (!strcmp(key, SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH))
+ || (!strcmp(key, SVN_REPOS_DUMPFILE_NODE_PATH))
+ || (!strcmp(key, SVN_REPOS_DUMPFILE_NODE_KIND))
+ || (!strcmp(key, SVN_REPOS_DUMPFILE_NODE_ACTION)))
continue;
/* Rewrite Node-Copyfrom-Rev if we are renumbering revisions.
@@ -1176,7 +1206,7 @@
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Modified: trunk/contrib/subversion/subversion/svnlook/svnlook.c
===================================================================
--- trunk/contrib/subversion/subversion/svnlook/svnlook.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svnlook/svnlook.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -58,6 +58,7 @@
#include "private/svn_cmdline_private.h"
#include "private/svn_fspath.h"
#include "private/svn_io_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -397,7 +398,7 @@
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Modified: trunk/contrib/subversion/subversion/svnmucc/svnmucc.c
===================================================================
--- trunk/contrib/subversion/subversion/svnmucc/svnmucc.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svnmucc/svnmucc.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -57,6 +57,7 @@
#include "private/svn_cmdline_private.h"
#include "private/svn_ra_private.h"
#include "private/svn_string_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -85,7 +86,7 @@
if (svn_cmdline_init(application, stderr))
exit(EXIT_FAILURE);
- err = svn_ver_check_list(&my_version, checklist);
+ err = svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
if (err)
handle_error(err, NULL);
@@ -1429,7 +1430,14 @@
if (! anchor)
anchor = url;
else
- anchor = svn_uri_get_longest_ancestor(anchor, url, pool);
+ {
+ anchor = svn_uri_get_longest_ancestor(anchor, url, pool);
+ if (!anchor || !anchor[0])
+ handle_error(svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+ "URLs in the action list do not "
+ "share a common ancestor"),
+ pool);
+ }
if ((++i == action_args->nelts) && (j + 1 < num_url_args))
insufficient(pool);
Modified: trunk/contrib/subversion/subversion/svnrdump/util.c
===================================================================
--- trunk/contrib/subversion/subversion/svnrdump/util.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svnrdump/util.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -35,7 +35,7 @@
const svn_string_t **value,
apr_pool_t *result_pool)
{
- if (svn_prop_needs_translation(name))
+ if (svn_prop_needs_translation(name) && *value)
{
const char *cstring;
Modified: trunk/contrib/subversion/subversion/svnserve/serve.c
===================================================================
--- trunk/contrib/subversion/subversion/svnserve/serve.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svnserve/serve.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1526,6 +1526,9 @@
&want_props, &want_contents,
&wants_inherited_props));
+ if (wants_inherited_props == SVN_RA_SVN_UNSPECIFIED_NUMBER)
+ wants_inherited_props = FALSE;
+
full_path = svn_fspath__join(b->fs_path->data,
svn_relpath_canonicalize(path, pool), pool);
@@ -1545,8 +1548,14 @@
SVN_CMD_ERR(svn_fs_file_checksum(&checksum, svn_checksum_md5, root,
full_path, TRUE, pool));
hex_digest = svn_checksum_to_cstring_display(checksum, pool);
+
+ /* Fetch the file's explicit and/or inherited properties if
+ requested. Although the wants-iprops boolean was added to the
+ protocol in 1.8 a standard 1.8 client never requests iprops. */
if (want_props || wants_inherited_props)
- SVN_CMD_ERR(get_props(&props, &inherited_props, &ab, root, full_path,
+ SVN_CMD_ERR(get_props(want_props ? &props : NULL,
+ wants_inherited_props ? &inherited_props : NULL,
+ &ab, root, full_path,
pool));
if (want_contents)
SVN_CMD_ERR(svn_fs_file_contents(&contents, root, full_path, pool));
@@ -1640,6 +1649,9 @@
&dirent_fields_list,
&wants_inherited_props));
+ if (wants_inherited_props == SVN_RA_SVN_UNSPECIFIED_NUMBER)
+ wants_inherited_props = FALSE;
+
if (! dirent_fields_list)
{
dirent_fields = SVN_DIRENT_ALL;
@@ -1689,10 +1701,13 @@
/* Fetch the root of the appropriate revision. */
SVN_CMD_ERR(svn_fs_revision_root(&root, b->fs, rev, pool));
- /* Fetch the directory's explicit and/or inherited properties
- if requested. */
+ /* Fetch the directory's explicit and/or inherited properties if
+ requested. Although the wants-iprops boolean was added to the
+ protocol in 1.8 a standard 1.8 client never requests iprops. */
if (want_props || wants_inherited_props)
- SVN_CMD_ERR(get_props(&props, &inherited_props, &ab, root, full_path,
+ SVN_CMD_ERR(get_props(want_props ? &props : NULL,
+ wants_inherited_props ? &inherited_props : NULL,
+ &ab, root, full_path,
pool));
/* Begin response ... */
Modified: trunk/contrib/subversion/subversion/svnserve/svnserve.c
===================================================================
--- trunk/contrib/subversion/subversion/svnserve/svnserve.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svnserve/svnserve.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -54,6 +54,7 @@
#include "private/svn_dep_compat.h"
#include "private/svn_cmdline_private.h"
#include "private/svn_atomic.h"
+#include "private/svn_subr_private.h"
#include "winservice.h"
@@ -214,10 +215,8 @@
" "
"minimize redundant operations.\n"
" "
- "Default is 128 for threaded and 16 for non-\n"
+ "Default is 16.\n"
" "
- "threaded mode.\n"
- " "
"[used for FSFS repositories only]")},
{"cache-txdeltas", SVNSERVE_OPT_CACHE_TXDELTAS, 1,
N_("enable or disable caching of deltas between older\n"
@@ -439,8 +438,9 @@
const char *contents = apr_psprintf(pool, "%" APR_PID_T_FMT "\n",
getpid());
+ SVN_ERR(svn_io_remove_file2(filename, TRUE, pool));
SVN_ERR(svn_io_file_open(&file, filename,
- APR_WRITE | APR_CREATE | APR_TRUNCATE,
+ APR_WRITE | APR_CREATE | APR_EXCL,
APR_OS_DEFAULT, pool));
SVN_ERR(svn_io_file_write_full(file, contents, strlen(contents), NULL,
pool));
@@ -465,7 +465,7 @@
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
Modified: trunk/contrib/subversion/subversion/svnsync/svnsync.c
===================================================================
--- trunk/contrib/subversion/subversion/svnsync/svnsync.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svnsync/svnsync.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -38,6 +38,7 @@
#include "private/svn_opt_private.h"
#include "private/svn_ra_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
#include "sync.h"
@@ -312,7 +313,7 @@
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
@@ -1297,7 +1298,7 @@
if (rb->sb->committed_rev != revision)
return svn_error_createf
(APR_EINVAL, NULL,
- _("Commit created rev %ld but should have created %ld"),
+ _("Commit created r%ld but should have created r%ld"),
rb->sb->committed_rev, revision);
SVN_ERR(svn_ra_rev_proplist(rb->to_session, revision, &existing_props,
Modified: trunk/contrib/subversion/subversion/svnversion/svnversion.c
===================================================================
--- trunk/contrib/subversion/subversion/svnversion/svnversion.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/svnversion/svnversion.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -29,6 +29,7 @@
#include "private/svn_opt_private.h"
#include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
#include "svn_private_config.h"
@@ -110,7 +111,7 @@
};
SVN_VERSION_DEFINE(my_version);
- return svn_ver_check_list(&my_version, checklist);
+ return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
}
/*
Modified: trunk/contrib/subversion/subversion/tests/cmdline/authz_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/authz_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/authz_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -576,8 +576,8 @@
if sbox.repo_url.startswith('http'):
expected_err2 = expected_err
else:
- expected_err2 = ".*svn: E220001: Unreadable path encountered; " \
- "access denied.*"
+ expected_err2 = ".*svn: E220001: ((Unreadable path encountered; " \
+ "access denied)|(Item is not readable)).*"
# if we do the same thing directly on the unreadable file, we get:
# svn: Item is not readable
@@ -1551,7 +1551,45 @@
'log', ddt_url,
'-c', 1, '--diff')
+ at Issue(4422)
+ at Skip(svntest.main.is_ra_type_file)
+def authz_file_external_to_authz(sbox):
+ "replace file external with authz node"
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ repo_url = sbox.repo_url
+
+ write_authz_file(sbox, {"/": "* = rw"})
+ write_restrictive_svnserve_conf(sbox.repo_dir)
+
+ sbox.simple_propset('svn:externals', 'Z ' + repo_url + '/iota', '')
+
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('', status=' M')
+ expected_status.add({
+ 'Z' : Item(status=' ', wc_rev='1', switched='X'),
+ })
+ svntest.actions.run_and_verify_update(wc_dir,
+ None, None, expected_status)
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'cp', repo_url + '/A',
+ repo_url + '/Z',
+ '-m', 'Add Z')
+
+ write_authz_file(sbox, {"/": "* = rw", "/Z": "* = "})
+
+ expected_status.tweak(wc_rev=2)
+
+ # ### This used to assert with
+ # ### svn: E235000: In file 'update_editor.c' line 3043: assertion failed
+ # ### (status != svn_wc__db_status_normal)
+
+ svntest.actions.run_and_verify_update(wc_dir,
+ None, None, expected_status)
+
+
########################################################################
# Run the tests
@@ -1585,6 +1623,7 @@
authz_svnserve_groups,
authz_del_from_subdir,
log_diff_dontdothat,
+ authz_file_external_to_authz,
]
serial_only = True
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/authz_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/autoprop_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/autoprop_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/autoprop_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -102,7 +102,9 @@
# some directories
wc_dir = sbox.wc_dir
- tmp_dir = os.path.abspath(svntest.main.temp_dir)
+ tmp_dir = os.path.join(os.path.abspath(svntest.main.temp_dir), sbox.name)
+ if not os.path.isdir(tmp_dir):
+ os.makedirs(tmp_dir)
config_dir = os.path.join(tmp_dir, 'autoprops_config_' + sbox.name)
repos_url = sbox.repo_url
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/autoprop_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/basic_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/basic_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/basic_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/basic_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/blame_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/blame_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/blame_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/blame_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/cat_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/cat_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/cat_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -213,7 +213,7 @@
["This is the file 'iota'.\n"],
[], 'cat', iota_path)
- svntest.main.file_append(iota_path, "$Revision: 1.1.1.1 $\n")
+ svntest.main.file_append(iota_path, "$Revision$\n")
svntest.actions.run_and_verify_svn(None, None, [],
'propset', 'svn:keywords', 'Revision',
iota_path)
@@ -222,7 +222,7 @@
'ci', '-m', 'r2', wc_dir)
svntest.actions.run_and_verify_svn(None,
- ["This is the file 'iota'.\n", "$Revision: 1.1.1.1 $\n"],
+ ["This is the file 'iota'.\n", "$Revision: 2 $\n"],
[], 'cat', iota_path)
def cat_url_special_characters(sbox):
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/cat_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/changelist_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/changelist_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/changelist_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/changelist_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/checkout_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/checkout_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/checkout_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -27,6 +27,7 @@
# General modules
import sys, re, os, time, subprocess
+import datetime
# Our testing module
import svntest
@@ -660,11 +661,28 @@
sbox.build()
wc_dir = sbox.wc_dir
- # note the current time to use it as peg revision date.
- current_time = time.strftime("%Y-%m-%dT%H:%M:%S")
+ ## Get svn:date.
+ exit_code, output, errput = svntest.main.run_svn(None, 'propget', 'svn:date',
+ '--revprop', '-r1',
+ '--strict',
+ sbox.repo_url)
+ if exit_code or errput != [] or len(output) != 1:
+ raise svntest.Failure("svn:date propget failed")
+ r1_string = output[0]
- # sleep till the next second.
- time.sleep(1.1)
+ ## Increment the svn:date date by one microsecond.
+ # TODO: pass tzinfo=UTC to datetime.datetime()
+ date_pattern = re.compile(r'(\d+)-(\d+)-(\d+)T(\d\d):(\d\d):(\d\d)\.(\d+)Z$')
+ r1_time = datetime.datetime(*map(int, date_pattern.match(r1_string).groups()))
+ peg_time = r1_time + datetime.timedelta(microseconds=1)
+ assert r1_time != peg_time
+ # peg_string is, by all likelihood, younger than r1's svn:date and older than
+ # r2's svn:date. It is also not equal to either of them, so we test the
+ # binary search of svn:date values.
+ peg_string = '%04d-%02d-%02dT%02d:%02d:%02d.%06dZ' % \
+ tuple(getattr(peg_time, x)
+ for x in ["year", "month", "day", "hour", "minute",
+ "second", "microsecond"])
# create a new revision
mu_path = os.path.join(wc_dir, 'A', 'mu')
@@ -673,7 +691,7 @@
svntest.actions.run_and_verify_svn(None, None, [],
'ci', '-m', 'changed file mu', wc_dir)
- # now checkout the repo at current_time in another folder, this should create our
+ # now checkout the repo at peg_string in another folder, this should create our
# initial wc without the change in mu.
checkout_target = sbox.add_wc_path('checkout')
os.mkdir(checkout_target)
@@ -686,11 +704,28 @@
# use an old date to checkout, that way we're sure we get the first revision
svntest.actions.run_and_verify_checkout(sbox.repo_url +
- '@{' + current_time + '}',
+ '@{' + peg_string + '}',
checkout_target,
expected_output,
expected_wc)
+ # now try another checkout with repo at r1_string
+ checkout_target = sbox.add_wc_path('checkout2')
+ os.mkdir(checkout_target)
+
+ expected_output = svntest.main.greek_state.copy()
+ expected_output.wc_dir = checkout_target
+ expected_output.tweak(status='A ', contents=None)
+
+ expected_wc = svntest.main.greek_state.copy()
+
+ # use an old date to checkout, that way we're sure we get the first revision
+ svntest.actions.run_and_verify_checkout(sbox.repo_url +
+ '@{' + r1_string + '}',
+ checkout_target,
+ expected_output,
+ expected_wc)
+
#----------------------------------------------------------------------
def co_with_obstructing_local_adds(sbox):
"co handles obstructing paths scheduled for add"
@@ -1052,7 +1087,7 @@
svntest.main.safe_rmtree(sbox.wc_dir)
os.mkdir(sbox.wc_dir)
- # create a virtual drive to the working copy folder
+ # create a virtual drive to the repository folder
drive = find_the_next_available_drive_letter()
if drive is None:
raise svntest.Skip
@@ -1088,9 +1123,50 @@
})
svntest.actions.run_and_verify_checkout(repo_url, wc_dir,
expected_output, expected_wc,
- None, None, None, None,
- '--force')
+ None, None, None, None)
+ wc2_dir = sbox.add_wc_path('2')
+ expected_output = wc.State(wc2_dir, {
+ 'D' : Item(status='A '),
+ 'D/H' : Item(status='A '),
+ 'D/H/psi' : Item(status='A '),
+ 'D/H/chi' : Item(status='A '),
+ 'D/H/omega' : Item(status='A '),
+ 'D/G' : Item(status='A '),
+ 'D/G/tau' : Item(status='A '),
+ 'D/G/pi' : Item(status='A '),
+ 'D/G/rho' : Item(status='A '),
+ 'D/gamma' : Item(status='A '),
+ 'C' : Item(status='A '),
+ 'mu' : Item(status='A '),
+ 'B' : Item(status='A '),
+ 'B/E' : Item(status='A '),
+ 'B/E/alpha' : Item(status='A '),
+ 'B/E/beta' : Item(status='A '),
+ 'B/F' : Item(status='A '),
+ 'B/lambda' : Item(status='A '),
+ })
+ svntest.actions.run_and_verify_checkout(repo_url + '/A', wc2_dir,
+ expected_output, None,
+ None, None, None, None)
+
+ wc3_dir = sbox.add_wc_path('3')
+ expected_output = wc.State(wc3_dir, {
+ 'H' : Item(status='A '),
+ 'H/psi' : Item(status='A '),
+ 'H/chi' : Item(status='A '),
+ 'H/omega' : Item(status='A '),
+ 'G' : Item(status='A '),
+ 'G/tau' : Item(status='A '),
+ 'G/pi' : Item(status='A '),
+ 'G/rho' : Item(status='A '),
+ 'gamma' : Item(status='A '),
+ })
+
+ svntest.actions.run_and_verify_checkout(repo_url + '/A/D', wc3_dir,
+ expected_output, None,
+ None, None, None, None)
+
finally:
os.chdir(was_cwd)
# cleanup the virtual drive
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/checkout_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/commit_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/commit_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/commit_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1250,7 +1250,7 @@
svntest.actions.run_and_verify_commit(wc_dir,
None,
None,
- "already exists",
+ "E160020: File.*already exists",
wc_dir)
#----------------------------------------------------------------------
@@ -2545,6 +2545,16 @@
'STDERR',
expected_stderr, actual_stderr)
+ # Now list the txns in the repo. The list should be empty.
+ exit_code, output, errput = svntest.main.run_svnadmin('lstxns',
+ sbox.repo_dir)
+ svntest.verify.compare_and_display_lines(
+ "Error running 'svnadmin lstxns'.",
+ 'STDERR', [], errput)
+ svntest.verify.compare_and_display_lines(
+ "Output of 'svnadmin lstxns' is unexpected.",
+ 'STDOUT', [], output)
+
#----------------------------------------------------------------------
@Issue(3553)
def pre_commit_hook_test(sbox):
@@ -2946,6 +2956,168 @@
svntest.actions.run_and_verify_info([expected], E_copied)
+ at Issue(4400)
+def commit_cp_with_deep_delete(sbox):
+ "verify behavior of a copy with a deep (>=3) delete"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # Prep by adding a tree deep enough to exercise the issue.
+ sbox.simple_mkdir('A/B/E/I')
+ sbox.simple_commit(message='prep')
+ svntest.main.run_svn(None, 'up', wc_dir)
+
+ # copy the deep tree and then delete a dir 3 deep.
+ sbox.simple_copy('A','A2')
+ sbox.simple_rm('A2/B/E/I')
+
+ # come up with the expected output and status
+ expected_output = svntest.wc.State(wc_dir, {
+ 'A2' : Item(verb='Adding'),
+ 'A2/B/E/I' : Item(verb='Deleting'),
+ })
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_status.add({
+ 'A/B/E/I' : Item(status=' ', wc_rev='2'),
+ 'A2' : Item(status=' ', wc_rev='3'),
+ 'A2/B' : Item(status=' ', wc_rev='3'),
+ 'A2/B/lambda' : Item(status=' ', wc_rev='3'),
+ 'A2/B/F' : Item(status=' ', wc_rev='3'),
+ 'A2/B/E' : Item(status=' ', wc_rev='3'),
+ 'A2/B/E/alpha' : Item(status=' ', wc_rev='3'),
+ 'A2/B/E/beta' : Item(status=' ', wc_rev='3'),
+ 'A2/D' : Item(status=' ', wc_rev='3'),
+ 'A2/D/gamma' : Item(status=' ', wc_rev='3'),
+ 'A2/D/H' : Item(status=' ', wc_rev='3'),
+ 'A2/D/H/psi' : Item(status=' ', wc_rev='3'),
+ 'A2/D/H/omega' : Item(status=' ', wc_rev='3'),
+ 'A2/D/H/chi' : Item(status=' ', wc_rev='3'),
+ 'A2/D/G' : Item(status=' ', wc_rev='3'),
+ 'A2/D/G/tau' : Item(status=' ', wc_rev='3'),
+ 'A2/D/G/rho' : Item(status=' ', wc_rev='3'),
+ 'A2/D/G/pi' : Item(status=' ', wc_rev='3'),
+ 'A2/C' : Item(status=' ', wc_rev='3'),
+ 'A2/mu' : Item(status=' ', wc_rev='3'),
+ })
+
+ # Commit the copy without the one dir.
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output,
+ expected_status,
+ None,
+ wc_dir)
+
+def commit_deep_deleted(sbox):
+ "try to commit a deep descendant of a deleted node"
+
+ sbox.build()
+
+ sbox.simple_move('A', 'AA')
+
+ sbox.simple_propset('k', 'v', 'AA/D/G')
+
+ # Committing some added descendant returns a proper error
+ expected_err = ('svn: E200009: \'%s\' is not known to exist in the ' +
+ 'repository and is not part of the commit, yet its ' +
+ 'child \'%s\' is part of the commit') % (
+ re.escape(os.path.abspath(sbox.ospath('AA'))),
+ re.escape(os.path.abspath(sbox.ospath('AA/D/G'))))
+
+ svntest.actions.run_and_verify_commit(sbox.wc_dir,
+ None,
+ None,
+ expected_err,
+ sbox.ospath('AA/D/G'))
+
+ sbox.simple_propdel('k', 'AA/D/G')
+ sbox.simple_rm('AA/D/G')
+
+ # But a delete fails..
+ # This used to trigger an assertion in Subversion 1.8.0-1.8.8, because
+ # the status walker couldn't find the repository path for AA/D/G
+ svntest.actions.run_and_verify_commit(sbox.wc_dir,
+ None,
+ None,
+ expected_err,
+ sbox.ospath('AA/D/G'))
+
+ # And now commit like how a GUI client would do it, but forgetting the move
+ expected_err = ('svn: E200009: Cannot commit \'%s\' because it was moved ' +
+ 'from \'%s\' which is not part of the commit; both sides ' +
+ 'of the move must be committed together') % (
+ re.escape(os.path.abspath(sbox.ospath('AA'))),
+ re.escape(os.path.abspath(sbox.ospath('A'))))
+ svntest.actions.run_and_verify_commit(sbox.wc_dir,
+ None,
+ None,
+ expected_err,
+ '--depth', 'empty',
+ sbox.ospath('AA/D/G'),
+ sbox.ospath('AA'))
+
+
+ # And now how it works
+ svntest.actions.run_and_verify_commit(sbox.wc_dir,
+ None,
+ None,
+ [],
+ '--depth', 'empty',
+ sbox.ospath('AA/D/G'),
+ sbox.ospath('AA'),
+ sbox.ospath('A'))
+
+ at Issue(4480)
+def commit_mergeinfo_ood(sbox):
+ "commit of mergeinfo that should cause out of date"
+
+ sbox.build()
+ sbox.simple_rm('A', 'iota')
+ sbox.simple_commit() # r2
+
+ sbox.simple_mkdir('trunk', 'branch')
+ sbox.simple_commit() # r3
+
+ sbox.simple_append('trunk/a', 'This is a\n')
+ sbox.simple_add('trunk/a')
+ sbox.simple_commit() # r4
+
+ sbox.simple_append('trunk/b', 'This is b\n')
+ sbox.simple_add('trunk/b')
+ sbox.simple_commit() # r5
+
+ sbox.simple_update() # To r5
+
+ expected_output = [
+ '--- Merging r4 into \'%s\':\n' % sbox.ospath('branch'),
+ 'A %s\n' % sbox.ospath('branch/a'),
+ '--- Recording mergeinfo for merge of r4' \
+ ' into \'%s\':\n' % sbox.ospath('branch'),
+ ' U %s\n' % sbox.ospath('branch'),
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge', '-c4', '^/trunk',
+ sbox.ospath('branch'))
+
+ sbox.simple_commit()
+
+ sbox.simple_update(revision='5')
+
+ expected_output = [
+ '--- Merging r5 into \'%s\':\n' % sbox.ospath('branch'),
+ 'A %s\n' % sbox.ospath('branch/b'),
+ '--- Recording mergeinfo for merge of r5 into \'%s\':\n' % sbox.ospath('branch'),
+ ' U %s\n' % sbox.ospath('branch'),
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge', '-c5', '^/trunk',
+ sbox.ospath('branch'))
+
+ # Currently this commit succeeds with dav over HTTPv2, while it should really fail
+ expected_err = '.*out of date.*'
+ svntest.actions.run_and_verify_svn(None, None, expected_err,
+ 'commit', sbox.ospath(''), '-m', 'M')
+
########################################################################
# Run the tests
@@ -3017,6 +3189,9 @@
commit_add_subadd,
commit_danglers,
last_changed_of_copied_subdir,
+ commit_cp_with_deep_delete,
+ commit_deep_deleted,
+ commit_mergeinfo_ood,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/commit_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/copy_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/copy_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/copy_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -25,7 +25,7 @@
######################################################################
# General modules
-import stat, os, re, shutil, logging
+import stat, os, re, shutil, logging, sys
logger = logging.getLogger()
@@ -5787,6 +5787,96 @@
sbox.ospath('A/C'),
sbox.ospath('A/D'))
+def copy_relocate(sbox):
+ "copy from a relocated location"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ tmp_dir = sbox.add_wc_path('relocated')
+
+ shutil.copytree(sbox.repo_dir, tmp_dir)
+
+ url = 'file://'
+
+ if sys.platform == 'win32':
+ url += '/'
+
+ url += os.path.abspath(tmp_dir).replace(os.path.sep, '/')
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'relocate', url, wc_dir)
+
+ copiedpath = sbox.ospath('AA')
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'cp', url + '/A', copiedpath)
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'info', copiedpath)
+
+def ext_wc_copy_deleted(sbox):
+ "copy deleted tree from separate wc"
+
+ sbox.build()
+
+ wc_dir = sbox.wc_dir
+ wc2_dir = sbox.add_wc_path('2')
+
+ sbox.simple_rm('A/B')
+ sbox.simple_commit()
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'up', '--set-depth', 'exclude',
+ sbox.ospath('A/D'))
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'co', sbox.repo_url, wc2_dir, '-r', 1)
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'cp', sbox.path('A'), os.path.join(wc2_dir,'AA'))
+
+ expected_output = expected_output = svntest.wc.State(wc2_dir, {
+ 'AA' : Item(verb='Adding'),
+ 'AA/B' : Item(verb='Deleting'),
+ })
+
+ svntest.actions.run_and_verify_commit(wc2_dir,
+ expected_output, None, None,
+ wc2_dir)
+
+def copy_subtree_deleted(sbox):
+ "copy to-be-deleted subtree"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ wc2_dir = sbox.add_wc_path('2')
+ svntest.actions.duplicate_dir(wc_dir, wc2_dir)
+
+ sbox.simple_rm('A/B')
+
+ # Commit copy within a working copy
+ sbox.simple_copy('A', 'AA')
+ expected_output = expected_output = svntest.wc.State(wc_dir, {
+ 'AA' : Item(verb='Adding'),
+ 'AA/B' : Item(verb='Deleting'),
+ })
+ svntest.actions.run_and_verify_commit(wc_dir,
+ expected_output, None, None,
+ sbox.ospath('AA'))
+
+ # Commit copy between working copies
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'cp', sbox.path('A'),
+ os.path.join(wc2_dir,'AA2'))
+ expected_output = expected_output = svntest.wc.State(wc2_dir, {
+ 'AA2' : Item(verb='Adding'),
+ 'AA2/B' : Item(verb='Deleting'),
+ })
+ svntest.actions.run_and_verify_commit(wc2_dir,
+ expected_output, None, None,
+ wc2_dir)
+
+
########################################################################
# Run the tests
@@ -5904,6 +5994,9 @@
copy_to_unversioned_parent,
copy_text_conflict,
copy_over_excluded,
+ copy_relocate,
+ ext_wc_copy_deleted,
+ copy_subtree_deleted,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/copy_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/dav-mirror-autocheck.sh
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/dav-mirror-autocheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/dav-mirror-autocheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/dav-mirror-autocheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/davautocheck.sh
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/davautocheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/davautocheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
@@ -20,7 +20,7 @@
#
#
# -*- mode: shell-script; -*-
-# $Id: davautocheck.sh,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $
+# $Id$
# This script simplifies preparation of environment for Subversion client
# communicating with a server via DAV protocol. The prerequisites of such
@@ -27,7 +27,7 @@
# testing are:
# - Subversion built using --enable-shared --enable-dso --with-apxs options,
# - Working Apache 2 HTTPD Server with the apxs program reachable through
-# PATH or specified via the APXS environment variable,
+# PATH or specified via the APXS Makefile variable or environment variable,
# - Modules dav_module and log_config_module compiled as DSO or built into
# Apache HTTPD Server executable.
# The basic intension of this script is to be able to perform "make check"
@@ -159,6 +159,17 @@
# Don't assume sbin is in the PATH.
PATH="$PATH:/usr/sbin:/usr/local/sbin"
+# Find the source and build directories. The build dir can be found if it is
+# the current working dir or the source dir.
+ABS_SRCDIR=$(cd ${SCRIPTDIR}/../../../; pwd)
+if [ -x subversion/svn/svn ]; then
+ ABS_BUILDDIR=$(pwd)
+elif [ -x $ABS_SRCDIR/subversion/svn/svn ]; then
+ ABS_BUILDDIR=$ABS_SRCDIR
+else
+ fail "Run this script from the root of Subversion's build tree!"
+fi
+
# Remove any proxy environmental variables that affect wget or curl.
# We don't need a proxy to connect to localhost and having the proxy
# environmental variables set breaks the Apache configuration file
@@ -169,10 +180,18 @@
unset HTTPS_PROXY
# Pick up value from environment or PATH (also try apxs2 - for Debian)
-[ ${APXS:+set} ] \
- || APXS=$(which apxs) \
- || APXS=$(which apxs2) \
- || fail "neither apxs or apxs2 found - required to run davautocheck"
+if [ ${APXS:+set} ]; then
+ :
+elif APXS=$(grep '^APXS' $ABS_BUILDDIR/Makefile | sed 's/^APXS *= *//') && \
+ [ -n "$APXS" ]; then
+ :
+elif APXS=$(which apxs); then
+ :
+elif APXS=$(which apxs2); then
+ :
+else
+ fail "neither apxs or apxs2 found - required to run davautocheck"
+fi
[ -x $APXS ] || fail "Can't execute apxs executable $APXS"
@@ -195,17 +214,6 @@
CACHE_REVPROPS_SETTING=on
fi
-# Find the source and build directories. The build dir can be found if it is
-# the current working dir or the source dir.
-ABS_SRCDIR=$(cd ${SCRIPTDIR}/../../../; pwd)
-if [ -x subversion/svn/svn ]; then
- ABS_BUILDDIR=$(pwd)
-elif [ -x $ABS_SRCDIR/subversion/svn/svn ]; then
- ABS_BUILDDIR=$ABS_SRCDIR
-else
- fail "Run this script from the root of Subversion's build tree!"
-fi
-
if [ ${MODULE_PATH:+set} ]; then
MOD_DAV_SVN="$MODULE_PATH/mod_dav_svn.so"
MOD_AUTHZ_SVN="$MODULE_PATH/mod_authz_svn.so"
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/davautocheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/depth_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/depth_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/depth_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/depth_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/diff_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/diff_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/diff_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1832,11 +1832,11 @@
iota_path)
fp = open(iota_path, 'w')
- fp.write("$Date: 2013-08-24 19:37:06 $\n")
- fp.write("$Id: diff_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $\n")
+ fp.write("$Date$\n")
+ fp.write("$Id$\n")
fp.write("$Rev$\n")
- fp.write("$Date: 2013-08-24 19:37:06 $\n" % (' ' * 80))
- fp.write("$Id: diff_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $\n" % (' ' * 80))
+ fp.write("$Date::%s$\n" % (' ' * 80))
+ fp.write("$Id::%s$\n" % (' ' * 80))
fp.write("$Rev::%s$\n" % (' ' * 80))
fp.close()
@@ -1869,11 +1869,11 @@
# Check fixed length keywords will show up
# when the length of keyword has changed
fp = open(iota_path, 'w')
- fp.write("$Date: 2013-08-24 19:37:06 $\n")
- fp.write("$Id: diff_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $\n")
+ fp.write("$Date$\n")
+ fp.write("$Id$\n")
fp.write("$Rev$\n")
- fp.write("$Date: 2013-08-24 19:37:06 $\n" % (' ' * 79))
- fp.write("$Id: diff_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $\n" % (' ' * 79))
+ fp.write("$Date::%s$\n" % (' ' * 79))
+ fp.write("$Id::%s$\n" % (' ' * 79))
fp.write("$Rev::%s$\n" % (' ' * 79))
fp.close()
@@ -4594,6 +4594,80 @@
expected_output = [ ]
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', wc_dir)
+ at Issue(4396)
+def diff_local_missing_obstruction(sbox):
+ "diff local missing and obstructed files"
+
+ sbox.build(read_only=True)
+ wc_dir = sbox.wc_dir
+
+ os.unlink(sbox.ospath('iota'))
+ os.unlink(sbox.ospath('A/mu'))
+ os.mkdir(sbox.ospath('A/mu'))
+
+ # Expect no output for missing and obstructed files
+ expected_output = [
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', wc_dir)
+
+ sbox.simple_propset('K', 'V', 'iota', 'A/mu')
+ sbox.simple_append('IotA', 'Content')
+
+ # But do expect a proper property diff
+ expected_output = [
+ 'Index: %s\n' % (sbox.path('A/mu'),),
+ '===================================================================\n',
+ '--- %s\t(revision 1)\n' % (sbox.path('A/mu'),),
+ '+++ %s\t(working copy)\n' % (sbox.path('A/mu'),),
+ '\n',
+ 'Property changes on: %s\n' % (sbox.path('A/mu'),),
+ '___________________________________________________________________\n',
+ 'Added: K\n',
+ '## -0,0 +1 ##\n',
+ '+V\n',
+ '\ No newline at end of property\n',
+ 'Index: %s\n' % (sbox.path('iota'),),
+ '===================================================================\n',
+ '--- %s\t(revision 1)\n' % (sbox.path('iota'),),
+ '+++ %s\t(working copy)\n' % (sbox.path('iota'),),
+ '\n',
+ 'Property changes on: %s\n' % (sbox.path('iota'),),
+ '___________________________________________________________________\n',
+ 'Added: K\n',
+ '## -0,0 +1 ##\n',
+ '+V\n',
+ '\ No newline at end of property\n',
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff', wc_dir)
+
+ # Create an external. This produces an error in 1.8.0.
+ sbox.simple_propset('svn:externals', 'AA/BB ' + sbox.repo_url + '/A', '.')
+ sbox.simple_update()
+
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'diff', wc_dir)
+
+
+ at Issue(4444)
+def diff_move_inside_copy(sbox):
+ "diff copied-along child that contains a moved file"
+ sbox.build(read_only=True)
+ wc_dir = sbox.wc_dir
+
+ d_path = 'A/D'
+ d_copy = 'A/D-copy'
+ h_path = 'A/D-copy/H'
+ chi_path = '%s/chi' % h_path
+ chi_moved = '%s/chi-moved' % h_path
+
+ sbox.simple_copy(d_path, d_copy)
+ sbox.simple_move(chi_path, chi_moved)
+ sbox.simple_append(chi_moved, 'a new line')
+
+ # Bug: Diffing the copied-along parent directory asserts
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ 'diff', sbox.ospath(h_path))
+
########################################################################
#Run the tests
@@ -4674,6 +4748,8 @@
diff_dir_replaced_by_dir,
diff_repos_empty_file_addition,
diff_missing_tree_conflict_victim,
+ diff_local_missing_obstruction,
+ diff_move_inside_copy,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/diff_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/entries_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/entries_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/entries_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/entries_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/export_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/export_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/export_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -964,6 +964,114 @@
if open(export_file).read() != ''.join(alpha_content):
raise svntest.Failure("wrong keyword expansion")
+ at Issue(4427)
+def export_file_external(sbox):
+ "export file external from WC and URL"
+ sbox.build()
+
+ wc_dir = sbox.wc_dir
+
+ # Set 'svn:externals' property in 'A/C' to 'A/B/E/alpha'(file external),
+ C_path = os.path.join(wc_dir, 'A', 'C')
+ externals_prop = "^/A/B/E/alpha exfile_alpha"
+
+ tmp_f = sbox.get_tempname('prop')
+ svntest.main.file_append(tmp_f, externals_prop)
+ svntest.main.run_svn(None, 'ps', '-F', tmp_f, 'svn:externals', C_path)
+ svntest.main.run_svn(None,'ci', '-m', 'log msg', '--quiet', C_path)
+
+ # Update the working copy to receive file external
+ svntest.main.run_svn(None, 'up', wc_dir)
+
+ # Update the expected disk tree to include the external.
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.add({
+ 'A/C/exfile_alpha' : Item("This is the file 'alpha'.\n"),
+ })
+
+ # Export from URL
+ export_target = sbox.add_wc_path('export_url')
+ expected_output = svntest.main.greek_state.copy()
+ expected_output.add({
+ 'A/C/exfile_alpha' : Item("This is the file 'alpha'.\r"),
+ })
+ expected_output.wc_dir = export_target
+ expected_output.desc[''] = Item()
+ expected_output.tweak(contents=None, status='A ')
+ svntest.actions.run_and_verify_export(sbox.repo_url,
+ export_target,
+ expected_output,
+ expected_disk)
+
+ # Export from WC
+ export_target = sbox.add_wc_path('export_wc')
+ expected_output = svntest.main.greek_state.copy()
+ expected_output.add({
+ 'A/C/exfile_alpha' : Item("This is the file 'alpha'.\r"),
+ })
+ expected_output.wc_dir = export_target
+ expected_output.desc['A'] = Item()
+ expected_output.tweak(contents=None, status='A ')
+ svntest.actions.run_and_verify_export(wc_dir,
+ export_target,
+ expected_output,
+ expected_disk)
+
+ at Issue(4427)
+def export_file_externals2(sbox):
+ "exporting file externals"
+
+ sbox.build()
+ sbox.simple_mkdir('DIR', 'DIR2')
+
+ sbox.simple_propset('svn:externals', '^/iota file', 'DIR')
+ sbox.simple_propset('svn:externals', '^/DIR TheDir', 'DIR2')
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ tmp = sbox.add_wc_path('tmp')
+ os.mkdir(tmp)
+
+ expected_output = svntest.wc.State(tmp, {
+ 'file' : Item(status='A '),
+ })
+ expected_disk = svntest.wc.State('', {
+ 'file': Item(contents="This is the file 'iota'.\n")
+ })
+ # Fails in 1.8.8 and r1575909.
+ # Direct export of file external was just skipped
+ svntest.actions.run_and_verify_export(sbox.ospath('DIR/file'),
+ tmp,
+ expected_output,
+ expected_disk)
+
+ expected_output = svntest.wc.State(tmp, {
+ 'DIR/file' : Item(status='A '),
+ })
+ expected_disk = svntest.wc.State('', {
+ 'file': Item(contents="This is the file 'iota'.\n")
+ })
+ # Fails in 1.8.8 (doesn't export file), passes in r1575909
+ svntest.actions.run_and_verify_export(sbox.ospath('DIR'),
+ os.path.join(tmp, 'DIR'),
+ expected_output,
+ expected_disk)
+
+ expected_output = svntest.wc.State(tmp, {
+ 'DIR2/TheDir/file' : Item(status='A '),
+ })
+ expected_disk = svntest.wc.State('', {
+ 'TheDir' : Item(),
+ 'TheDir/file' : Item(contents="This is the file 'iota'.\n")
+ })
+ # Fails in 1.8.8 (doesn't export anything),
+ # Fails in r1575909 (exports file twice; once as file; once as external)
+ svntest.actions.run_and_verify_export(sbox.ospath('DIR2'),
+ os.path.join(tmp, 'DIR2'),
+ expected_output,
+ expected_disk)
+
+
########################################################################
# Run the tests
@@ -998,6 +1106,8 @@
export_to_current_dir,
export_file_overwrite_with_force,
export_custom_keywords,
+ export_file_external,
+ export_file_externals2
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/export_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/externals_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/externals_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/externals_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -3227,6 +3227,38 @@
sbox.ospath('A/B/E'))
+def update_deletes_file_external(sbox):
+ "update deletes a file external"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ sbox.simple_propset('svn:externals', '../D/gamma gamma', 'A/C')
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ # Create a branch
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'copy',
+ '-m', 'create branch',
+ sbox.repo_url + '/A',
+ sbox.repo_url + '/A_copy')
+
+ # Update the working copy
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ # Remove the branch
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'rm',
+ '-m', 'remove branch',
+ sbox.repo_url + '/A_copy')
+
+ # As of r1448345, this update fails:
+ # E000002: Can't remove directory '.../A_copy/C': No such file or directory
+ sbox.simple_update()
+
+
########################################################################
# Run the tests
@@ -3279,6 +3311,7 @@
move_with_file_externals,
pinned_externals,
update_dir_external_shallow,
+ update_deletes_file_external
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/externals_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/getopt_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/getopt_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/getopt_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -72,6 +72,7 @@
re.compile(r"\* ra_(neon|local|svn|serf) :"),
re.compile(r" - handles '(https?|file|svn)' scheme"),
re.compile(r" - with Cyrus SASL authentication"),
+ re.compile(r" - using serf \d+\.\d+\.\d+"),
re.compile(r"\* fs_(base|fs) :"),
]
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/getopt_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/history_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/history_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/history_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/history_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/import_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/import_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/import_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/import_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/info_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/info_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/info_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -526,6 +526,11 @@
}]
svntest.actions.run_and_verify_info(expected_info, iota)
+ expected_info = [{
+ 'Path' : '%s' % re.escape(wc_dir),
+ }]
+ svntest.actions.run_and_verify_info(expected_info, wc_dir)
+
def relpath_escaping(sbox):
"relpath escaping should be usable as-is"
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/info_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/input_validation_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/input_validation_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/input_validation_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/input_validation_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/iprop_authz_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/iprop_authz_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/iprop_authz_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/iprop_authz_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/iprop_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/iprop_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/iprop_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/iprop_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/legacy/utf8_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/legacy/utf8_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/legacy/utf8_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/legacy/utf8_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/lock_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/lock_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/lock_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1521,7 +1521,6 @@
#----------------------------------------------------------------------
# Issue #3674: Replace + propset of locked file fails over DAV
- at XFail(svntest.main.is_ra_type_dav)
@Issue(3674)
def replace_and_propset_locked_path(sbox):
"test replace + propset of locked file"
@@ -1554,11 +1553,9 @@
# Replace A/D/G and A/D/G/rho, propset on A/D/G/rho.
svntest.actions.run_and_verify_svn(None, None, [],
'rm', G_path)
- # Recreate path for single-db
- if not os.path.exists(G_path):
- os.mkdir(G_path)
+
svntest.actions.run_and_verify_svn(None, None, [],
- 'add', G_path)
+ 'mkdir', G_path)
svntest.main.file_append(rho_path, "This is the new file 'rho'.\n")
svntest.actions.run_and_verify_svn(None, None, [],
'add', rho_path)
@@ -1890,6 +1887,168 @@
wc_dir)
+ at SkipUnless(svntest.main.is_ra_type_dav)
+def dav_lock_timeout(sbox):
+ "unlock a lock with timeout"
+
+ import httplib
+ from urlparse import urlparse
+ import base64
+
+ sbox.build()
+ loc = urlparse(sbox.repo_url)
+
+ if loc.scheme == 'http':
+ h = httplib.HTTPConnection(loc.hostname, loc.port)
+ else:
+ h = httplib.HTTPSConnection(loc.hostname, loc.port)
+
+ lock_body = '<?xml version="1.0" encoding="utf-8" ?>' \
+ '<D:lockinfo xmlns:D="DAV:">' \
+ ' <D:lockscope><D:exclusive/></D:lockscope>' \
+ ' <D:locktype><D:write/></D:locktype>' \
+ ' <D:owner>' \
+ ' <D:href>http://a/test</D:href>' \
+ ' </D:owner>' \
+ '</D:lockinfo>'
+
+ lock_headers = {
+ 'Authorization': 'Basic ' + base64.b64encode('jconstant:rayjandom'),
+ 'Timeout': 'Second-86400'
+ }
+
+ # Enabling the following line makes this test easier to debug
+ h.set_debuglevel(9)
+
+ h.request('LOCK', sbox.repo_url + '/iota', lock_body, lock_headers)
+
+ r = h.getresponse()
+
+ # Verify that there is a lock, by trying to obtain one
+ svntest.actions.run_and_verify_svn2(None, None, ".*locked by user", 0,
+ 'lock', '-m', '', sbox.ospath('iota'))
+
+ # Before this patch this used to fail with a parse error of the timeout
+ svntest.actions.run_and_verify_svn2(None, None, ".*W160039.*Unlock.*403", 0,
+ 'unlock', sbox.repo_url + '/iota')
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'unlock', sbox.ospath('iota'), '--force')
+
+
+
+def non_root_locks(sbox):
+ "locks for working copies not at repos root"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'cp', sbox.repo_url, sbox.repo_url + '/X',
+ '-m', 'copy greek tree')
+
+ sbox.simple_switch(sbox.repo_url + '/X')
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # Lock a file
+ svntest.actions.run_and_verify_svn(None, ".*locked by user", [],
+ 'lock', sbox.ospath('A/D/G/pi'),
+ '-m', '')
+ expected_status.tweak('A/D/G/pi', writelocked='K')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # Updates don't break the lock
+ sbox.simple_update('A/D')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ sbox.simple_update('')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # Break the lock
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'unlock', sbox.repo_url + '/X/A/D/G/pi')
+
+ # Subdir update reports the break
+ sbox.simple_update('A/D')
+ expected_status.tweak('A/D/G/pi', writelocked=None)
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # Relock and break
+ svntest.actions.run_and_verify_svn(None, ".*locked by user", [],
+ 'lock', sbox.ospath('A/D/G/pi'),
+ '-m', '')
+ expected_status.tweak('A/D/G/pi', writelocked='K')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'unlock', sbox.repo_url + '/X/A/D/G/pi')
+
+ # Root update reports the break
+ sbox.simple_update('')
+ expected_status.tweak('A/D/G/pi', writelocked=None)
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ at Issue(3515)
+ at SkipUnless(svntest.main.is_ra_type_dav)
+def dav_lock_refresh(sbox):
+ "refresh timeout of DAV lock"
+
+ import httplib
+ from urlparse import urlparse
+ import base64
+
+ sbox.build(create_wc = False)
+
+ # Acquire lock on 'iota'
+ svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+ sbox.repo_url + '/iota')
+
+ # Try to refresh lock using 'If' header
+ loc = urlparse(sbox.repo_url)
+
+ if loc.scheme == 'http':
+ h = httplib.HTTPConnection(loc.hostname, loc.port)
+ else:
+ h = httplib.HTTPSConnection(loc.hostname, loc.port)
+
+ lock_token = svntest.actions.run_and_parse_info(sbox.repo_url + '/iota')[0]['Lock Token']
+
+ lock_headers = {
+ 'Authorization': 'Basic ' + base64.b64encode('jrandom:rayjandom'),
+ 'If': '(<' + lock_token + '>)',
+ 'Timeout': 'Second-7200'
+ }
+
+ # Enabling the following line makes this test easier to debug
+ h.set_debuglevel(9)
+
+ h.request('LOCK', sbox.repo_url + '/iota', '', lock_headers)
+
+ # XFAIL Refreshing of DAV lock fails with error '412 Precondition Failed'
+ r = h.getresponse()
+ if r.status != httplib.OK:
+ raise svntest.Failure('Lock refresh failed: %d %s' % (r.status, r.reason))
+
+ at SkipUnless(svntest.main.is_ra_type_dav)
+def delete_locked_file_with_percent(sbox):
+ "lock and delete a file called 'a %( ) .txt'"
+
+ sbox.build()
+
+ locked_filename = 'a %( ) .txt'
+ locked_path = sbox.ospath(locked_filename)
+ svntest.main.file_write(locked_path, "content\n")
+ sbox.simple_add(locked_filename)
+ sbox.simple_commit()
+
+ sbox.simple_lock(locked_filename)
+ sbox.simple_rm(locked_filename)
+
+ # XFAIL: With a 1.8.x client, this commit fails with:
+ # svn: E175002: Unexpected HTTP status 400 'Bad Request' on '/svn-test-work/repositories/lock_tests-52/!svn/txr/2-2/a%20%25(%20)%20.txt'
+ # and the following error in the httpd error log:
+ # Invalid percent encoded URI in tagged If-header [400, #104]
+ sbox.simple_commit()
+
########################################################################
# Run the tests
@@ -1943,6 +2102,10 @@
lock_unlock_deleted,
commit_stolen_lock,
drop_locks_on_parent_deletion,
+ dav_lock_timeout,
+ non_root_locks,
+ dav_lock_refresh,
+ delete_locked_file_with_percent,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/lock_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/log_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/log_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/log_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/log_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/merge_authz_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/merge_authz_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/merge_authz_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/merge_authz_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/merge_automatic_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/merge_automatic_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/merge_automatic_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1202,6 +1202,132 @@
svntest.actions.run_and_verify_svn(None, expected_output, [], 'merge',
sbox.repo_url + '/branch', A_path)
+ at Issue(4481)
+def reintegrate_subtree_not_updated(sbox):
+ "reintegrate subtree not updated"
+
+ sbox.build()
+
+ # Create change on branch 'D_1'
+ sbox.simple_copy('A/D', 'D_1')
+ sbox.simple_commit()
+ sbox.simple_append('D_1/G/pi', "D_1/G pi edit\n")
+ sbox.simple_append('D_1/H/chi', "D_1/H chi edit\n")
+ sbox.simple_commit()
+
+ # Merge back to 'D' with two subtree merges
+ expected_output = [
+ "--- Merging r2 through r3 into '"
+ + sbox.ospath('A/D/G') + "':\n",
+ "U "
+ + sbox.ospath('A/D/G/pi') + "\n",
+ "--- Recording mergeinfo for merge of r2 through r3 into '"
+ + sbox.ospath('A/D/G') + "':\n",
+ " U "
+ + sbox.ospath('A/D/G') + "\n"]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge',
+ sbox.repo_url + '/D_1/G',
+ sbox.ospath('A/D/G'))
+ expected_output = [
+ "--- Merging r2 through r3 into '"
+ + sbox.ospath('A/D/H') + "':\n",
+ "U "
+ + sbox.ospath('A/D/H/chi') + "\n",
+ "--- Recording mergeinfo for merge of r2 through r3 into '"
+ + sbox.ospath('A/D/H') + "':\n",
+ " U "
+ + sbox.ospath('A/D/H') + "\n"]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge',
+ sbox.repo_url + '/D_1/H',
+ sbox.ospath('A/D/H'))
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ # Create branch 'D_2'
+ sbox.simple_copy('A/D', 'D_2')
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ # Create change on 'D_2'
+ sbox.simple_append('D_2/G/pi', "D_2/G pi edit\n")
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ # Create change on 'D'
+ sbox.simple_append('A/D/G/rho', "D/G rho edit\n")
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ # Sync merge to 'D_2' (doesn't record mergeinfo on 'D_2/H' subtree)
+ expected_output = [
+ "--- Merging r5 through r7 into '"
+ + sbox.ospath('D_2') + "':\n",
+ "U "
+ + sbox.ospath('D_2/G/rho') + "\n",
+ "--- Recording mergeinfo for merge of r5 through r7 into '"
+ + sbox.ospath('D_2') + "':\n",
+ " U "
+ + sbox.ospath('D_2') + "\n",
+ "--- Recording mergeinfo for merge of r5 through r7 into '"
+ + sbox.ospath('D_2/G') + "':\n",
+ " U "
+ + sbox.ospath('D_2/G') + "\n"]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge',
+ sbox.repo_url + '/A/D',
+ sbox.ospath('D_2'))
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ # Reintegrate 'D_2' to 'D'
+ expected_output = [
+ "--- Merging differences between repository URLs into '"
+ + sbox.ospath('A/D') + "':\n",
+ "U "
+ + sbox.ospath('A/D/G/pi') + "\n",
+ " U "
+ + sbox.ospath('A/D/G') + "\n",
+ "--- Recording mergeinfo for merge between repository URLs into '"
+ + sbox.ospath('A/D') + "':\n",
+ " U "
+ + sbox.ospath('A/D') + "\n",
+ " U "
+ + sbox.ospath('A/D/G') + "\n"]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge',
+ sbox.repo_url + '/D_2',
+ sbox.ospath('A/D'))
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ # merge to 'D_2'. This merge previously failed with this error:
+ #
+ # svn: E195016: Reintegrate can only be used if revisions 5 through 9 were
+ # previously merged from [URL]/D_2 to the reintegrate source, but this is
+ # not the case:
+ # A/D/G
+ # Missing ranges: /A/D/G:7
+ #
+ expected_output = [
+ "--- Merging differences between repository URLs into '"
+ + sbox.ospath('D_2') + "':\n",
+ " U "
+ + sbox.ospath('D_2/G') + "\n",
+ "--- Recording mergeinfo for merge between repository URLs into '"
+ + sbox.ospath('D_2') + "':\n",
+ " U "
+ + sbox.ospath('D_2') + "\n",
+ " G "
+ + sbox.ospath('D_2/G') + "\n"]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge',
+ sbox.repo_url + '/A/D',
+ sbox.ospath('D_2'))
+ sbox.simple_commit()
+ sbox.simple_update()
+
########################################################################
# Run the tests
@@ -1230,6 +1356,7 @@
merge_replacement,
auto_merge_handles_replacements_in_merge_source,
effective_sync_results_in_reintegrate,
+ reintegrate_subtree_not_updated,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/merge_automatic_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/merge_reintegrate_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/merge_reintegrate_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/merge_reintegrate_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/merge_reintegrate_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/merge_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/merge_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/merge_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2047,7 +2047,7 @@
# Commit the second branch
expected_output = wc.State(wc_dir, {
'L' : Item(verb='Adding'),
- 'L/theta' : Item(verb='Adding (bin)'),
+ 'L/theta' : Item(verb='Replacing'),
})
expected_status.add({
@@ -2246,7 +2246,7 @@
"ci", "-m", "r3", wcpath)
# Add a file to t.
- svntest.main.file_append(t_fpath, "$Revision: 1.1.1.1 $")
+ svntest.main.file_append(t_fpath, "$Revision$")
svntest.actions.run_and_verify_svn(None, None, [],
'add', t_fpath)
# Ask for keyword expansion in the file.
@@ -2280,7 +2280,7 @@
expected_elision_output = wc.State(bpath, {
})
expected_disk = wc.State('', {
- 'f' : Item("$Revision: 1.1.1.1 $"),
+ 'f' : Item("$Revision: 4 $"),
})
expected_status = wc.State(bpath, {
'' : Item(status=' M', wc_rev=4),
@@ -12526,7 +12526,7 @@
path = local_path(path)
dirname, filename = os.path.split(path)
svntest.main.file_write(path, "This is the file '" + filename + "'.\n" +
- "Last changed in '$Revision: 1.1.1.1 $'.\n")
+ "Last changed in '$Revision$'.\n")
svntest.actions.run_and_verify_svn(None, None, [], 'add', path)
svntest.actions.run_and_verify_svn(None, None, [], 'propset',
'svn:keywords', 'Revision', path)
@@ -17990,7 +17990,7 @@
# make some 'binary' files with keyword expansion enabled
for f in files:
- svntest.main.file_append(sbox.ospath(f), "With $Revision: 1.1.1.1 $ keyword.\n")
+ svntest.main.file_append(sbox.ospath(f), "With $Revision: $ keyword.\n")
svntest.main.run_svn(binary_mime_type_on_text_file_warning,
'propset', 'svn:mime-type',
'application/octet-stream', sbox.ospath(f))
@@ -18047,7 +18047,7 @@
sbox.wc_dir = ''
# make a file with keyword expansion enabled
- svntest.main.file_write('A/keyfile', "$Date: 2013-08-24 19:37:06 $ $Revision: 1.1.1.1 $\n")
+ svntest.main.file_write('A/keyfile', "$Date$ $Revision$\n")
sbox.simple_add('A/keyfile')
sbox.simple_propset('svn:keywords', 'Date Revision', 'A/keyfile')
sbox.simple_commit()
@@ -18073,7 +18073,7 @@
# modify the original version: disable those KW & enable 'Id'
sbox.simple_propset('svn:keywords', 'Id', 'A/keyfile')
- svntest.main.file_append('A/keyfile', "$Id: merge_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $\n")
+ svntest.main.file_append('A/keyfile', "$Id$\n")
sbox.simple_commit()
# sync merge again
@@ -19143,6 +19143,159 @@
# Commit the merge.
#sbox.simple_commit()
+def merge_dir_delete_force(sbox):
+ "merge a directory delete with --force"
+
+ sbox.build()
+
+ sbox.simple_rm('A/D/G')
+ sbox.simple_commit() # r2
+
+ sbox.simple_update(revision=1)
+
+ # Just merging r2 on r1 succeeds
+ svntest.actions.run_and_verify_svn(sbox.wc_dir, None, [],
+ 'merge', '-c2', '^/', sbox.wc_dir,
+ '--ignore-ancestry')
+
+ # Bring working copy to r1 again
+ svntest.actions.run_and_verify_svn(sbox.wc_dir, None, [],
+ 'revert', '-R', sbox.wc_dir)
+
+ # But when using --force this same merge caused a segfault in 1.8.0-1.8.8
+ svntest.actions.run_and_verify_svn(sbox.wc_dir, None, [],
+ 'merge', '-c2', '^/', sbox.wc_dir,
+ '--ignore-ancestry', '--force')
+
+def conflict_naming(sbox):
+ "verify conflict file naming"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ sbox.simple_append('file.txt', 'This is the initial content\n')
+ sbox.simple_add('file.txt')
+ sbox.simple_commit()
+
+ sbox.simple_append('file.txt', 'This is the new content\n', truncate=True)
+ sbox.simple_commit()
+
+ sbox.simple_append('file.txt', 'This is conflicting content\n', truncate=True)
+
+ # Update - no preserve ext
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_disk = svntest.main.greek_state.copy()
+ expected_output = svntest.wc.State(wc_dir, {
+ 'file.txt' : Item(status='C ')
+ })
+ expected_status.add({
+ 'file.txt' : Item(status='C ', wc_rev='2')
+ })
+
+ expected_disk.add({
+ 'file.txt.r3' : Item(contents="This is the new content\n"),
+ 'file.txt.r2' : Item(contents="This is the initial content\n"),
+ 'file.txt' : Item(contents="<<<<<<< .mine\n" \
+ "This is conflicting content\n" \
+ "=======\n" \
+ "This is the initial content\n" \
+ ">>>>>>> .r2\n"),
+ 'file.txt.mine' : Item(contents="This is conflicting content\n"),
+ })
+ svntest.actions.run_and_verify_update(wc_dir,
+ expected_output, expected_disk,
+ expected_status,
+ None, None, None,
+ None, None, None,
+ wc_dir, '-r', '2')
+
+ sbox.simple_revert('file.txt')
+ sbox.simple_update('', revision=3)
+ sbox.simple_append('file.txt', 'This is conflicting content\n', truncate=True)
+
+ # Update - preserve ext
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+ expected_disk = svntest.main.greek_state.copy()
+ expected_output = svntest.wc.State(wc_dir, {
+ 'file.txt' : Item(status='C ')
+ })
+ expected_status.add({
+ 'file.txt' : Item(status='C ', wc_rev='2')
+ })
+
+ expected_disk.add({
+ 'file.txt.r3.txt' : Item(contents="This is the new content\n"),
+ 'file.txt.r2.txt' : Item(contents="This is the initial content\n"),
+ 'file.txt' : Item(contents="<<<<<<< .mine.txt\n" \
+ "This is conflicting content\n" \
+ "=======\n" \
+ "This is the initial content\n" \
+ ">>>>>>> .r2.txt\n"),
+ 'file.txt.mine.txt' : Item(contents="This is conflicting content\n"),
+ })
+ svntest.actions.run_and_verify_update(
+ wc_dir,
+ expected_output, expected_disk, expected_status,
+ None, None, None, None, None, None,
+ wc_dir, '-r', '2',
+ '--config-option',
+ 'config:miscellany:preserved-conflict-file-exts=' +
+ 'c txt h')
+
+ sbox.simple_revert('file.txt')
+ sbox.simple_update('', revision=3)
+ sbox.simple_append('file.txt', 'This is conflicting content\n', truncate=True)
+
+ # Merge - no preserve ext
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
+ expected_disk = svntest.main.greek_state.copy()
+ expected_status.add({
+ 'file.txt' : Item(status='C ', wc_rev='3')
+ })
+ expected_disk.add({
+ 'file.txt.merge-left.r3' : Item(contents="This is the new content\n"),
+ 'file.txt.merge-right.r2': Item(contents="This is the initial content\n"),
+ 'file.txt' : Item(contents="<<<<<<< .working\n" \
+ "This is conflicting content\n" \
+ "=======\n" \
+ "This is the initial content\n" \
+ ">>>>>>> .merge-right.r2\n"),
+ 'file.txt.working' : Item(contents="This is conflicting content\n"),
+ })
+
+ svntest.actions.run_and_verify_svn(wc_dir, None, [],
+ 'merge', '-c-3', '^/', sbox.ospath(''))
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ svntest.actions.verify_disk(wc_dir, expected_disk)
+
+ sbox.simple_revert('file.txt')
+ sbox.simple_append('file.txt', 'This is conflicting content\n', truncate=True)
+
+ # Merge - preserve ext
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 3)
+ expected_disk = svntest.main.greek_state.copy()
+ expected_status.add({
+ 'file.txt' : Item(status='C ', wc_rev='3')
+ })
+ expected_disk.add({
+ 'file.txt.merge-left.r3.txt' : Item(contents="This is the new content\n"),
+ 'file.txt.merge-right.r2.txt': Item(contents="This is the initial content\n"),
+ 'file.txt' : Item(contents="<<<<<<< .working.txt\n" \
+ "This is conflicting content\n" \
+ "=======\n" \
+ "This is the initial content\n" \
+ ">>>>>>> .merge-right.r2.txt\n"),
+ 'file.txt.working.txt' : Item(contents="This is conflicting content\n"),
+ })
+
+ svntest.actions.run_and_verify_svn(
+ wc_dir, None, [],
+ 'merge', '-c-3', '^/', sbox.ospath(''),
+ '--config-option',
+ 'config:miscellany:preserved-conflict-file-exts=' +
+ 'c txt h')
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+ svntest.actions.verify_disk(wc_dir, expected_disk)
+
########################################################################
# Run the tests
@@ -19288,6 +19441,8 @@
single_editor_drive_merge_notifications,
conflicted_split_merge_with_resolve,
merge_to_empty_target_merge_to_infinite_target,
+ merge_dir_delete_force,
+ conflict_naming,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/merge_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/merge_tree_conflict_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/merge_tree_conflict_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/merge_tree_conflict_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/merge_tree_conflict_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/mergeinfo_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/mergeinfo_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/mergeinfo_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/mergeinfo_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/move_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/move_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/move_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1234,6 +1234,237 @@
svntest.actions.run_and_verify_status(wc_dir, expected_status)
+def setup_move_many(sbox):
+ "helper function which creates a wc with node A/A/A which is moved 3 times"
+
+ sbox.simple_rm('A', 'iota')
+ sbox.simple_mkdir('A',
+ 'A/A',
+ 'A/A/A',
+ 'A/A/A/A',
+ 'B',
+ 'B/A',
+ 'B/A/A',
+ 'B/A/A/A',
+ 'C',
+ 'C/A',
+ 'C/A/A',
+ 'C/A/A/A')
+ sbox.simple_commit()
+ sbox.simple_update()
+
+ sbox.simple_move('A/A/A', 'AAA_1')
+
+ sbox.simple_rm('A')
+ sbox.simple_move('B', 'A')
+
+ sbox.simple_move('A/A/A', 'AAA_2')
+
+ sbox.simple_rm('A/A')
+ sbox.simple_move('C/A', 'A/A')
+
+ sbox.simple_move('A/A/A', 'AAA_3')
+
+def move_many_status(wc_dir):
+ "obtain standard status after setup_move_many"
+
+ return svntest.wc.State(wc_dir, {
+ '' : Item(status=' ', wc_rev='2'),
+
+ 'AAA_1' : Item(status='A ', copied='+', moved_from='A/A/A', wc_rev='-'),
+ 'AAA_1/A' : Item(status=' ', copied='+', wc_rev='-'),
+
+ 'AAA_2' : Item(status='A ', copied='+', moved_from='A/A/A', wc_rev='-'),
+ 'AAA_2/A' : Item(status=' ', copied='+', wc_rev='-'),
+
+ 'AAA_3' : Item(status='A ', copied='+', moved_from='A/A/A', wc_rev='-'),
+ 'AAA_3/A' : Item(status=' ', copied='+', wc_rev='-'),
+
+ 'A' : Item(status='R ', copied='+', moved_from='B', wc_rev='-'),
+ 'A/A' : Item(status='R ', copied='+', moved_from='C/A', wc_rev='-'),
+ 'A/A/A' : Item(status='D ', copied='+', wc_rev='-', moved_to='AAA_3'),
+ 'A/A/A/A' : Item(status='D ', copied='+', wc_rev='-'),
+
+ 'B' : Item(status='D ', wc_rev='2', moved_to='A'),
+ 'B/A' : Item(status='D ', wc_rev='2'),
+ 'B/A/A' : Item(status='D ', wc_rev='2'),
+ 'B/A/A/A' : Item(status='D ', wc_rev='2'),
+
+ 'C' : Item(status=' ', wc_rev='2'),
+ 'C/A' : Item(status='D ', wc_rev='2', moved_to='A/A'),
+ 'C/A/A' : Item(status='D ', wc_rev='2'),
+ 'C/A/A/A' : Item(status='D ', wc_rev='2'),
+ })
+
+def move_many_update_delete(sbox):
+ "move many and delete-on-update"
+
+ sbox.build()
+ setup_move_many(sbox)
+
+ wc_dir = sbox.wc_dir
+
+ # Verify start situation
+ expected_status = move_many_status(wc_dir)
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # And now create a tree conflict
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'rm', sbox.repo_url + '/B',
+ '-m', '')
+
+ expected_output = svntest.wc.State(wc_dir, {
+ 'B' : Item(status=' ', treeconflict='C'),
+ })
+
+
+ expected_status.tweak('', 'C', 'C/A', 'C/A/A', 'C/A/A/A', wc_rev='3')
+ expected_status.tweak('A', moved_from=None)
+ expected_status.remove('B/A', 'B/A/A', 'B/A/A/A')
+ expected_status.tweak('B', status='! ', treeconflict='C', wc_rev=None, moved_to=None)
+
+ svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
+ expected_status)
+
+ # Would be nice if we could run the resolver as a separate step,
+ # but 'svn resolve' just fails for any value but working
+
+ at XFail()
+def move_many_update_add(sbox):
+ "move many and add-on-update"
+
+ sbox.build()
+ setup_move_many(sbox)
+
+ wc_dir = sbox.wc_dir
+
+ # Verify start situation
+ expected_status = move_many_status(wc_dir)
+ #svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # And now create a tree conflict
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', sbox.repo_url + '/B/A/A/BB',
+ '-m', '')
+
+ expected_output = svntest.wc.State(wc_dir, {
+ 'B' : Item(status=' ', treeconflict='C'),
+ 'B/A' : Item(status=' ', treeconflict='U'),
+ 'B/A/A' : Item(status=' ', treeconflict='U'),
+ 'B/A/A/BB' : Item(status=' ', treeconflict='A'),
+ # And while resolving
+ 'A/A/' : Item(status=' ', treeconflict='C')
+ })
+
+ expected_status.tweak('',
+ 'B', 'B/A', 'B/A/A', 'B/A/A/A',
+ 'C', 'C/A', 'C/A/A', 'C/A/A/A',
+ wc_rev='3')
+
+ expected_status.tweak('A/A', treeconflict='C')
+ expected_status.add({
+ 'A/A/A/BB' : Item(status='D ', copied='+', wc_rev='-'),
+ 'B/A/A/BB' : Item(status='D ', wc_rev='3'),
+ })
+
+ svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
+ expected_status,
+ None, None, None,
+ None, None, None,
+ wc_dir, '--accept', 'mine-conflict')
+
+ # And another one
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', sbox.repo_url + '/C/A/A/BB',
+ '-m', '')
+
+ expected_status.tweak('',
+ 'B', 'B/A', 'B/A/A', 'B/A/A/A',
+ 'C', 'C/A', 'C/A/A', 'C/A/A/A',
+ wc_rev='4')
+
+ expected_output = svntest.wc.State(wc_dir, {
+ 'C/A' : Item(status=' ', treeconflict='C'),
+ 'C/A/A' : Item(status=' ', treeconflict='U'),
+ 'C/A/A/BB' : Item(status=' ', treeconflict='A'),
+ })
+
+ # This currently triggers an assertion failure
+ svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
+ expected_status,
+ None, None, None,
+ None, None, None,
+ wc_dir, '--accept', 'mine-conflict')
+
+ at Issue(4437)
+def move_del_moved(sbox):
+ "delete moved node, still a move"
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ sbox.simple_mkdir('A/NEW')
+ sbox.simple_move('A/mu', 'A/NEW/mu')
+ sbox.simple_rm('A/NEW/mu')
+
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('A/mu', status='D ')
+ expected_status.add({
+ 'A/NEW' : Item(status='A ', wc_rev='-')
+ })
+
+ # A/mu still reports that it is moved to A/NEW/mu, while it is already
+ # deleted there.
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+def copy_move_commit(sbox):
+ "copy, move and commit"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ #repro
+ # Prepare
+ # - Create folder aaa
+ # - Add file bbb.sql
+ # create table bbb (Id int not null)
+ # - Commit
+ # Repro Issue 2
+ # - Copy folder aaa under same parent folder (i.e. as a sibling). (using Ctrl drag/drop).
+ # Creates Copy of aaa
+ # - Rename Copy of aaa to eee
+ # - Commit
+ # Get error need to update
+ # - Update
+ # - Commit
+ # Get error need to update
+
+ sbox.simple_copy('A/D/G', 'A/D/GG')
+ sbox.simple_move('A/D/GG', 'A/D/GG-moved')
+ sbox.simple_commit('A/D/GG-moved')
+
+
+def move_to_from_external(sbox):
+ "move to and from an external"
+
+ sbox.build()
+ sbox.simple_propset('svn:externals', '^/A/D/G GG', '')
+ sbox.simple_update()
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'move',
+ sbox.ospath('GG/tau'),
+ sbox.ospath('tau'))
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'move',
+ sbox.ospath('iota'),
+ sbox.ospath('GG/tau'))
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'ci', '-m', 'Commit both',
+ sbox.ospath(''),
+ sbox.ospath('GG'))
+
+
#######################################################################
# Run the tests
@@ -1245,6 +1476,11 @@
deeper_move_file_test,
property_merge,
move_missing,
+ move_many_update_delete,
+ move_many_update_add,
+ move_del_moved,
+ copy_move_commit,
+ move_to_from_external,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/move_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/patch_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/patch_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/patch_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/patch_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/prop_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/prop_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/prop_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2612,6 +2612,62 @@
'propget', '--strict', 'ordinal',
sbox.ospath('iota') + '@BASE')
+def iprops_list_abspath(sbox):
+ "test listing iprops via abspath"
+
+ sbox.build()
+
+ sbox.simple_propset('im', 'root', '')
+ sbox.simple_commit()
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'switch', '^/A/D', sbox.ospath(''),
+ '--ignore-ancestry')
+
+ sbox.simple_propset('im', 'GammA', 'gamma')
+
+ expected_output = [
+ 'Inherited properties on \'%s\',\n' % sbox.ospath('')[:-1],
+ 'from \'%s\':\n' % sbox.repo_url,
+ ' im\n',
+ ' root\n',
+ 'Properties on \'%s\':\n' % sbox.ospath('gamma'),
+ ' im\n',
+ ' GammA\n'
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'pl', '-R',
+ '--show-inherited-props', '-v',
+ sbox.ospath(''))
+
+ expected_output = [
+ 'Inherited properties on \'%s\',\n' % os.path.abspath(sbox.ospath('')),
+ 'from \'%s\':\n' % sbox.repo_url,
+ ' im\n',
+ ' root\n',
+ 'Properties on \'%s\':\n' % os.path.abspath(sbox.ospath('gamma')),
+ ' im\n',
+ ' GammA\n'
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'pl', '-R',
+ '--show-inherited-props', '-v',
+ os.path.abspath(sbox.ospath('')))
+
+def wc_propop_on_url(sbox):
+ "perform wc specific operations on url"
+
+ sbox.build(create_wc = False)
+
+ svntest.actions.run_and_verify_svn(None, None, '.*E195000:.*path',
+ 'pl', '-r', 'PREV',
+ sbox.repo_url)
+
+ svntest.actions.run_and_verify_svn(None, None, '.*E195000:.*path',
+ 'pg', 'my:Q', '-r', 'PREV',
+ sbox.repo_url)
+
+
########################################################################
# Run the tests
@@ -2657,6 +2713,8 @@
inheritable_ignores,
almost_known_prop_names,
peg_rev_base_working,
+ iprops_list_abspath,
+ wc_propop_on_url,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/prop_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/redirect_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/redirect_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/redirect_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -140,7 +140,45 @@
verify_url(wc_dir, sbox.repo_url)
#----------------------------------------------------------------------
+ at SkipUnless(svntest.main.is_ra_type_dav)
+def redirected_nonroot_update(sbox):
+ "redirected update of non-repos-root wc"
+ sbox.build(create_wc=False)
+ wc_dir = sbox.wc_dir
+ checkout_url = sbox.repo_url + '/A'
+ relocate_url = sbox.redirected_root_url() + '/A'
+
+ # Checkout a subdir of the repository root.
+ exit_code, out, err = svntest.main.run_svn(None, 'co',
+ checkout_url, wc_dir)
+ if err:
+ raise svntest.Failure
+
+ # Relocate (by cheating) the working copy to the redirect URL. When
+ # we then update, we'll expect to find ourselves automagically back
+ # to the original URL. (This is because we can't easily introduce a
+ # redirect to the Apache configuration from the test suite here.)
+ svntest.actions.no_relocate_validation()
+ exit_code, out, err = svntest.main.run_svn(None, 'sw', '--relocate',
+ checkout_url, relocate_url,
+ wc_dir)
+ svntest.actions.do_relocate_validation()
+
+ # Now update the working copy.
+ exit_code, out, err = svntest.main.run_svn(None, 'up', wc_dir)
+ if err:
+ raise svntest.Failure
+ if not re.match("^Updating '.*':", out[0]):
+ raise svntest.Failure
+ if not redirect_regex.match(out[1]):
+ raise svntest.Failure
+
+ # Verify that we have the expected URL.
+ verify_url(wc_dir, checkout_url)
+
+#----------------------------------------------------------------------
+
########################################################################
# Run the tests
@@ -149,6 +187,7 @@
temporary_redirect,
redirected_checkout,
redirected_update,
+ redirected_nonroot_update,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/redirect_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/relocate_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/relocate_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/relocate_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/relocate_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/resolve_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/resolve_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/resolve_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/resolve_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/revert_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/revert_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/revert_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1644,6 +1644,8 @@
'revert', '-R', wc_dir)
+
+
########################################################################
# Run the tests
@@ -1683,7 +1685,7 @@
revert_no_text_change_conflict_recursive,
revert_with_unversioned_targets,
revert_nonexistent,
- revert_obstructing_wc
+ revert_obstructing_wc,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/revert_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/schedule_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/schedule_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/schedule_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/schedule_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/special_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/special_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/special_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/special_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/stat_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/stat_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/stat_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -2092,6 +2092,122 @@
# beta is modified so timestamp is removed
no_text_timestamp(sbox.ospath('A/B/E2/beta'))
+ at Issue(4398)
+def status_path_handling(sbox):
+ "relative/absolute path handling"
+
+ sbox.build(read_only=True)
+
+ # target is a relative path to a subdir
+ wc_dir = sbox.wc_dir
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+ # target is an absolute path to a subdir
+ cwd = os.getcwd()
+ abs_wc_dir = os.path.join(cwd, wc_dir)
+ expected_status = svntest.actions.get_virginal_state(abs_wc_dir, 1)
+ svntest.actions.run_and_verify_status(abs_wc_dir, expected_status)
+
+ # target is an absolute path to a parent dir
+ os.chdir(sbox.ospath('A/B'))
+ expected_status = svntest.actions.get_virginal_state(abs_wc_dir, 1)
+ svntest.actions.run_and_verify_status(abs_wc_dir, expected_status)
+
+ # target is a relative path to a parent dir
+ rel_wc_dir = os.path.join('..', '..')
+ expected_status = svntest.actions.get_virginal_state(rel_wc_dir, 1)
+ svntest.actions.run_and_verify_status(rel_wc_dir, expected_status)
+
+def status_move_missing_direct(sbox):
+ "move information when status is called directly"
+
+ sbox.build()
+ sbox.simple_copy('A', 'Z')
+ sbox.simple_commit('')
+ sbox.simple_update('')
+
+ sbox.simple_move('Z', 'ZZ')
+ sbox.simple_move('A', 'Z')
+ sbox.simple_move('Z/B', 'ZB')
+ sbox.simple_mkdir('Z/B')
+ sbox.simple_move('ZB/E', 'Z/B/E')
+
+ # Somehow 'svn status' now shows different output for 'ZB/E'
+ # when called directly and via an ancestor, as this handles
+ # multi-layer in a different way
+
+ # Note that the status output may change over different Subversion revisions,
+ # but the status on a node should be identical anyway 'svn status' is called
+ # on it.
+
+ expected_output = [
+ 'A + %s\n' % sbox.ospath('ZB'),
+ ' > moved from %s\n' % os.path.join('..', 'Z', 'B'),
+ 'D + %s\n' % sbox.ospath('ZB/E'),
+ ' > moved to %s\n' % os.path.join('..', 'Z', 'B', 'E'),
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [], 'status',
+ sbox.ospath('ZB'), '--depth', 'immediates')
+
+ # And calling svn status on just 'ZB/E' should have the same result for this node
+ # except that we calculate the relative path from a different base
+ expected_output = [
+ 'D + %s\n' % sbox.ospath('ZB/E'),
+ ' > moved to %s\n' % os.path.join('..', '..', 'Z', 'B', 'E'),
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [], 'status',
+ sbox.ospath('ZB/E'), '--depth', 'empty')
+
+def status_move_missing_direct_base(sbox):
+ "move when status is called directly with base"
+
+ sbox.build()
+ sbox.simple_copy('A', 'Z')
+ sbox.simple_mkdir('Q')
+ sbox.simple_mkdir('Q/ZB')
+ sbox.simple_mkdir('Q/ZB/E')
+ sbox.simple_commit('')
+ sbox.simple_update('')
+
+ sbox.simple_rm('Q')
+ sbox.simple_mkdir('Q')
+
+ sbox.simple_move('Z', 'ZZ')
+ sbox.simple_move('A', 'Z')
+ sbox.simple_move('Z/B', 'Q/ZB')
+ sbox.simple_mkdir('Z/B')
+ sbox.simple_move('Q/ZB/E', 'Z/B/E')
+
+ # Somehow 'svn status' now shows different output for 'Q/ZB/E'
+ # when called directly and via an ancestor, as this handles
+ # multi-layer in a different way
+
+ # Note that the status output may change over different Subversion revisions,
+ # but the status on a node should be identical anyway 'svn status' is called
+ # on it.
+
+ # This test had a different result as status_move_missing_direct at the time of
+ # writing this test.
+
+ expected_output = [
+ 'A + %s\n' % sbox.ospath('Q/ZB'),
+ ' > moved from %s\n' % os.path.join('..', '..', 'Z', 'B'),
+ 'D + %s\n' % sbox.ospath('Q/ZB/E'),
+ ' > moved to %s\n' % os.path.join('..', '..', 'Z', 'B', 'E'),
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [], 'status',
+ sbox.ospath('Q/ZB'), '--depth', 'immediates')
+
+ # And calling svn status on just 'ZB/E' should have the same result for this node,
+ # except that the moved_to information is calculated from the node itself
+ expected_output = [
+ 'D + %s\n' % sbox.ospath('Q/ZB/E'),
+ ' > moved to %s\n' % os.path.join('..', '..', '..', 'Z', 'B', 'E'),
+ ]
+ svntest.actions.run_and_verify_svn(None, expected_output, [], 'status',
+ sbox.ospath('Q/ZB/E'), '--depth', 'empty')
+
########################################################################
# Run the tests
@@ -2139,6 +2255,9 @@
status_unversioned_dir,
status_case_changed,
move_update_timestamps,
+ status_path_handling,
+ status_move_missing_direct,
+ status_move_missing_direct_base,
]
if __name__ == '__main__':
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/stat_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/svnadmin_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnadmin_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnadmin_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1616,7 +1616,7 @@
cwd = os.getcwd()
# Configure two files per shard to trigger packing
format_file = open(os.path.join(sbox.repo_dir, 'db', 'format'), 'wb')
- format_file.write("4\nlayout sharded 2\n")
+ format_file.write("6\nlayout sharded 2\n")
format_file.close()
# Pack revisions 0 and 1.
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnadmin_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/svnauthz_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnauthz_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnauthz_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnauthz_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/svndumpfilter_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svndumpfilter_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svndumpfilter_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -559,7 +559,7 @@
full_dump_contents = open(full_dump).read()
filtered_dumpfile, filtered_out = filter_and_return_output(
full_dump_contents,
- 8192, # Set a sufficiently large bufsize to avoid a deadlock
+ 16384, # Set a sufficiently large bufsize to avoid a deadlock
"exclude", "branches/B2",
"--skip-missing-merge-sources", "--drop-empty-revs")
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svndumpfilter_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/svneditor.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svneditor.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svneditor.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svneditor.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/svnlook_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnlook_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnlook_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnlook_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/svnmucc_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnmucc_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnmucc_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnmucc_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/svnrdump_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnrdump_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnrdump_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnrdump_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/svnserveautocheck.sh
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnserveautocheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnserveautocheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnserveautocheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/svnsync_authz_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnsync_authz_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnsync_authz_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnsync_authz_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/svnsync_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnsync_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnsync_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnsync_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/svntest/main.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svntest/main.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svntest/main.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -922,7 +922,8 @@
if options.fs_type is None or options.fs_type == 'fsfs':
# fsfs.conf file
- if options.config_file is not None:
+ if options.config_file is not None and \
+ (not minor_version or minor_version >= 6):
shutil.copy(options.config_file, get_fsfs_conf_file_path(path))
# format file
Modified: trunk/contrib/subversion/subversion/tests/cmdline/svntest/objects.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svntest/objects.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svntest/objects.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -238,7 +238,7 @@
if content is None:
# Default content
content = "This is the file '" + filename + "'.\n" + \
- "Last changed in '$Revision: 1.1.1.1 $'.\n"
+ "Last changed in '$Revision$'.\n"
main.file_write(lpath, content)
actions.run_and_verify_svn(None, None, [], 'add', lpath)
Index: trunk/contrib/subversion/subversion/tests/cmdline/svnversion_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/svnversion_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/svnversion_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/svnversion_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/switch_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/switch_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/switch_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/switch_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/trans_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/trans_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/trans_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -144,19 +144,19 @@
id_with_space_path = os.path.join(wc_dir, 'id with space')
id_exp_with_dollar_path = os.path.join(wc_dir, 'id_exp with_$_sign')
- svntest.main.file_append(author_rev_unexp_path, "$Author: laffer1 $\n$Rev$")
- svntest.main.file_append(author_rev_exp_path, "$Author: laffer1 $\n$Rev: 0 $")
+ svntest.main.file_append(author_rev_unexp_path, "$Author$\n$Rev$")
+ svntest.main.file_append(author_rev_exp_path, "$Author: blah $\n$Rev: 0 $")
svntest.main.file_append(url_unexp_path, "$URL$")
svntest.main.file_append(url_exp_path, "$URL: blah $")
- svntest.main.file_append(id_unexp_path, "$Id: trans_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $")
- svntest.main.file_append(id_exp_path, "$Id: trans_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $")
- svntest.main.file_append(header_unexp_path, "$Header: /home/cvs/src/contrib/subversion/subversion/tests/cmdline/trans_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $")
- svntest.main.file_append(header_exp_path, "$Header: /home/cvs/src/contrib/subversion/subversion/tests/cmdline/trans_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $")
+ svntest.main.file_append(id_unexp_path, "$Id$")
+ svntest.main.file_append(id_exp_path, "$Id: blah $")
+ svntest.main.file_append(header_unexp_path, "$Header$")
+ svntest.main.file_append(header_exp_path, "$Header: blah $")
svntest.main.file_append(bogus_keywords_path, "$Arthur$\n$Rev0$")
svntest.main.file_append(embd_author_rev_unexp_path,
- "one\nfish\n$Author: laffer1 $ two fish\n red $Rev$\n fish")
+ "one\nfish\n$Author$ two fish\n red $Rev$\n fish")
svntest.main.file_append(embd_author_rev_exp_path,
- "blue $Author: laffer1 $ fish$Rev: 0 $\nI fish")
+ "blue $Author: blah $ fish$Rev: 0 $\nI fish")
svntest.main.file_append(embd_bogus_keywords_path,
"you fish $Arthur$then\n we$Rev0$ \n\nchew fish")
@@ -181,9 +181,9 @@
for i in keyword_test_targets:
svntest.main.file_append(fixed_length_keywords_path, i)
- svntest.main.file_append(id_with_space_path, "$Id: trans_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $")
+ svntest.main.file_append(id_with_space_path, "$Id$")
svntest.main.file_append(id_exp_with_dollar_path,
- "$Id: trans_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $_sign 1 2006-06-10 11:10:00Z jrandom $")
+ "$Id: id_exp with_$_sign 1 2006-06-10 11:10:00Z jrandom $")
### Helper functions for setting/removing properties
@@ -411,7 +411,7 @@
fp = open(id_exp_with_dollar_path, 'r')
lines = fp.readlines()
if not ((len(lines) == 1)
- and (re.match("\$Id: trans_tests.py,v 1.1.1.1 2013-08-24 19:37:06 laffer1 Exp $_sign [^$]* jrandom \$",
+ and (re.match("\$Id: .*id_exp with_\$_sign [^$]* jrandom \$",
lines[0]))):
logger.warn("Id expansion failed for %s", id_exp_with_dollar_path)
@@ -644,7 +644,7 @@
lambda_path = os.path.join(wc_dir, 'A', 'B', 'lambda')
# Set up A/mu to do $Rev$ keyword expansion
- svntest.main.file_append(mu_path , "$Rev$\n$Author: laffer1 $")
+ svntest.main.file_append(mu_path , "$Rev$\n$Author$")
svntest.actions.run_and_verify_svn(None, None, [],
'propset', 'svn:keywords', 'Rev Author',
mu_path)
@@ -688,7 +688,7 @@
svntest.actions.run_and_verify_svn(None,
[ "This is the file 'mu'.\n",
"$Rev: 2 $\n",
- "$Author: laffer1 $"], [],
+ "$Author: " + key_author + " $"], [],
'cat', '-r', 'HEAD', mu_path)
@@ -803,10 +803,10 @@
iota_path = os.path.join(wc_dir, 'iota')
content = ["This is the file 'iota'.\n",
- "$Author: laffer1 $\n",
+ "$Author$\n",
]
content_expanded = ["This is the file 'iota'.\n",
- "$Author: laffer1 $\n",
+ "$Author: jrandom $\n",
]
# Create r2 with iota's contents and svn:keywords modified
@@ -855,7 +855,7 @@
wc_dir, '-r', '2')
if open(iota_path).read() != ''.join(content_expanded):
- raise svntest.Failure("$Author: laffer1 $ is not expanded in 'iota'")
+ raise svntest.Failure("$Author$ is not expanded in 'iota'")
# Update to r3. this should retranslate iota, dropping the keyword expansion
expected_disk = svntest.main.greek_state.copy()
@@ -871,7 +871,7 @@
wc_dir)
if open(iota_path).read() != ''.join(content):
- raise svntest.Failure("$Author: laffer1 $ is not contracted in 'iota'")
+ raise svntest.Failure("$Author$ is not contracted in 'iota'")
# We used to leave some temporary files around. Make sure that we don't.
temps = os.listdir(os.path.join(wc_dir, svntest.main.get_admin_name(), 'tmp'))
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/trans_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/subversion/tests/cmdline/tree_conflict_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/tree_conflict_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/tree_conflict_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/tree_conflict_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/update_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/update_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/update_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -5287,7 +5287,7 @@
wc_dir = sbox.wc_dir
mu_path = sbox.ospath('A/mu')
- svntest.main.file_append(mu_path, '$Id: update_tests.py,v 1.1.1.1 2013-08-24 19:37:07 laffer1 Exp $')
+ svntest.main.file_append(mu_path, '$Id$')
svntest.main.run_svn(None, 'ps', 'svn:keywords', 'Id', mu_path)
svntest.main.run_svn(None, 'lock', mu_path)
mu_ts_before_update = os.path.getmtime(mu_path)
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/update_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/cmdline/upgrade_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/upgrade_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/upgrade_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -430,7 +430,10 @@
url = sbox.repo_url
- xml_entries_relocate(sbox.wc_dir, 'file:///1.0.0/repos', url)
+ # This is non-canonical by the rules of svn_uri_canonicalize, it gets
+ # written into the entries file and upgrade has to canonicalize.
+ non_canonical_url = url[:-1] + '%%%02x' % ord(url[-1])
+ xml_entries_relocate(sbox.wc_dir, 'file:///1.0.0/repos', non_canonical_url)
# Attempt to use the working copy, this should give an error
expected_stderr = wc_is_too_old_regex
@@ -1425,6 +1428,17 @@
if paths != expected_paths:
raise svntest.Failure("changelist not matched")
+
+def upgrade_1_7_dir_external(sbox):
+ "upgrade from 1.7 with dir external"
+
+ sbox.build(create_wc = False)
+ replace_sbox_with_tarfile(sbox, 'upgrade_1_7_dir_external.tar.bz2')
+
+ # This fails for 'make check EXCLUSIVE_WC_LOCKS=1' giving an error:
+ # svn: warning: W200033: sqlite[S5]: database is locked
+ svntest.actions.run_and_verify_svn(None, None, [], 'upgrade', sbox.wc_dir)
+
########################################################################
# Run the tests
@@ -1480,6 +1494,7 @@
iprops_upgrade,
iprops_upgrade1_6,
changelist_upgrade_1_6,
+ upgrade_1_7_dir_external,
]
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/upgrade_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Copied: trunk/contrib/subversion/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_7_dir_external.tar.bz2 (from rev 9265, vendor/apache/subversion/dist/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_7_dir_external.tar.bz2)
===================================================================
(Binary files differ)
Modified: trunk/contrib/subversion/subversion/tests/cmdline/wc_tests.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/cmdline/wc_tests.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/cmdline/wc_tests.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -118,8 +118,13 @@
sbox.simple_append('A/B/kappa', 'xyz', True)
sbox.simple_add('Z/B/kappa')
+def is_posix_os_and_not_root():
+ if not svntest.main.is_posix_os():
+ return False
+ return os.getuid() != 0
+
@Issue(4118)
- at SkipUnless(svntest.main.is_posix_os)
+ at SkipUnless(is_posix_os_and_not_root)
def status_with_inaccessible_wc_db(sbox):
"""inaccessible .svn/wc.db"""
Property changes on: trunk/contrib/subversion/subversion/tests/cmdline/wc_tests.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/libsvn_fs_fs/fs-pack-test.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_fs_fs/fs-pack-test.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_fs_fs/fs-pack-test.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -788,6 +788,75 @@
#undef SHARD_SIZE
/* ------------------------------------------------------------------------ */
+#define REPO_NAME "get_set_multiple_huge_revprops_packed_fs"
+#define SHARD_SIZE 4
+#define MAX_REV 9
+static svn_error_t *
+get_set_multiple_huge_revprops_packed_fs(const svn_test_opts_t *opts,
+ apr_pool_t *pool)
+{
+ svn_fs_t *fs;
+ svn_string_t *prop_value;
+ svn_revnum_t rev;
+
+ /* Bail (with success) on known-untestable scenarios */
+ if ((strcmp(opts->fs_type, "fsfs") != 0)
+ || (opts->server_minor_version && (opts->server_minor_version < 7)))
+ return SVN_NO_ERROR;
+
+ /* Create the packed FS and open it. */
+ SVN_ERR(prepare_revprop_repo(&fs, REPO_NAME, MAX_REV, SHARD_SIZE, opts,
+ pool));
+
+ /* Set commit messages to different values */
+ for (rev = 0; rev <= MAX_REV; ++rev)
+ SVN_ERR(svn_fs_change_rev_prop(fs, rev, SVN_PROP_REVISION_LOG,
+ default_log(rev, pool),
+ pool));
+
+ /* verify */
+ for (rev = 0; rev <= MAX_REV; ++rev)
+ {
+ SVN_ERR(svn_fs_revision_prop(&prop_value, fs, rev,
+ SVN_PROP_REVISION_LOG, pool));
+ SVN_TEST_STRING_ASSERT(prop_value->data, default_log(rev, pool)->data);
+ }
+
+ /* Put a huge revprop into revision 1 and 2. */
+ SVN_ERR(svn_fs_change_rev_prop(fs, 1, SVN_PROP_REVISION_LOG,
+ huge_log(1, pool),
+ pool));
+ SVN_ERR(svn_fs_change_rev_prop(fs, 2, SVN_PROP_REVISION_LOG,
+ huge_log(2, pool),
+ pool));
+ SVN_ERR(svn_fs_change_rev_prop(fs, 5, SVN_PROP_REVISION_LOG,
+ huge_log(5, pool),
+ pool));
+ SVN_ERR(svn_fs_change_rev_prop(fs, 6, SVN_PROP_REVISION_LOG,
+ huge_log(6, pool),
+ pool));
+
+ /* verify */
+ for (rev = 0; rev <= MAX_REV; ++rev)
+ {
+ SVN_ERR(svn_fs_revision_prop(&prop_value, fs, rev,
+ SVN_PROP_REVISION_LOG, pool));
+
+ if (rev == 1 || rev == 2 || rev == 5 || rev == 6)
+ SVN_TEST_STRING_ASSERT(prop_value->data,
+ huge_log(rev, pool)->data);
+ else
+ SVN_TEST_STRING_ASSERT(prop_value->data,
+ default_log(rev, pool)->data);
+ }
+
+ return SVN_NO_ERROR;
+}
+#undef REPO_NAME
+#undef MAX_REV
+#undef SHARD_SIZE
+
+/* ------------------------------------------------------------------------ */
/* The test table. */
@@ -812,5 +881,7 @@
"recover a fully packed filesystem"),
SVN_TEST_OPTS_PASS(file_hint_at_shard_boundary,
"test file hint at shard boundary"),
+ SVN_TEST_OPTS_PASS(get_set_multiple_huge_revprops_packed_fs,
+ "set multiple huge revprops in packed FSFS"),
SVN_TEST_NULL
};
Modified: trunk/contrib/subversion/subversion/tests/libsvn_repos/repos-test.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_repos/repos-test.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_repos/repos-test.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -3261,6 +3261,65 @@
}
+/* Notification receiver for test_dump_bad_mergeinfo(). This does not
+ need to do anything, it just needs to exist.
+ */
+static void
+dump_r0_mergeinfo_notifier(void *baton,
+ const svn_repos_notify_t *notify,
+ apr_pool_t *scratch_pool)
+{
+}
+
+/* Regression test for part the 'dump' part of issue #4476 "Mergeinfo
+ containing r0 makes svnsync and svnadmin dump fail". */
+static svn_error_t *
+test_dump_r0_mergeinfo(const svn_test_opts_t *opts,
+ apr_pool_t *pool)
+{
+ svn_repos_t *repos;
+ svn_fs_t *fs;
+ svn_fs_txn_t *txn;
+ svn_fs_root_t *txn_root;
+ svn_revnum_t youngest_rev = 0;
+ const svn_string_t *bad_mergeinfo = svn_string_create("/foo:0", pool);
+
+ SVN_ERR(svn_test__create_repos(&repos, "test-repo-dump-r0-mergeinfo",
+ opts, pool));
+ fs = svn_repos_fs(repos);
+
+ /* Revision 1: Any commit will do, here */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, pool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
+ SVN_ERR(svn_fs_make_dir(txn_root, "/bar", pool));
+ SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
+
+ /* Revision 2: Add bad mergeinfo */
+ SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, pool));
+ SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
+ SVN_ERR(svn_fs_change_node_prop(txn_root, "/bar", "svn:mergeinfo", bad_mergeinfo, pool));
+ SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
+
+ /* Test that a dump completes without error. In order to exercise the
+ functionality under test -- that is, in order for the dump to try to
+ parse the mergeinfo it is dumping -- the dump must start from a
+ revision greater than 1 and must take a notification callback. */
+ {
+ svn_stringbuf_t *stringbuf = svn_stringbuf_create_empty(pool);
+ svn_stream_t *stream = svn_stream_from_stringbuf(stringbuf, pool);
+
+ SVN_ERR(svn_repos_dump_fs3(repos, stream, 2, SVN_INVALID_REVNUM,
+ FALSE, FALSE,
+ dump_r0_mergeinfo_notifier, NULL,
+ NULL, NULL,
+ pool));
+ }
+
+ return SVN_NO_ERROR;
+}
+
/* The test table. */
struct svn_test_descriptor_t test_funcs[] =
@@ -3306,5 +3365,7 @@
"test svn_repos_delete"),
SVN_TEST_OPTS_PASS(filename_with_control_chars,
"test filenames with control characters"),
+ SVN_TEST_OPTS_PASS(test_dump_r0_mergeinfo,
+ "test dumping with r0 mergeinfo"),
SVN_TEST_NULL
};
Modified: trunk/contrib/subversion/subversion/tests/libsvn_subr/checksum-test.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_subr/checksum-test.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_subr/checksum-test.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -23,7 +23,10 @@
#include <apr_pools.h>
+#include <zlib.h>
+
#include "svn_error.h"
+#include "svn_io.h"
#include "private/svn_pseudo_md5.h"
#include "../svn_test.h"
@@ -155,6 +158,87 @@
return SVN_NO_ERROR;
}
+static svn_error_t *
+zlib_expansion_test(const svn_test_opts_t *opts,
+ apr_pool_t *pool)
+{
+ const char *data_path;
+ svn_stringbuf_t *deflated;
+ Byte dst_buffer[256 * 1024];
+ Byte *src_buffer;
+ apr_size_t sz;
+
+ data_path = svn_dirent_join(opts->srcdir, "zlib.deflated", pool);
+
+ SVN_ERR(svn_stringbuf_from_file2(&deflated, data_path, pool));
+ src_buffer = (Byte*)deflated->data;
+
+ /* Try to decompress the same data with different blocksizes */
+ for (sz = 1; sz < 256; sz++)
+ {
+ z_stream stream;
+ memset(&stream, 0, sizeof(stream));
+ inflateInit2(&stream, -15 /* DEFLATE_WINDOW_SIZE */);
+
+ stream.avail_in = sz;
+ stream.next_in = src_buffer;
+ stream.avail_out = sizeof(dst_buffer);
+ stream.next_out = dst_buffer;
+
+ do
+ {
+ int zr = inflate(&stream, Z_NO_FLUSH);
+
+ if (zr != Z_OK && zr != Z_STREAM_END)
+ {
+ return svn_error_createf(
+ SVN_ERR_TEST_FAILED, NULL,
+ "Failure decompressing with blocksize %d", (int)sz);
+ }
+ stream.avail_in += sz;
+ } while (stream.next_in + stream.avail_in < src_buffer + deflated->len);
+
+ stream.avail_in = (src_buffer + deflated->len) - stream.next_in;
+
+ {
+ int zr = inflate(&stream, Z_NO_FLUSH);
+
+ if (zr != Z_STREAM_END)
+ {
+ return svn_error_createf(
+ SVN_ERR_TEST_FAILED, NULL,
+ "Final flush failed with blocksize %d", (int)sz);
+ }
+
+ zr = inflateEnd(&stream);
+
+ if (zr != Z_OK)
+ {
+ return svn_error_createf(
+ SVN_ERR_TEST_FAILED, NULL,
+ "End of stream handling failed with blocksize %d",
+ (int)sz);
+ }
+ }
+
+ {
+ apr_uint32_t crc = crc32(0, dst_buffer, stream.total_out);
+
+ if (stream.total_out != 242014 || crc != 0x8f03d934)
+ {
+ return svn_error_createf(
+ SVN_ERR_TEST_FAILED, NULL,
+ "Decompressed data doesn't match expected size or crc with "
+ "blocksize %d: Found crc32=0x%08x, size=%d.\n"
+ "Verify your ZLib installation, as this should never happen",
+ (int)sz, (unsigned)crc, (int)stream.total_out);
+ }
+ }
+ }
+
+ return SVN_NO_ERROR;
+}
+
/* An array of all test functions */
struct svn_test_descriptor_t test_funcs[] =
{
@@ -167,5 +251,7 @@
"pseudo-md5 compatibility"),
SVN_TEST_PASS2(zero_match,
"zero checksum matching"),
+ SVN_TEST_OPTS_PASS(zlib_expansion_test,
+ "zlib expansion test (zlib regression)"),
SVN_TEST_NULL
};
Modified: trunk/contrib/subversion/subversion/tests/libsvn_subr/dirent_uri-test.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_subr/dirent_uri-test.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_subr/dirent_uri-test.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -37,6 +37,7 @@
#include "svn_pools.h"
#include "svn_dirent_uri.h"
#include "private/svn_fspath.h"
+#include "private/svn_cert.h"
#include "../svn_test.h"
@@ -911,6 +912,9 @@
{ "file:///C:/temp/REPOS", "file:///C:/temp/REPOS" },
{ "file:///c:/", "file:///c:" },
#endif /* SVN_USE_DOS_PATHS */
+ /* Hostnames that look like non-canonical paths */
+ { "file://./foo", "file://./foo" },
+ { "http://./foo", "http://./foo" },
/* svn_uri_is_canonical() was a private function in the 1.6 API, and
has since taken a MAJOR change of direction, namely that only
absolute URLs are considered canonical uris now. */
@@ -2711,6 +2715,145 @@
return SVN_NO_ERROR;
}
+struct cert_match_dns_test {
+ const char *pattern;
+ const char *hostname;
+ svn_boolean_t expected;
+};
+
+static svn_error_t *
+run_cert_match_dns_tests(struct cert_match_dns_test *tests, apr_pool_t *pool)
+{
+ struct cert_match_dns_test *ct;
+ apr_pool_t *iterpool = svn_pool_create(pool);
+
+ for (ct = tests; ct->pattern; ct++)
+ {
+ svn_boolean_t result;
+ svn_string_t *pattern, *hostname;
+
+ svn_pool_clear(iterpool);
+
+ pattern = svn_string_create(ct->pattern, iterpool);
+ hostname = svn_string_create(ct->hostname, iterpool);
+
+ result = svn_cert__match_dns_identity(pattern, hostname);
+ if (result != ct->expected)
+ return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+ "Expected %s but got %s for pattern '%s' on "
+ "hostname '%s'",
+ ct->expected ? "match" : "no match",
+ result ? "match" : "no match",
+ pattern->data, hostname->data);
+
+ }
+
+ svn_pool_destroy(iterpool);
+
+ return SVN_NO_ERROR;
+}
+
+static struct cert_match_dns_test cert_match_dns_tests[] = {
+ { "foo.example.com", "foo.example.com", TRUE }, /* exact match */
+ { "foo.example.com", "FOO.EXAMPLE.COM", TRUE }, /* case differences */
+ { "FOO.EXAMPLE.COM", "foo.example.com", TRUE },
+ { "*.example.com", "FoO.ExAmPlE.CoM", TRUE },
+ { "*.ExAmPlE.CoM", "foo.example.com", TRUE },
+ { "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz", TRUE },
+ { "abcdefghijklmnopqrstuvwxyz", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", TRUE },
+ { "foo.example.com", "bar.example.com", FALSE }, /* difference at start */
+ { "foo.example.com", "foo.example.net", FALSE }, /* difference at end */
+ { "foo.example.com", "foo.example.commercial", FALSE }, /* hostname longer */
+ { "foo.example.commercial", "foo.example.com", FALSE }, /* pattern longer */
+ { "foo.example.comcom", "foo.example.com", FALSE }, /* repeated suffix */
+ { "foo.example.com", "foo.example.comcom", FALSE },
+ { "foo.example.com.com", "foo.example.com", FALSE },
+ { "foo.example.com", "foo.example.com.com", FALSE },
+ { "foofoo.example.com", "foo.example.com", FALSE }, /* repeated prefix */
+ { "foo.example.com", "foofoo.example.com", FALSE },
+ { "foo.foo.example.com", "foo.example.com", FALSE },
+ { "foo.example.com", "foo.foo.example.com", FALSE },
+ { "foo.*.example.com", "foo.bar.example.com", FALSE }, /* RFC 6125 s. 6.4.3
+ Rule 1 */
+ { "*.example.com", "foo.example.com", TRUE }, /* RFC 6125 s. 6.4.3 Rule 2 */
+ { "*.example.com", "bar.foo.example.com", FALSE }, /* Rule 2 */
+ { "*.example.com", "example.com", FALSE }, /* Rule 2 */
+ { "*.example.com", ".example.com", FALSE }, /* RFC doesn't say what to do
+ here and a leading period on
+ a hostname doesn't make sense
+ so we'll just reject this. */
+ { "*", "foo.example.com", FALSE }, /* wildcard must be left-most label,
+ implies that there must be more than
+ one label. */
+ { "*", "example.com", FALSE },
+ { "*", "com", FALSE },
+ { "*.example.com", "foo.example.net", FALSE }, /* difference in literal text
+ with a wildcard. */
+ { "*.com", "example.com", TRUE }, /* See Errata ID 3090 for RFC 6125,
+ probably shouldn't allow this but
+ we do for now. */
+ { "*.", "example.com", FALSE }, /* test some dubious 2 character wildcard
+ patterns */
+ { "*.", "example.", TRUE }, /* This one feels questionable */
+ { "*.", "example", FALSE },
+ { "*.", ".", FALSE },
+ { "a", "a", TRUE }, /* check that single letter exact matches work */
+ { "a", "b", FALSE }, /* and single letter not matches shouldn't */
+ { "*.*.com", "foo.example.com", FALSE }, /* unsupported wildcards */
+ { "*.*.com", "example.com", FALSE },
+ { "**.example.com", "foo.example.com", FALSE },
+ { "**.example.com", "example.com", FALSE },
+ { "f*.example.com", "foo.example.com", FALSE },
+ { "f*.example.com", "bar.example.com", FALSE },
+ { "*o.example.com", "foo.example.com", FALSE },
+ { "*o.example.com", "bar.example.com", FALSE },
+ { "f*o.example.com", "foo.example.com", FALSE },
+ { "f*o.example.com", "bar.example.com", FALSE },
+ { "foo.e*.com", "foo.example.com", FALSE },
+ { "foo.*e.com", "foo.example.com", FALSE },
+ { "foo.e*e.com", "foo.example.com", FALSE },
+ { "foo.example.com", "foo.example.com.", TRUE }, /* trailing dot */
+ { "*.example.com", "foo.example.com.", TRUE },
+ { "foo", "foo.", TRUE },
+ { "foo.example.com.", "foo.example.com", FALSE },
+ { "*.example.com.", "foo.example.com", FALSE },
+ { "foo.", "foo", FALSE },
+ { "foo.example.com", "foo.example.com..", FALSE },
+ { "*.example.com", "foo.example.com..", FALSE },
+ { "foo", "foo..", FALSE },
+ { "foo.example.com..", "foo.example.com", FALSE },
+ { "*.example.com..", "foo.example.com", FALSE },
+ { "foo..", "foo", FALSE },
+ { NULL }
+};
+
+static svn_error_t *
+test_cert_match_dns_identity(apr_pool_t *pool)
+{
+ return run_cert_match_dns_tests(cert_match_dns_tests, pool);
+}
+
+/* This test table implements results that should happen if we supported
+ * RFC 6125 s. 6.4.3 Rule 3. We don't so it's expected to fail for now. */
+static struct cert_match_dns_test rule3_tests[] = {
+ { "baz*.example.net", "baz1.example.net", TRUE },
+ { "*baz.example.net", "foobaz.example.net", TRUE },
+ { "b*z.example.net", "buuz.example.net", TRUE },
+ { "b*z.example.net", "bz.example.net", FALSE }, /* presume wildcard can't
+ match nothing */
+ { "baz*.example.net", "baz.example.net", FALSE },
+ { "*baz.example.net", "baz.example.net", FALSE },
+ { "b*z.example.net", "buuzuuz.example.net", TRUE }, /* presume wildcard
+ should be greedy */
+ { NULL }
+};
+
+static svn_error_t *
+test_rule3(apr_pool_t *pool)
+{
+ return run_cert_match_dns_tests(rule3_tests, pool);
+}
+
/* The test table. */
@@ -2809,5 +2952,9 @@
"test svn_fspath__dirname/basename/split"),
SVN_TEST_PASS2(test_fspath_get_longest_ancestor,
"test svn_fspath__get_longest_ancestor"),
+ SVN_TEST_PASS2(test_cert_match_dns_identity,
+ "test svn_cert__match_dns_identity"),
+ SVN_TEST_XFAIL2(test_rule3,
+ "test match with RFC 6125 s. 6.4.3 Rule 3"),
SVN_TEST_NULL
};
Modified: trunk/contrib/subversion/subversion/tests/libsvn_subr/translate-test.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_subr/translate-test.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_subr/translate-test.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -58,11 +58,11 @@
"Line 6: fairly boring subst test data... blah blah.",
"Line 7: fairly boring subst test data... blah blah.",
"Line 8: Valid $LastChangedBy$, started unexpanded.",
- "Line 9: Valid $Author: laffer1 $, started unexpanded.",
+ "Line 9: Valid $Author$, started unexpanded.",
"Line 10: fairly boring subst test data... blah blah.",
"Line 11: fairly boring subst test data... blah blah.",
"Line 12: Valid $LastChangedDate$, started unexpanded.",
- "Line 13: Valid $Date: 2013-08-24 19:37:07 $, started unexpanded.",
+ "Line 13: Valid $Date$, started unexpanded.",
"Line 14: fairly boring subst test data... blah blah.",
"Line 15: fairly boring subst test data... blah blah.",
"Line 16: Valid $HeadURL$, started unexpanded.",
@@ -70,7 +70,7 @@
"Line 18: fairly boring subst test data... blah blah.",
"Line 19: Invalid expanded keyword spanning two lines: $Author: ",
/* The idea here is that, were it not broken across two lines,
- "$Author: laffer1 $" would be a valid if odd, keyword. */
+ "$Author: Line 20: jrandom$" would be a valid if odd, keyword. */
"Line 20: jrandom$ remainder of invalid keyword spanning two lines.",
"Line 21: fairly boring subst test data... blah blah.",
"Line 22: an unknown keyword $LastChangedSocks$.",
@@ -77,7 +77,7 @@
"Line 23: fairly boring subst test data... blah blah.",
/* In line 24, the third dollar sign terminates the first, and the
fourth should therefore remain a literal dollar sign. */
- "Line 24: keyword in a keyword: $Author: laffer1 $Date$ $",
+ "Line 24: keyword in a keyword: $Author: $Date$ $",
"Line 25: fairly boring subst test data... blah blah.",
"Line 26: Emptily expanded keyword $Rev: $.",
"Line 27: fairly boring subst test data... blah blah.",
@@ -87,11 +87,11 @@
"Line 31: fairly boring subst test data... blah blah.",
"Line 32: fairly boring subst test data... blah blah.",
"Line 33: Valid $LastChangedDate: 2002-01-01 $, started expanded.",
- "Line 34: Valid $Date: 2013-08-24 19:37:07 $, started expanded.",
+ "Line 34: Valid $Date: 2002-01-01 $, started expanded.",
"Line 35: fairly boring subst test data... blah blah.",
"Line 36: fairly boring subst test data... blah blah.",
"Line 37: Valid $LastChangedBy: jrandom $, started expanded.",
- "Line 38: Valid $Author: laffer1 $, started expanded.",
+ "Line 38: Valid $Author: jrandom $, started expanded.",
"Line 39: fairly boring subst test data... blah blah.",
"Line 40: fairly boring subst test data... blah blah.",
"Line 41: Valid $HeadURL: http://tomato/mauve $, started expanded.",
@@ -99,13 +99,13 @@
"Line 43: fairly boring subst test data... blah blah.",
"Line 44: fairly boring subst test data... blah blah.",
"Line 45: Invalid $LastChangedRevisionWithSuffix$, started unexpanded.",
- "Line 46: Empty $Author: laffer1 $, started expanded.",
+ "Line 46: Empty $Author:$, started expanded.",
"Line 47: fairly boring subst test data... blah blah.",
- "Line 48: Two keywords back to back: $Author: laffer1 $$Rev$.",
- "Line 49: One keyword, one not, back to back: $Author: laffer1 $Rev$.",
+ "Line 48: Two keywords back to back: $Author$$Rev$.",
+ "Line 49: One keyword, one not, back to back: $Author$Rev$.",
"Line 50: a series of dollar signs $$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
- "Line 51: same, but with embedded keyword $$$$$$$$Date: 2013-08-24 19:37:07 $$$$$$$$$$.",
- "Line 52: same, with expanded, empty keyword $$$$$$Date: 2013-08-24 19:37:07 $$$$$$.",
+ "Line 51: same, but with embedded keyword $$$$$$$$Date$$$$$$$$$$.",
+ "Line 52: same, with expanded, empty keyword $$$$$$Date: $$$$$$.",
"Line 53: $This is a lengthy line designed to test a bug that was "
"reported about keyword expansion. The problem was that a line "
"had more than SVN_KEYWORD_MAX_LEN (255 at the time) characters "
@@ -128,12 +128,12 @@
"",
"",
"",
- "$Author: laffer1 $Rev$.", /* Line 70-73 test places where '$' abuts a newline. */
- ".$veR$Author: laffer1 $",
+ "$Author$Rev$.", /* Line 70-73 test places where '$' abuts a newline. */
+ ".$veR$Author$",
"$",
"$$",
/* Line 74-75 test for keywords containing '$', issue #1780 */
- "Line 74: Valid $Author: laffer1 $dom $, started expanded.",
+ "Line 74: Valid $Author: jran$dom $, started expanded.",
"Line 75: Valid $URL: http://tomato/mau$ve $, started expanded.",
/* Line 76-78 tests for a string with an unknown keyword of 252-254 bytes
long */
@@ -155,30 +155,30 @@
"aaaaaaaaaaaaa$aaaaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa $, started expanded.",
- "Line 80: Valid $Author: laffer1 $aaaaaaaaaaaaaaa"
+ "Line 80: Valid $Author: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaaaaaaaa"
"aaaaaaa$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$aaaaaaa $, started "
"expanded.",
/* keyword from first dollar sign to last = 254 chars */
- "Line 81: Valid $Author: laffer1 $aaaaaaaaaaaaaaaaaaaaaaaaaaa"
+ "Line 81: Valid $Author: aaaaaaaaaaaaaaaaaaaa$aaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaa$aaaaaaaaaaaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$$aaaaaa$$$ $, started "
"expanded.",
/* keyword from first dollar sign to last = 255 chars */
- "Line 82: Valid $Author: laffer1 $$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+ "Line 82: Valid $Author: aaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaa$$$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$$$ $, started "
"expanded.",
/* keyword from first dollar sign to last = 256 chars */
- "Line 83: Invalid $Author: laffer1 $$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+ "Line 83: Invalid $Author: aaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaa$$$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$$$ $, started "
"expanded.",
- "Line 84: Invalid $Author: laffer1 $$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+ "Line 84: Invalid $Author: aaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaa$$$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaa$$aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa$$$ $, started "
@@ -465,7 +465,7 @@
(char *)NULL);
expect[13 - 1] =
apr_pstrcat(pool, "Line 13: ",
- "Valid $Date: 2013-08-24 19:37:07 $, started unexpanded.",
+ "Valid $Date: ", date, " $, started unexpanded.",
(char *)NULL);
expect[33 - 1] =
apr_pstrcat(pool, "Line 33: ",
@@ -475,17 +475,17 @@
(char *)NULL);
expect[34 - 1] =
apr_pstrcat(pool, "Line 34: ",
- "Valid $Date: 2013-08-24 19:37:07 $, started expanded.",
+ "Valid $Date: ", date, " $, started expanded.",
(char *)NULL);
expect[51 - 1] =
apr_pstrcat(pool, "Line 51: ",
"same, but with embedded keyword ",
- "$$$$$$$$Date: 2013-08-24 19:37:07 $$$$$$$$$$.",
+ "$$$$$$$$Date: ", date, " $$$$$$$$$$.",
(char *)NULL);
expect[52 - 1] =
apr_pstrcat(pool, "Line 52: ",
"same, with expanded, empty keyword ",
- "$$$$$$Date: 2013-08-24 19:37:07 $$$$$$.",
+ "$$$$$$Date: ", date, " $$$$$$.",
(char *)NULL);
}
else /* unexpand */
@@ -494,11 +494,11 @@
expect[33 - 1] =
"Line 33: Valid $LastChangedDate$, started expanded.";
expect[34 - 1] =
- "Line 34: Valid $Date: 2013-08-24 19:37:07 $, started expanded.";
+ "Line 34: Valid $Date$, started expanded.";
expect[51 - 1] =
- "Line 51: same, but with embedded keyword $$$$$$$$Date: 2013-08-24 19:37:07 $$$$$$$$$$.";
+ "Line 51: same, but with embedded keyword $$$$$$$$Date$$$$$$$$$$.";
expect[52 - 1] =
- "Line 52: same, with expanded, empty keyword $$$$$$Date: 2013-08-24 19:37:07 $$$$$$.";
+ "Line 52: same, with expanded, empty keyword $$$$$$Date$$$$$$.";
}
}
@@ -514,7 +514,7 @@
(char *)NULL);
expect[9 - 1] =
apr_pstrcat(pool, "Line 9: ",
- "Valid $Author: laffer1 $, started unexpanded.",
+ "Valid $Author: ", author, " $, started unexpanded.",
(char *)NULL);
expect[37 - 1] =
apr_pstrcat(pool, "Line 37: ",
@@ -522,34 +522,34 @@
" $, started expanded.", (char *)NULL);
expect[38 - 1] =
apr_pstrcat(pool, "Line 38: ",
- "Valid $Author: laffer1 $, started expanded.",
+ "Valid $Author: ", author, " $, started expanded.",
(char *)NULL);
expect[46 - 1] =
apr_pstrcat(pool, "Line 46: ",
- "Empty $Author: laffer1 $, started expanded.",
+ "Empty $Author: ", author, " $, started expanded.",
(char *)NULL);
expect[71 - 1] =
- apr_pstrcat(pool, ".$veR$Author: laffer1 $", (char *)NULL);
+ apr_pstrcat(pool, ".$veR$Author: ", author, " $", (char *)NULL);
expect[74 - 1] =
apr_pstrcat(pool, "Line 74: ",
- "Valid $Author: laffer1 $, started expanded.",
+ "Valid $Author: ", author, " $, started expanded.",
(char *)NULL);
expect[79 - 1] =
apr_pstrcat(pool, "Line 79: ",
- "Valid $Author: laffer1 $, started expanded.",
+ "Valid $Author: ", author, " $, started expanded.",
(char *)NULL);
expect[80 - 1] =
apr_pstrcat(pool, "Line 80: ",
- "Valid $Author: laffer1 $, started expanded.",
+ "Valid $Author: ", author, " $, started expanded.",
(char *)NULL);
expect[81 - 1] =
apr_pstrcat(pool, "Line 81: ",
- "Valid $Author: laffer1 $, started expanded.",
+ "Valid $Author: ", author, " $, started expanded.",
(char *)NULL);
expect[82 - 1] =
apr_pstrcat(pool, "Line 82: ",
- "Valid $Author: laffer1 $, started expanded.",
+ "Valid $Author: ", author, " $, started expanded.",
(char *)NULL);
}
else /* unexpand */
@@ -558,19 +558,19 @@
expect[37 - 1] =
"Line 37: Valid $LastChangedBy$, started expanded.";
expect[38 - 1] =
- "Line 38: Valid $Author: laffer1 $, started expanded.";
+ "Line 38: Valid $Author$, started expanded.";
expect[46 - 1] =
- "Line 46: Empty $Author: laffer1 $, started expanded.";
+ "Line 46: Empty $Author$, started expanded.";
expect[74 - 1] =
- "Line 74: Valid $Author: laffer1 $, started expanded.";
+ "Line 74: Valid $Author$, started expanded.";
expect[79 - 1] =
- "Line 79: Valid $Author: laffer1 $, started expanded.";
+ "Line 79: Valid $Author$, started expanded.";
expect[80 - 1] =
- "Line 80: Valid $Author: laffer1 $, started expanded.";
+ "Line 80: Valid $Author$, started expanded.";
expect[81 - 1] =
- "Line 81: Valid $Author: laffer1 $, started expanded.";
+ "Line 81: Valid $Author$, started expanded.";
expect[82 - 1] =
- "Line 82: Valid $Author: laffer1 $, started expanded.";
+ "Line 82: Valid $Author$, started expanded.";
}
}
@@ -620,16 +620,16 @@
expect[48 - 1] =
apr_pstrcat(pool, "Line 48: ",
"Two keywords back to back: "
- "$Author: laffer1 $"
+ "$Author: ", author, " $"
"$Rev: ", rev, " $.",
(char *)NULL);
expect[49 - 1] =
apr_pstrcat(pool, "Line 49: ",
"One keyword, one not, back to back: "
- "$Author: laffer1 $Rev$.",
+ "$Author: ", author, " $Rev$.",
(char *)NULL);
expect[70 - 1] =
- apr_pstrcat(pool, "$Author: laffer1 $Rev$.", (char *)NULL);
+ apr_pstrcat(pool, "$Author: ", author, " $Rev$.", (char *)NULL);
}
/* Else Lines 48, 49, and 70 remain unchanged. */
}
@@ -640,15 +640,15 @@
expect[48 - 1] =
apr_pstrcat(pool, "Line 48: ",
"Two keywords back to back: "
- "$Author: laffer1 $$Rev: ", rev, " $.",
+ "$Author$$Rev: ", rev, " $.",
(char *)NULL);
expect[49 - 1] =
apr_pstrcat(pool, "Line 49: ",
"One keyword, one not, back to back: "
- "$Author: laffer1 $Rev: ", rev, " $.",
+ "$Author$Rev: ", rev, " $.",
(char *)NULL);
expect[70 - 1] =
- apr_pstrcat(pool, "$Author: laffer1 $Rev: ", rev, " $.", (char *)NULL);
+ apr_pstrcat(pool, "$Author$Rev: ", rev, " $.", (char *)NULL);
}
/* Else Lines 48, 49, and 70 remain unchanged. */
}
@@ -659,15 +659,15 @@
expect[48 - 1] =
apr_pstrcat(pool, "Line 48: ",
"Two keywords back to back: "
- "$Author: laffer1 $$Rev$.",
+ "$Author: ", author, " $$Rev$.",
(char *)NULL);
expect[49 - 1] =
apr_pstrcat(pool, "Line 49: ",
"One keyword, one not, back to back: "
- "$Author: laffer1 $Rev$.",
+ "$Author: ", author, " $Rev$.",
(char *)NULL);
expect[70 - 1] =
- apr_pstrcat(pool, "$Author: laffer1 $Rev$.", (char *)NULL);
+ apr_pstrcat(pool, "$Author: ", author, " $Rev$.", (char *)NULL);
}
/* Else Lines 48, 49, and 70 remain unchanged. */
}
@@ -683,7 +683,7 @@
apr_pstrcat(pool, "Line 24: ",
"keyword in a keyword: $Author: ",
author,
- " $Date: 2013-08-24 19:37:07 $ $",
+ " $Date$ $",
(char *)NULL);
}
else /* unexpand */
@@ -690,7 +690,7 @@
{
expect[24 - 1] =
apr_pstrcat(pool, "Line 24: ",
- "keyword in a keyword: $Author: laffer1 $Date$ $",
+ "keyword in a keyword: $Author$Date$ $",
(char *)NULL);
}
}
@@ -700,7 +700,7 @@
{
expect[24 - 1] =
apr_pstrcat(pool, "Line 24: ",
- "keyword in a keyword: $Author: laffer1 $Date: ",
+ "keyword in a keyword: $Author: $Date: ",
date,
" $ $",
(char *)NULL);
@@ -715,7 +715,7 @@
apr_pstrcat(pool, "Line 24: ",
"keyword in a keyword: $Author: ",
author,
- " $Date: 2013-08-24 19:37:07 $ $",
+ " $Date$ $",
(char *)NULL);
}
else /* unexpand */
@@ -722,7 +722,7 @@
{
expect[24 - 1] =
apr_pstrcat(pool, "Line 24: ",
- "keyword in a keyword: $Author: laffer1 $Date$ $",
+ "keyword in a keyword: $Author$Date$ $",
(char *)NULL);
}
}
Copied: trunk/contrib/subversion/subversion/tests/libsvn_subr/zlib.deflated (from rev 9265, vendor/apache/subversion/dist/subversion/tests/libsvn_subr/zlib.deflated)
===================================================================
(Binary files differ)
Modified: trunk/contrib/subversion/subversion/tests/libsvn_wc/conflict-data-test.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_wc/conflict-data-test.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_wc/conflict-data-test.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -740,7 +740,7 @@
svn_error_t *err;
const char *lock_abspath;
test_prop_conflict_baton_t *b = apr_pcalloc(pool, sizeof(*b));
- svn_wc_conflict_description2_t *desc = apr_pcalloc(pool, sizeof(*b));
+ svn_wc_conflict_description2_t *desc = apr_pcalloc(pool, sizeof(*desc));
SVN_ERR(svn_test__sandbox_create(&sbox, "test_prop_conflicts", opts, pool));
Index: trunk/contrib/subversion/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/libsvn_wc/create_wc_for_upgrade.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/libsvn_wc/op-depth-test.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_wc/op-depth-test.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_wc/op-depth-test.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -55,6 +55,14 @@
#pragma warning(disable: 4221) /* nonstandard extension used */
#endif
+/* This macro is not available in 1.8.x, but let's just use it here */
+#ifndef SVN_VA_NULL
+struct svn_null_pointer_constant_stdarg_sentinel_t;
+
+/** Null pointer constant used as a sentinel in variable argument lists. */
+#define SVN_VA_NULL ((struct svn_null_pointer_constant_stdarg_sentinel_t*)0)
+#endif
+
/* Compare strings, like strcmp but either or both may be NULL which
* compares equal to NULL and not equal to any non-NULL string. */
static int
@@ -8149,6 +8157,749 @@
return SVN_NO_ERROR;
}
+static svn_error_t *
+move_child_to_parent_revert(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "move_child_to_parent_revert", opts,
+ pool));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/B"));
+ SVN_ERR(sbox_wc_commit(&b, ""));
+
+
+ SVN_ERR(sbox_wc_move(&b, "A/B", "B"));
+ SVN_ERR(sbox_wc_delete(&b, "A"));
+
+ /* Verify that the move is still recorded correctly */
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 0, ""},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 1, "A/B"},
+
+ {1, "A", "base-deleted", NO_COPY_FROM},
+ {1, "A/B", "base-deleted", NO_COPY_FROM, "B"},
+
+ {1, "B", "normal", 1, "A/B", MOVED_HERE},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ SVN_ERR(sbox_wc_revert(&b, "A", svn_depth_infinity));
+
+ /* Verify that the move is now just a copy */
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 0, ""},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 1, "A/B"},
+
+ {1, "B", "normal", 1, "A/B"},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+move_delete_intermediate(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "move_delete_intermediate", opts,
+ pool));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "B"));
+ SVN_ERR(sbox_wc_mkdir(&b, "B/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "B/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "B/A/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "C"));
+ SVN_ERR(sbox_wc_mkdir(&b, "C/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "C/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "C/A/A/A"));
+ SVN_ERR(sbox_wc_commit(&b, ""));
+
+ SVN_ERR(sbox_wc_move(&b, "A/A/A", "AAA_1"));
+
+ SVN_ERR(sbox_wc_delete(&b, "A"));
+ SVN_ERR(sbox_wc_move(&b, "B", "A"));
+
+ SVN_ERR(sbox_wc_move(&b, "A/A/A", "AAA_2"));
+
+ SVN_ERR(sbox_wc_delete(&b, "A/A"));
+ SVN_ERR(sbox_wc_move(&b, "C/A", "A/A"));
+
+ SVN_ERR(sbox_wc_move(&b, "A/A/A", "AAA_3"));
+
+ /* Verify that the move is still recorded correctly */
+ {
+ nodes_row_t nodes[] = {
+
+ {0, "", "normal", 0, ""},
+
+ {1, "AAA_1", "normal", 1, "A/A/A", MOVED_HERE},
+ {1, "AAA_1/A", "normal", 1, "A/A/A/A", MOVED_HERE},
+ {1, "AAA_2", "normal", 1, "B/A/A", MOVED_HERE},
+ {1, "AAA_2/A", "normal", 1, "B/A/A/A", MOVED_HERE},
+ {1, "AAA_3", "normal", 1, "C/A/A", MOVED_HERE},
+ {1, "AAA_3/A", "normal", 1, "C/A/A/A", MOVED_HERE},
+
+ {0, "A", "normal", 1, "A"},
+ {0, "A/A", "normal", 1, "A/A"},
+ {0, "A/A/A", "normal", 1, "A/A/A"},
+ {0, "A/A/A/A", "normal", 1, "A/A/A/A"},
+
+ {1, "A", "normal", 1, "B", MOVED_HERE},
+ {1, "A/A", "normal", 1, "B/A", MOVED_HERE},
+ {1, "A/A/A", "normal", 1, "B/A/A", FALSE, "AAA_1", TRUE},
+ {1, "A/A/A/A", "normal", 1, "B/A/A/A", MOVED_HERE},
+
+ {2, "A/A", "normal", 1, "C/A", MOVED_HERE},
+ {2, "A/A/A", "normal", 1, "C/A/A", FALSE, "AAA_2", TRUE},
+ {2, "A/A/A/A", "normal", 1, "C/A/A/A", MOVED_HERE},
+
+ {3, "A/A/A", "base-deleted", NO_COPY_FROM, "AAA_3"},
+ {3, "A/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0, "B", "normal", 1, "B"},
+ {0, "B/A", "normal", 1, "B/A"},
+ {0, "B/A/A", "normal", 1, "B/A/A"},
+ {0, "B/A/A/A", "normal", 1, "B/A/A/A"},
+
+ {1, "B", "base-deleted", NO_COPY_FROM, "A"},
+ {1, "B/A", "base-deleted", NO_COPY_FROM},
+ {1, "B/A/A", "base-deleted", NO_COPY_FROM},
+ {1, "B/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0, "C", "normal", 1, "C"},
+ {0, "C/A", "normal", 1, "C/A"},
+ {0, "C/A/A", "normal", 1, "C/A/A"},
+ {0, "C/A/A/A", "normal", 1, "C/A/A/A"},
+
+ {2, "C/A", "base-deleted", NO_COPY_FROM, "A/A"},
+ {2, "C/A/A", "base-deleted", NO_COPY_FROM},
+ {2, "C/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0},
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ /* Ok, now we are in the very ugly case where A/A/A is moved away 3 times */
+
+ /* Let's delete A */
+ SVN_ERR(sbox_wc_delete(&b, "A"));
+
+ /* AAA_1, AAA_2 and AAA_3 should still be moves after deleting A */
+ {
+ nodes_row_t nodes[] = {
+
+ {0, "", "normal", 0, ""},
+
+ {1, "AAA_1", "normal", 1, "A/A/A", MOVED_HERE},
+ {1, "AAA_1/A", "normal", 1, "A/A/A/A", MOVED_HERE},
+
+ {1, "AAA_2", "normal", 1, "B/A/A", MOVED_HERE},
+ {1, "AAA_2/A", "normal", 1, "B/A/A/A", MOVED_HERE},
+
+ {1, "AAA_3", "normal", 1, "C/A/A", MOVED_HERE},
+ {1, "AAA_3/A", "normal", 1, "C/A/A/A", MOVED_HERE},
+
+ {0, "A", "normal", 1, "A"},
+ {0, "A/A", "normal", 1, "A/A"},
+ {0, "A/A/A", "normal", 1, "A/A/A"},
+ {0, "A/A/A/A", "normal", 1, "A/A/A/A"},
+
+ {1, "A", "base-deleted", NO_COPY_FROM},
+ {1, "A/A", "base-deleted", NO_COPY_FROM},
+ {1, "A/A/A", "base-deleted", NO_COPY_FROM, "AAA_1"},
+ {1, "A/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0, "B", "normal", 1, "B"},
+ {0, "B/A", "normal", 1, "B/A"},
+ {0, "B/A/A", "normal", 1, "B/A/A"},
+ {0, "B/A/A/A", "normal", 1, "B/A/A/A"},
+
+ {1, "B", "base-deleted", NO_COPY_FROM},
+ {1, "B/A", "base-deleted", NO_COPY_FROM},
+ {1, "B/A/A", "base-deleted", NO_COPY_FROM, "AAA_2"},
+ {1, "B/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0, "C", "normal", 1, "C"},
+ {0, "C/A", "normal", 1, "C/A"},
+ {0, "C/A/A", "normal", 1, "C/A/A"},
+ {0, "C/A/A/A", "normal", 1, "C/A/A/A"},
+
+ {2, "C/A", "base-deleted", NO_COPY_FROM},
+ {2, "C/A/A", "base-deleted", NO_COPY_FROM, "AAA_3"},
+ {2, "C/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0},
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+move_revert_intermediate(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "move_revert_intermediate", opts,
+ pool));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "B"));
+ SVN_ERR(sbox_wc_mkdir(&b, "B/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "B/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "B/A/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "C"));
+ SVN_ERR(sbox_wc_mkdir(&b, "C/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "C/A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "C/A/A/A"));
+ SVN_ERR(sbox_wc_commit(&b, ""));
+
+ SVN_ERR(sbox_wc_move(&b, "A/A/A", "AAA_1"));
+
+ SVN_ERR(sbox_wc_delete(&b, "A"));
+ SVN_ERR(sbox_wc_move(&b, "B", "A"));
+
+ SVN_ERR(sbox_wc_move(&b, "A/A/A", "AAA_2"));
+
+ SVN_ERR(sbox_wc_delete(&b, "A/A"));
+ SVN_ERR(sbox_wc_move(&b, "C/A", "A/A"));
+
+ SVN_ERR(sbox_wc_move(&b, "A/A/A", "AAA_3"));
+
+ /* Verify that the move is still recorded correctly */
+ {
+ nodes_row_t nodes[] = {
+
+ {0, "", "normal", 0, ""},
+
+ {1, "AAA_1", "normal", 1, "A/A/A", MOVED_HERE},
+ {1, "AAA_1/A", "normal", 1, "A/A/A/A", MOVED_HERE},
+ {1, "AAA_2", "normal", 1, "B/A/A", MOVED_HERE},
+ {1, "AAA_2/A", "normal", 1, "B/A/A/A", MOVED_HERE},
+ {1, "AAA_3", "normal", 1, "C/A/A", MOVED_HERE},
+ {1, "AAA_3/A", "normal", 1, "C/A/A/A", MOVED_HERE},
+
+ {0, "A", "normal", 1, "A"},
+ {0, "A/A", "normal", 1, "A/A"},
+ {0, "A/A/A", "normal", 1, "A/A/A"},
+ {0, "A/A/A/A", "normal", 1, "A/A/A/A"},
+
+ {1, "A", "normal", 1, "B", MOVED_HERE},
+ {1, "A/A", "normal", 1, "B/A", MOVED_HERE},
+ {1, "A/A/A", "normal", 1, "B/A/A", FALSE, "AAA_1", TRUE},
+ {1, "A/A/A/A", "normal", 1, "B/A/A/A", MOVED_HERE},
+
+ {2, "A/A", "normal", 1, "C/A", MOVED_HERE},
+ {2, "A/A/A", "normal", 1, "C/A/A", FALSE, "AAA_2", TRUE},
+ {2, "A/A/A/A", "normal", 1, "C/A/A/A", MOVED_HERE},
+
+ {3, "A/A/A", "base-deleted", NO_COPY_FROM, "AAA_3"},
+ {3, "A/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0, "B", "normal", 1, "B"},
+ {0, "B/A", "normal", 1, "B/A"},
+ {0, "B/A/A", "normal", 1, "B/A/A"},
+ {0, "B/A/A/A", "normal", 1, "B/A/A/A"},
+
+ {1, "B", "base-deleted", NO_COPY_FROM, "A"},
+ {1, "B/A", "base-deleted", NO_COPY_FROM},
+ {1, "B/A/A", "base-deleted", NO_COPY_FROM},
+ {1, "B/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0, "C", "normal", 1, "C"},
+ {0, "C/A", "normal", 1, "C/A"},
+ {0, "C/A/A", "normal", 1, "C/A/A"},
+ {0, "C/A/A/A", "normal", 1, "C/A/A/A"},
+
+ {2, "C/A", "base-deleted", NO_COPY_FROM, "A/A"},
+ {2, "C/A/A", "base-deleted", NO_COPY_FROM},
+ {2, "C/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0},
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ /* Ok, now we are in the very ugly case where A/A/A is moved away 3 times */
+
+ /* Let's revert A */
+ SVN_ERR(sbox_wc_revert(&b, "A", svn_depth_infinity));
+
+ /* AAA_1 should now be a copy, but AAA_2 and AAA_3 should still be moves,
+ but now from the original location instead of from "A/A/A" */
+ {
+ nodes_row_t nodes[] = {
+
+ {0, "", "normal", 0, ""},
+
+ {1, "AAA_1", "normal", 1, "A/A/A",},
+ {1, "AAA_1/A", "normal", 1, "A/A/A/A"},
+ {1, "AAA_2", "normal", 1, "B/A/A", MOVED_HERE},
+ {1, "AAA_2/A", "normal", 1, "B/A/A/A", MOVED_HERE},
+ {1, "AAA_3", "normal", 1, "C/A/A", MOVED_HERE},
+ {1, "AAA_3/A", "normal", 1, "C/A/A/A", MOVED_HERE},
+
+ {0, "A", "normal", 1, "A"},
+ {0, "A/A", "normal", 1, "A/A"},
+ {0, "A/A/A", "normal", 1, "A/A/A"},
+ {0, "A/A/A/A", "normal", 1, "A/A/A/A"},
+
+ {0, "B", "normal", 1, "B"},
+ {0, "B/A", "normal", 1, "B/A"},
+ {0, "B/A/A", "normal", 1, "B/A/A"},
+ {0, "B/A/A/A", "normal", 1, "B/A/A/A"},
+
+ {1, "B", "base-deleted", NO_COPY_FROM},
+ {1, "B/A", "base-deleted", NO_COPY_FROM},
+ {1, "B/A/A", "base-deleted", NO_COPY_FROM, "AAA_2"},
+ {1, "B/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0, "C", "normal", 1, "C"},
+ {0, "C/A", "normal", 1, "C/A"},
+ {0, "C/A/A", "normal", 1, "C/A/A"},
+ {0, "C/A/A/A", "normal", 1, "C/A/A/A"},
+
+ {2, "C/A", "base-deleted", NO_COPY_FROM},
+ {2, "C/A/A", "base-deleted", NO_COPY_FROM, "AAA_3"},
+ {2, "C/A/A/A", "base-deleted", NO_COPY_FROM},
+
+ {0},
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+copy_mixed_rev_mods(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "copy_mixed_rev_mods", opts,
+ pool));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/B"));
+ SVN_ERR(sbox_wc_commit(&b, ""));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/B/C"));
+ SVN_ERR(sbox_wc_commit(&b, ""));
+ SVN_ERR(sbox_wc_update(&b, "", 1));
+ SVN_ERR(sbox_wc_update(&b, "A/B", 2));
+ SVN_ERR(sbox_wc_delete(&b, "A/B"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/B"));
+
+ {
+ nodes_row_t nodes[] = {
+ {0, "", "normal", 1, ""},
+ {0, "A", "normal", 1, "A"},
+ {0, "A/B", "normal", 2, "A/B"},
+ {0, "A/B/C", "normal", 2, "A/B/C"},
+ {2, "A/B", "normal", NO_COPY_FROM},
+ {2, "A/B/C", "base-deleted", NO_COPY_FROM},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ SVN_ERR(sbox_wc_copy(&b, "A", "X"));
+ {
+ nodes_row_t nodes[] = {
+ {1, "X", "normal", 1, "A"},
+ {1, "X/B", "not-present", 2, "A/B"},
+ {2, "X/B", "normal", NO_COPY_FROM},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "X", nodes));
+ }
+
+ SVN_ERR(sbox_wc_commit(&b, "X"));
+ {
+ nodes_row_t nodes[] = {
+ {0, "X", "normal", 3, "X"},
+ {0, "X/B", "normal", 3, "X/B"},
+ {0}
+ };
+ SVN_ERR(check_db_rows(&b, "X", nodes));
+ }
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+move_replace_ancestor_with_child(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "move_replace_ancestor_with_child", opts,
+ pool));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A"));
+
+ SVN_ERR(sbox_wc_commit(&b, ""));
+ SVN_ERR(sbox_wc_update(&b, "", 1));
+
+ SVN_ERR(sbox_wc_move(&b, "A", "A2"));
+
+ {
+ nodes_row_t nodes[] = {
+
+ { 0, "", "normal", 1, "" },
+
+ { 0, "A", "normal", 1, "A"},
+ { 0, "A/A", "normal", 1, "A/A" },
+
+ { 1, "A", "base-deleted", NO_COPY_FROM , "A2"},
+ { 1, "A/A", "base-deleted", NO_COPY_FROM },
+
+ { 1, "A2", "normal", 1, "A", MOVED_HERE },
+ { 1, "A2/A", "normal", 1, "A/A", MOVED_HERE },
+
+ { 0 },
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ SVN_ERR(sbox_wc_move(&b, "A2/A", "A"));
+
+ {
+ nodes_row_t nodes[] = {
+ { 0, "", "normal", 1, "" },
+
+ { 0, "A", "normal", 1, "A"},
+ { 0, "A/A", "normal", 1, "A/A" },
+
+ { 1, "A", "normal", 1, "A/A", FALSE, "A2", TRUE },
+ { 1, "A/A", "base-deleted", NO_COPY_FROM },
+
+ { 1, "A2", "normal", 1, "A", MOVED_HERE },
+ { 1, "A2/A", "normal", 1, "A/A", MOVED_HERE },
+
+ { 2, "A2/A", "base-deleted", NO_COPY_FROM, "A" },
+ { 0 },
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ /* ### This currently fails with an assertion in maintainer mode */
+ SVN_ERR(sbox_wc_delete(&b, "A2"));
+
+ {
+ nodes_row_t nodes[] = {
+ { 0, "", "normal", 1, "" },
+
+ { 0, "A", "normal", 1, "A"},
+ { 0, "A/A", "normal", 1, "A/A" },
+
+ { 1, "A", "normal", 1, "A/A", MOVED_HERE },
+ { 1, "A/A", "base-deleted", NO_COPY_FROM, "A" },
+
+ { 0 },
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ SVN_ERR(sbox_wc_commit(&b, "A"));
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+move_twice_within_delete(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "move_twice_within_delete", opts,
+ pool));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/A/A"));
+
+ SVN_ERR(sbox_wc_commit(&b, ""));
+ SVN_ERR(sbox_wc_update(&b, "", 1));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "B"));
+ SVN_ERR(sbox_wc_move(&b, "A", "B/A"));
+ SVN_ERR(sbox_wc_move(&b, "B/A/A", "B/AA"));
+ SVN_ERR(sbox_wc_move(&b, "B/AA/A", "AA"));
+
+ {
+ nodes_row_t nodes[] = {
+
+ { 0, "", "normal", 1, "" },
+
+ { 0, "A", "normal", 1, "A" },
+ { 0, "A/A", "normal", 1, "A/A" },
+ { 0, "A/A/A", "normal", 1, "A/A/A" },
+
+ { 1, "A", "base-deleted", NO_COPY_FROM, "B/A" },
+ { 1, "A/A", "base-deleted", NO_COPY_FROM },
+ { 1, "A/A/A", "base-deleted", NO_COPY_FROM },
+
+ { 1, "AA", "normal", 1, "A/A/A", MOVED_HERE },
+
+ { 1, "B", "normal", NO_COPY_FROM },
+ { 2, "B/A", "normal", 1, "A", MOVED_HERE },
+ { 2, "B/A/A", "normal", 1, "A/A", MOVED_HERE },
+ { 2, "B/A/A/A", "normal", 1, "A/A/A", MOVED_HERE },
+
+ { 3, "B/A/A", "base-deleted", NO_COPY_FROM, "B/AA" },
+ { 3, "B/A/A/A", "base-deleted", NO_COPY_FROM },
+
+ { 2, "B/AA", "normal", 1, "A/A", MOVED_HERE},
+ { 2, "B/AA/A", "normal", 1, "A/A/A", MOVED_HERE },
+
+ { 3, "B/AA/A", "base-deleted", NO_COPY_FROM, "AA" },
+
+ { 0 },
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ SVN_ERR(sbox_wc_delete(&b, "B"));
+
+ {
+ nodes_row_t nodes[] = {
+ { 0, "", "normal", 1, "" },
+
+ { 0, "A", "normal", 1, "A" },
+ { 0, "A/A", "normal", 1, "A/A" },
+ { 0, "A/A/A", "normal", 1, "A/A/A" },
+
+ { 1, "A", "base-deleted", NO_COPY_FROM },
+ { 1, "A/A", "base-deleted", NO_COPY_FROM },
+ { 1, "A/A/A", "base-deleted", NO_COPY_FROM, "AA" },
+
+ { 1, "AA", "normal", 1, "A/A/A", MOVED_HERE },
+
+ { 0 },
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+repo_wc_copy(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+ const char *repos_dir;
+ const char *new_repos_dir;
+ const char *new_repos_url;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "repo_wc_copy",
+ opts, pool));
+ SVN_ERR(sbox_add_and_commit_greek_tree(&b));
+
+ SVN_ERR(sbox_wc_copy_url(&b,
+ svn_path_url_add_component2(b.repos_url, "A/B",
+ pool),
+ -1, "AA"));
+
+ {
+ nodes_row_t nodes[] = {
+
+ {1, "AA/lambda", "normal", 1, "A/B/lambda"},
+ {1, "AA", "normal", 1, "A/B"},
+ {1, "AA/E/beta", "normal", 1, "A/B/E/beta"},
+ {1, "AA/E/alpha", "normal", 1, "A/B/E/alpha"},
+ {1, "AA/F", "normal", 1, "A/B/F"},
+ {1, "AA/E", "normal", 1, "A/B/E"},
+
+ { 0 },
+ };
+ SVN_ERR(check_db_rows(&b, "AA", nodes));
+ }
+
+ SVN_ERR(svn_uri_get_dirent_from_file_url(&repos_dir, b.repos_url,
+ pool));
+ new_repos_dir = apr_pstrcat(pool, repos_dir, "-2", SVN_VA_NULL);
+ new_repos_url = apr_pstrcat(pool, b.repos_url, "-2", SVN_VA_NULL);
+
+ svn_test_add_dir_cleanup(new_repos_dir);
+
+ SVN_ERR(svn_io_remove_dir2(new_repos_dir, TRUE, NULL, NULL, pool));
+ SVN_ERR(svn_io_copy_dir_recursively(repos_dir,
+ svn_dirent_dirname(new_repos_dir, pool),
+ svn_dirent_basename(new_repos_dir, pool),
+ FALSE, NULL, NULL, pool));
+
+ SVN_ERR(sbox_wc_relocate(&b, new_repos_url));
+
+ /* This produced an invalid copy in Subversion <= 1.8.8.
+ Status would show all descendants as incomplete */
+ SVN_ERR(sbox_wc_copy_url(&b,
+ svn_path_url_add_component2(b.repos_url, "A/B",
+ pool),
+ -1, "BB"));
+
+ {
+ nodes_row_t nodes[] = {
+
+ {1, "BB/lambda", "normal", 1, "A/B/lambda"},
+ {1, "BB", "normal", 1, "A/B"},
+ {1, "BB/E/beta", "normal", 1, "A/B/E/beta"},
+ {1, "BB/E/alpha", "normal", 1, "A/B/E/alpha"},
+ {1, "BB/F", "normal", 1, "A/B/F"},
+ {1, "BB/E", "normal", 1, "A/B/E"},
+
+ { 0 },
+ };
+ SVN_ERR(check_db_rows(&b, "BB", nodes));
+ }
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+movedhere_extract_retract(const svn_test_opts_t *opts, apr_pool_t *pool)
+{
+ svn_test__sandbox_t b;
+
+ SVN_ERR(svn_test__sandbox_create(&b, "movedhere_extract_retract",
+ opts, pool));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "A"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/B1"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/B2"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/B3"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/C1"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/C2"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/C3"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/D1"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/D2"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/D3"));
+
+ SVN_ERR(sbox_wc_commit(&b, ""));
+
+ SVN_ERR(sbox_wc_propset(&b, "k", "v", "A/B1"));
+ SVN_ERR(sbox_wc_propset(&b, "k", "v", "A/B2"));
+ SVN_ERR(sbox_wc_propset(&b, "k", "v", "A/B3"));
+ SVN_ERR(sbox_wc_delete(&b, "A/C1"));
+ SVN_ERR(sbox_wc_delete(&b, "A/C2"));
+ SVN_ERR(sbox_wc_delete(&b, "A/C3"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/E1"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/E2"));
+ SVN_ERR(sbox_wc_mkdir(&b, "A/E3"));
+
+ SVN_ERR(sbox_wc_commit(&b, ""));
+
+ SVN_ERR(sbox_wc_update(&b, "", 1));
+
+ SVN_ERR(sbox_wc_move(&b, "A", "Z"));
+
+ SVN_ERR(sbox_wc_delete(&b, "Z/B1"));
+ SVN_ERR(sbox_wc_delete(&b, "Z/C1"));
+ SVN_ERR(sbox_wc_delete(&b, "Z/D1"));
+
+ SVN_ERR(sbox_wc_move(&b, "Z/B2", "B2"));
+ SVN_ERR(sbox_wc_move(&b, "Z/C2", "C2"));
+ SVN_ERR(sbox_wc_move(&b, "Z/D2", "D2"));
+
+ SVN_ERR(sbox_wc_mkdir(&b, "Z/B2"));
+ SVN_ERR(sbox_wc_mkdir(&b, "Z/C2"));
+ SVN_ERR(sbox_wc_mkdir(&b, "Z/D2"));
+ SVN_ERR(sbox_wc_mkdir(&b, "Z/E2"));
+
+ SVN_ERR(sbox_wc_update(&b, "", 2));
+ SVN_ERR(sbox_wc_resolve(&b, "A", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ SVN_ERR(sbox_wc_resolve(&b, "Z/B1", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+ SVN_ERR(sbox_wc_resolve(&b, "Z/B2", svn_depth_empty,
+ svn_wc_conflict_choose_mine_conflict));
+
+ SVN_ERR(sbox_wc_resolve(&b, "Z/C1", svn_depth_empty,
+ svn_wc_conflict_choose_merged));
+ SVN_ERR(sbox_wc_resolve(&b, "Z/C2", svn_depth_empty,
+ svn_wc_conflict_choose_merged));
+
+ SVN_ERR(sbox_wc_resolve(&b, "", svn_depth_infinity,
+ svn_wc_conflict_choose_mine_conflict));
+ {
+ nodes_row_t nodes[] = {
+
+ {0, "", "normal", 2, ""},
+ {0, "A", "normal", 2, "A"},
+ {0, "A/B1", "normal", 2, "A/B1", FALSE, NULL, FALSE, "k"},
+ {0, "A/B2", "normal", 2, "A/B2", FALSE, NULL, FALSE, "k"},
+ {0, "A/B3", "normal", 2, "A/B3", FALSE, NULL, FALSE, "k"},
+ {0, "A/D1", "normal", 2, "A/D1"},
+ {0, "A/D2", "normal", 2, "A/D2"},
+ {0, "A/D3", "normal", 2, "A/D3"},
+ {0, "A/E1", "normal", 2, "A/E1"},
+ {0, "A/E2", "normal", 2, "A/E2"},
+ {0, "A/E3", "normal", 2, "A/E3"},
+
+ {1, "A", "base-deleted", NO_COPY_FROM, "Z"},
+ {1, "A/B1", "base-deleted", NO_COPY_FROM},
+ {1, "A/B2", "base-deleted", NO_COPY_FROM},
+ {1, "A/B3", "base-deleted", NO_COPY_FROM},
+
+ {1, "A/D1", "base-deleted", NO_COPY_FROM},
+ {1, "A/D2", "base-deleted", NO_COPY_FROM},
+ {1, "A/D3", "base-deleted", NO_COPY_FROM},
+
+ {1, "A/E1", "base-deleted", NO_COPY_FROM},
+ {1, "A/E2", "base-deleted", NO_COPY_FROM},
+ {1, "A/E3", "base-deleted", NO_COPY_FROM},
+
+ {1, "B2", "normal", 2, "A/B2", MOVED_HERE, "k"},
+ {1, "C2", "normal", 1, "A/C2"},
+ {1, "D2", "normal", 1, "A/D2", MOVED_HERE},
+
+ {1, "Z", "normal", 2, "A", MOVED_HERE},
+ {1, "Z/B1", "normal", 2, "A/B1", MOVED_HERE, "k"},
+ {1, "Z/B2", "normal", 2, "A/B2", MOVED_HERE, "k"},
+ {1, "Z/B3", "normal", 2, "A/B3", MOVED_HERE, "k"},
+ {1, "Z/D1", "normal", 2, "A/D1", MOVED_HERE},
+ {1, "Z/D2", "normal", 2, "A/D2", MOVED_HERE},
+ {1, "Z/D3", "normal", 2, "A/D3", MOVED_HERE},
+ {1, "Z/E1", "normal", 2, "A/E1", MOVED_HERE},
+ {1, "Z/E2", "normal", 2, "A/E2", MOVED_HERE},
+ {1, "Z/E3", "normal", 2, "A/E3", MOVED_HERE},
+
+ {2, "Z/B2", "normal", NO_COPY_FROM, "B2"},
+ {2, "Z/C2", "normal", NO_COPY_FROM},
+ {2, "Z/D2", "normal", NO_COPY_FROM, "D2"},
+ {2, "Z/E2", "normal", NO_COPY_FROM},
+
+ {2, "Z/B1", "base-deleted", NO_COPY_FROM},
+ {2, "Z/D1", "base-deleted", NO_COPY_FROM},
+
+ { 0 },
+ };
+ SVN_ERR(check_db_rows(&b, "", nodes));
+ }
+
+ return SVN_NO_ERROR;
+}
+
+
/* ---------------------------------------------------------------------- */
/* The list of test functions */
@@ -8302,5 +9053,21 @@
"move/delete file externals (issue 4293)"),
SVN_TEST_OPTS_PASS(update_with_tree_conflict,
"update with tree conflict (issue 4347)"),
+ SVN_TEST_OPTS_PASS(move_child_to_parent_revert,
+ "move child to parent and revert (issue 4436)"),
+ SVN_TEST_OPTS_PASS(move_delete_intermediate,
+ "move more than once, delete intermediate"),
+ SVN_TEST_OPTS_XFAIL(move_revert_intermediate,
+ "move more than once, revert intermediate"),
+ SVN_TEST_OPTS_PASS(move_replace_ancestor_with_child,
+ "move replace ancestor with child"),
+ SVN_TEST_OPTS_PASS(move_twice_within_delete,
+ "move twice and then delete"),
+ SVN_TEST_OPTS_PASS(repo_wc_copy,
+ "repo_wc_copy"),
+ SVN_TEST_OPTS_PASS(copy_mixed_rev_mods,
+ "copy mixed-rev with mods"),
+ SVN_TEST_OPTS_PASS(movedhere_extract_retract,
+ "movedhere extract retract"),
SVN_TEST_NULL
};
Modified: trunk/contrib/subversion/subversion/tests/libsvn_wc/utils.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_wc/utils.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_wc/utils.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -23,6 +23,7 @@
#include "svn_error.h"
#include "svn_client.h"
#include "svn_pools.h"
+#include "private/svn_dep_compat.h"
#include "utils.h"
@@ -229,6 +230,45 @@
}
svn_error_t *
+sbox_wc_copy_url(svn_test__sandbox_t *b, const char *from_url,
+ svn_revnum_t revision, const char *to_path)
+{
+ apr_pool_t *scratch_pool = b->pool;
+ svn_client_ctx_t *ctx;
+ svn_opt_revision_t rev = { svn_opt_revision_unspecified, {0} };
+ svn_client_copy_source_t* src;
+ apr_array_header_t *sources = apr_array_make(
+ scratch_pool, 1,
+ sizeof(svn_client_copy_source_t *));
+
+ SVN_ERR(svn_client_create_context2(&ctx, NULL, scratch_pool));
+ ctx->wc_ctx = b->wc_ctx;
+
+ if (SVN_IS_VALID_REVNUM(revision))
+ {
+ rev.kind = svn_opt_revision_number;
+ rev.value.number = revision;
+ }
+
+ src = apr_pcalloc(scratch_pool, sizeof(*src));
+
+ src->path = from_url;
+ src->revision = &rev;
+ src->peg_revision = &rev;
+
+ APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = src;
+
+ SVN_ERR(svn_client_copy6(sources, sbox_wc_path(b, to_path),
+ FALSE, FALSE, FALSE, NULL, NULL, NULL,
+ ctx, scratch_pool));
+
+ ctx->wc_ctx = NULL;
+
+ return SVN_NO_ERROR;
+}
+
+
+svn_error_t *
sbox_wc_revert(svn_test__sandbox_t *b, const char *path, svn_depth_t depth)
{
const char *abspath = sbox_wc_path(b, path);
@@ -292,15 +332,26 @@
svn_depth_t depth)
{
svn_client_ctx_t *ctx;
- SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
+ apr_pool_t *scratch_pool = svn_pool_create(b->pool);
+ svn_error_t *err;
+
+ SVN_ERR(svn_client_create_context2(&ctx, NULL, scratch_pool));
ctx->wc_ctx = b->wc_ctx;
- return svn_client_commit6(targets, depth,
- FALSE /* keep_locks */,
- FALSE /* keep_changelist */,
- TRUE /* commit_as_operations */,
- TRUE /* include_file_externals */,
- FALSE /* include_dir_externals */,
- NULL, NULL, NULL, NULL, ctx, b->pool);
+
+ /* A successfull commit doesn't close the ra session, but leaves that
+ to the caller. This leaves the BDB handle open, which might cause
+ problems in further test code. (op_depth_tests.c's repo_wc_copy) */
+ err = svn_client_commit6(targets, depth,
+ FALSE /* keep_locks */,
+ FALSE /* keep_changelist */,
+ TRUE /* commit_as_operations */,
+ TRUE /* include_file_externals */,
+ FALSE /* include_dir_externals */,
+ NULL, NULL, NULL, NULL, ctx, scratch_pool);
+
+ svn_pool_destroy(scratch_pool);
+
+ return svn_error_trace(err);
}
svn_error_t *
@@ -440,6 +491,24 @@
}
svn_error_t *
+sbox_wc_relocate(svn_test__sandbox_t *b,
+ const char *new_repos_url)
+{
+ apr_pool_t *scratch_pool = b->pool;
+ svn_client_ctx_t *ctx;
+
+ SVN_ERR(svn_client_create_context2(&ctx, NULL, scratch_pool));
+ ctx->wc_ctx = b->wc_ctx;
+
+ SVN_ERR(svn_client_relocate2(b->wc_abspath, b->repos_url,
+ new_repos_url, FALSE, ctx,scratch_pool));
+
+ b->repos_url = apr_pstrdup(b->pool, new_repos_url);
+
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *
sbox_add_and_commit_greek_tree(svn_test__sandbox_t *b)
{
const struct svn_test__tree_entry_t *node;
Modified: trunk/contrib/subversion/subversion/tests/libsvn_wc/utils.h
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_wc/utils.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_wc/utils.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -104,6 +104,14 @@
svn_error_t *
sbox_wc_copy(svn_test__sandbox_t *b, const char *from_path, const char *to_path);
+svn_error_t *
+sbox_wc_copy_url(svn_test__sandbox_t *b, const char *from_url,
+ svn_revnum_t revision, const char *to_path);
+
+svn_error_t *
+sbox_wc_relocate(svn_test__sandbox_t *b,
+ const char *new_repos_url);
+
/* Revert a WC file or directory tree at PATH */
svn_error_t *
sbox_wc_revert(svn_test__sandbox_t *b, const char *path, svn_depth_t depth);
Modified: trunk/contrib/subversion/subversion/tests/libsvn_wc/wc-queries-test.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/libsvn_wc/wc-queries-test.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/libsvn_wc/wc-queries-test.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -77,6 +77,7 @@
STMT_CREATE_NODES,
STMT_CREATE_NODES_TRIGGERS,
STMT_CREATE_EXTERNALS,
+ STMT_INSTALL_SCHEMA_STATISTICS,
/* Memory tables */
STMT_CREATE_TARGETS_LIST,
STMT_CREATE_CHANGELIST_LIST,
@@ -95,8 +96,8 @@
/* Operate on the entire WC */
STMT_SELECT_ALL_NODES, /* schema validation code */
- /* Is there a record? ### Can we somehow check for LIMIT 1? */
- STMT_LOOK_FOR_WORK,
+ /* Updates all records for a repository (designed slow) */
+ STMT_UPDATE_LOCK_REPOS_ID,
/* Full temporary table read */
STMT_INSERT_ACTUAL_EMPTIES,
@@ -114,6 +115,19 @@
-1 /* final marker */
};
+/* Statements that just read the first record from a table,
+ using the primary key. Specialized as different sqlite
+ versions produce different results */
+static const int primary_key_statements[] =
+{
+ /* Is there a record? ### Can we somehow check for LIMIT 1,
+ and primary key instead of adding a list? */
+ STMT_LOOK_FOR_WORK,
+ STMT_SELECT_WORK_ITEM,
+
+ -1 /* final marker */
+};
+
/* Helper function to determine if a statement is in a list */
static svn_boolean_t
in_list(const int list[], int stmt_idx)
@@ -529,6 +543,7 @@
return (apr_strnatcasecmp(table_name, "nodes") == 0
|| apr_strnatcasecmp(table_name, "actual_node") == 0
|| apr_strnatcasecmp(table_name, "externals") == 0
+ || apr_strnatcasecmp(table_name, "lock") == 0
|| apr_strnatcasecmp(table_name, "wc_lock") == 0
|| FALSE);
}
@@ -651,14 +666,24 @@
|| (item->expression_vars < 1))
&& !is_result_table(item->table))
{
- warned = TRUE;
- if (!is_slow_statement(i))
- warnings = svn_error_createf(SVN_ERR_TEST_FAILED, warnings,
+ if (in_list(primary_key_statements, i))
+ {
+ /* Reported as primary key index usage in Sqlite 3.7,
+ as table scan in 3.8+, while the execution plan is
+ identical: read first record from table */
+ }
+ else if (!is_slow_statement(i))
+ {
+ warned = TRUE;
+ warnings = svn_error_createf(SVN_ERR_TEST_FAILED, warnings,
"%s: "
"Uses %s with only %d index component: (%s)\n%s",
wc_query_info[i][0], item->table,
item->expression_vars, item->expressions,
wc_queries[i]);
+ }
+ else
+ warned = TRUE;
}
else if (item->search && !item->index)
{
@@ -718,6 +743,144 @@
return warnings;
}
+/* Helper to verify a bit of data in the sqlite3 statistics */
+static int
+parse_stat_data(const char *stat)
+{
+ int n = 0;
+ apr_int64_t last = APR_INT64_MAX;
+ while (*stat)
+ {
+ apr_int64_t v;
+ char *next;
+
+ if (*stat < '0' || *stat > '9')
+ return -2;
+
+ errno = 0;
+ v = apr_strtoi64(stat, &next, 10);
+
+ /* All numbers specify the average number of rows
+ with the same values in all columns left of it,
+ so the value must be >= 1 and lower than or equal
+ to all previous seen numbers */
+ if (v <= 0 || (v > last) || (errno != 0))
+ return -1;
+
+ last = v;
+
+ n++;
+ stat = next;
+
+ if (*stat == ' ')
+ stat++;
+ }
+
+ return n;
+}
+
+static svn_error_t *
+test_schema_statistics(apr_pool_t *scratch_pool)
+{
+ sqlite3 *sdb;
+ sqlite3_stmt *stmt;
+
+ SVN_ERR(create_memory_db(&sdb, scratch_pool));
+
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "CREATE TABLE shadow_stat1(tbl TEXT, idx TEXT, stat TEXT)",
+ NULL, NULL, NULL));
+
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "INSERT INTO shadow_stat1 (tbl, idx, stat) "
+ "SELECT tbl, idx, stat FROM sqlite_stat1",
+ NULL, NULL, NULL));
+
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "DROP TABLE sqlite_stat1",
+ NULL, NULL, NULL));
+
+ /* Insert statement to give index at least 1 record */
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "INSERT INTO nodes (wc_id, local_relpath, op_depth,"
+ " presence, kind) "
+ "VALUES (1, '', 0, 'normal', 'dir')",
+ NULL, NULL, NULL));
+
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "INSERT INTO actual_node (wc_id, local_relpath) "
+ "VALUES (1, '')",
+ NULL, NULL, NULL));
+
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "INSERT INTO lock (repos_id, repos_relpath, lock_token) "
+ "VALUES (1, '', '')",
+ NULL, NULL, NULL));
+
+ /* These are currently not necessary for query optimization, but it's better
+ to tell Sqlite how we intend to use this table anyway */
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "INSERT INTO wc_lock (wc_id, local_dir_relpath) "
+ "VALUES (1, '')",
+ NULL, NULL, NULL));
+
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "INSERT INTO WORK_QUEUE (work) "
+ "VALUES ('')",
+ NULL, NULL, NULL));
+
+ SQLITE_ERR(
+ sqlite3_exec(sdb,
+ "ANALYZE",
+ NULL, NULL, NULL));
+
+ SQLITE_ERR(
+ sqlite3_prepare(sdb, "SELECT s.tbl, s.idx, s.stat, r.stat "
+ "FROM shadow_stat1 s "
+ "LEFT JOIN sqlite_stat1 r ON "
+ "s.tbl=r.tbl and s.idx=r.idx",
+ -1, &stmt, NULL));
+
+ while (sqlite3_step(stmt) == SQLITE_ROW)
+ {
+ const char *wc_stat = (const char*)sqlite3_column_text(stmt, 2);
+ const char *sqlite_stat = (const char*)sqlite3_column_text(stmt, 3);
+
+ if (! sqlite_stat)
+ {
+ return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+ "Schema statistic failure:"
+ " Refering to unknown index '%s' on '%s'",
+ sqlite3_column_text(stmt, 1),
+ sqlite3_column_text(stmt, 0));
+ }
+
+ if (parse_stat_data(wc_stat) != parse_stat_data(sqlite_stat))
+ {
+ return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
+ "Schema statistic failure:"
+ " Column mismatch for '%s' on '%s'",
+ sqlite3_column_text(stmt, 1),
+ sqlite3_column_text(stmt, 0));
+ }
+ }
+
+ SQLITE_ERR(sqlite3_reset(stmt));
+ SQLITE_ERR(sqlite3_finalize(stmt));
+
+ SQLITE_ERR(sqlite3_close(sdb)); /* Close the DB if ok; otherwise leaked */
+
+ return SVN_NO_ERROR;
+}
+
struct svn_test_descriptor_t test_funcs[] =
{
SVN_TEST_NULL,
@@ -727,5 +890,7 @@
"queries are parsable"),
SVN_TEST_PASS2(test_query_expectations,
"test query expectations"),
+ SVN_TEST_PASS2(test_schema_statistics,
+ "test schema statistics"),
SVN_TEST_NULL
};
Index: trunk/contrib/subversion/subversion/tests/manual/tree-conflicts-add-vs-add.py
===================================================================
--- trunk/contrib/subversion/subversion/tests/manual/tree-conflicts-add-vs-add.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/manual/tree-conflicts-add-vs-add.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/subversion/tests/manual/tree-conflicts-add-vs-add.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/subversion/tests/svn_test.h
===================================================================
--- trunk/contrib/subversion/subversion/tests/svn_test.h 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/svn_test.h 2017-02-20 02:39:09 UTC (rev 9266)
@@ -103,6 +103,8 @@
const char *fs_type;
/* Config file. */
const char *config_file;
+ /* Source dir. */
+ const char *srcdir;
/* Minor version to use for servers and FS backends, or zero to use
the current latest version. */
int server_minor_version;
Modified: trunk/contrib/subversion/subversion/tests/svn_test_main.c
===================================================================
--- trunk/contrib/subversion/subversion/tests/svn_test_main.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/subversion/tests/svn_test_main.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -44,6 +44,7 @@
#include "svn_io.h"
#include "svn_path.h"
#include "svn_ctype.h"
+#include "svn_utf.h"
#include "private/svn_cmdline_private.h"
@@ -475,6 +476,10 @@
case fstype_opt:
opts.fs_type = apr_pstrdup(pool, opt_arg);
break;
+ case srcdir_opt:
+ SVN_INT_ERR(svn_utf_cstring_to_utf8(&opts.srcdir, opt_arg, pool));
+ opts.srcdir = svn_dirent_internal_style(opts.srcdir, pool);
+ break;
case list_opt:
list_mode = TRUE;
break;
Index: trunk/contrib/subversion/tools/backup/hot-backup.py.in
===================================================================
--- trunk/contrib/subversion/tools/backup/hot-backup.py.in 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/backup/hot-backup.py.in 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/backup/hot-backup.py.in
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/bdb/erase-all-text-data.py
===================================================================
--- trunk/contrib/subversion/tools/bdb/erase-all-text-data.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/bdb/erase-all-text-data.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/bdb/erase-all-text-data.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/bdb/svn-bdb-view.py
===================================================================
--- trunk/contrib/subversion/tools/bdb/svn-bdb-view.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/bdb/svn-bdb-view.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/bdb/svn-bdb-view.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/bdb/whatis-rep.py
===================================================================
--- trunk/contrib/subversion/tools/bdb/whatis-rep.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/bdb/whatis-rep.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/bdb/whatis-rep.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnbuild.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnbuild.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnbuild.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svncheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnclean.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnclean.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnclean.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/bb-openbsd/svnclean.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/centos/svnbuild.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/centos/svnbuild.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/centos/svnbuild.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/centos/svnbuild.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck-bindings.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck-bindings.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck-bindings.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck-bindings.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/centos/svncheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/centos/svnclean.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/centos/svnclean.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/centos/svnclean.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/centos/svnclean.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/centos/svnlog.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/centos/svnlog.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/centos/svnlog.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/centos/svnlog.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnbuild.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svncheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnclean.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/i686-debian-sarge1/svnlog.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnbuild.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svncheck.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnclean.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnclean.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnclean.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnclean.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnlog.sh
===================================================================
--- trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnlog.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnlog.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/buildbot/slaves/ubuntu-x64/svnlog.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/bash_completion_test
===================================================================
--- trunk/contrib/subversion/tools/client-side/bash_completion_test 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/bash_completion_test 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/bash_completion_test
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/change-svn-wc-format.py
===================================================================
--- trunk/contrib/subversion/tools/client-side/change-svn-wc-format.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/change-svn-wc-format.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/change-svn-wc-format.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/detach.py
===================================================================
--- trunk/contrib/subversion/tools/client-side/detach.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/detach.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/detach.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/mergeinfo-sanitizer.py
===================================================================
--- trunk/contrib/subversion/tools/client-side/mergeinfo-sanitizer.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/mergeinfo-sanitizer.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/mergeinfo-sanitizer.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/server-version.py
===================================================================
--- trunk/contrib/subversion/tools/client-side/server-version.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/server-version.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/server-version.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/showchange.pl
===================================================================
--- trunk/contrib/subversion/tools/client-side/showchange.pl 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/showchange.pl 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/showchange.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/svn-graph.pl
===================================================================
--- trunk/contrib/subversion/tools/client-side/svn-graph.pl 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/svn-graph.pl 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/svn-graph.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/svn-ssl-fingerprints.sh
===================================================================
--- trunk/contrib/subversion/tools/client-side/svn-ssl-fingerprints.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/svn-ssl-fingerprints.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/svn-ssl-fingerprints.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/svn-viewspec.py
===================================================================
--- trunk/contrib/subversion/tools/client-side/svn-viewspec.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/svn-viewspec.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/svn-viewspec.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/client-side/wcfind
===================================================================
--- trunk/contrib/subversion/tools/client-side/wcfind 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/client-side/wcfind 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/client-side/wcfind
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/analyze-svnlogs.py
===================================================================
--- trunk/contrib/subversion/tools/dev/analyze-svnlogs.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/analyze-svnlogs.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/analyze-svnlogs.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/benchmarks/large_dirs/create_bigdir.sh
===================================================================
--- trunk/contrib/subversion/tools/dev/benchmarks/large_dirs/create_bigdir.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/benchmarks/large_dirs/create_bigdir.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/benchmarks/large_dirs/create_bigdir.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/benchmarks/suite1/benchmark.py
===================================================================
--- trunk/contrib/subversion/tools/dev/benchmarks/suite1/benchmark.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/benchmarks/suite1/benchmark.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/benchmarks/suite1/benchmark.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/benchmarks/suite1/cronjob
===================================================================
--- trunk/contrib/subversion/tools/dev/benchmarks/suite1/cronjob 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/benchmarks/suite1/cronjob 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/benchmarks/suite1/cronjob
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/benchmarks/suite1/generate_charts
===================================================================
--- trunk/contrib/subversion/tools/dev/benchmarks/suite1/generate_charts 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/benchmarks/suite1/generate_charts 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/benchmarks/suite1/generate_charts
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/benchmarks/suite1/run
===================================================================
--- trunk/contrib/subversion/tools/dev/benchmarks/suite1/run 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/benchmarks/suite1/run 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/benchmarks/suite1/run
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/check-license.py
===================================================================
--- trunk/contrib/subversion/tools/dev/check-license.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/check-license.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/check-license.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/contribulyze.py
===================================================================
--- trunk/contrib/subversion/tools/dev/contribulyze.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/contribulyze.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/contribulyze.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/datecheck.py
===================================================================
--- trunk/contrib/subversion/tools/dev/datecheck.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/datecheck.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/datecheck.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/find-bad-style.py
===================================================================
--- trunk/contrib/subversion/tools/dev/find-bad-style.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/find-bad-style.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/find-bad-style.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/find-unmoved-deprecated.sh
===================================================================
--- trunk/contrib/subversion/tools/dev/find-unmoved-deprecated.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/find-unmoved-deprecated.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/find-unmoved-deprecated.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/gen-javahl-errors.py
===================================================================
--- trunk/contrib/subversion/tools/dev/gen-javahl-errors.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/gen-javahl-errors.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/gen-javahl-errors.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/gen-py-errors.py
===================================================================
--- trunk/contrib/subversion/tools/dev/gen-py-errors.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/gen-py-errors.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/gen-py-errors.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/dev/gen_junit_report.py
===================================================================
--- trunk/contrib/subversion/tools/dev/gen_junit_report.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/gen_junit_report.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -20,7 +20,7 @@
#
#
-# $Id: gen_junit_report.py,v 1.1.1.1 2013-08-24 19:37:10 laffer1 Exp $
+# $Id: gen_junit_report.py 1141953 2011-07-01 14:42:56Z rhuijben $
"""
gen_junit_report.py -- The script is to generate the junit report for
Subversion tests. The script uses the log file, tests.log created by
Property changes on: trunk/contrib/subversion/tools/dev/gen_junit_report.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/gnuify-changelog.pl
===================================================================
--- trunk/contrib/subversion/tools/dev/gnuify-changelog.pl 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/gnuify-changelog.pl 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/gnuify-changelog.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/graph-dav-servers.py
===================================================================
--- trunk/contrib/subversion/tools/dev/graph-dav-servers.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/graph-dav-servers.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/graph-dav-servers.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/histogram.py
===================================================================
--- trunk/contrib/subversion/tools/dev/histogram.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/histogram.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/histogram.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/iz/ff2csv.command
===================================================================
--- trunk/contrib/subversion/tools/dev/iz/ff2csv.command 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/iz/ff2csv.command 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/iz/ff2csv.command
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/iz/ff2csv.py
===================================================================
--- trunk/contrib/subversion/tools/dev/iz/ff2csv.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/iz/ff2csv.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/iz/ff2csv.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/iz/find-fix.py
===================================================================
--- trunk/contrib/subversion/tools/dev/iz/find-fix.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/iz/find-fix.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/iz/find-fix.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/iz/run-queries.sh
===================================================================
--- trunk/contrib/subversion/tools/dev/iz/run-queries.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/iz/run-queries.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/iz/run-queries.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/lock-check.py
===================================================================
--- trunk/contrib/subversion/tools/dev/lock-check.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/lock-check.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/lock-check.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/log_revnum_change_asf.py
===================================================================
--- trunk/contrib/subversion/tools/dev/log_revnum_change_asf.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/log_revnum_change_asf.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/log_revnum_change_asf.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/merge-graph.py
===================================================================
--- trunk/contrib/subversion/tools/dev/merge-graph.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/merge-graph.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/merge-graph.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/min-includes.sh
===================================================================
--- trunk/contrib/subversion/tools/dev/min-includes.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/min-includes.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/min-includes.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/mklog.py
===================================================================
--- trunk/contrib/subversion/tools/dev/mklog.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/mklog.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/mklog.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/mlpatch.py
===================================================================
--- trunk/contrib/subversion/tools/dev/mlpatch.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/mlpatch.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/mlpatch.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/normalize-dump.py
===================================================================
--- trunk/contrib/subversion/tools/dev/normalize-dump.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/normalize-dump.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/normalize-dump.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/po-merge.py
===================================================================
--- trunk/contrib/subversion/tools/dev/po-merge.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/po-merge.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/po-merge.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/prebuild-cleanup.sh
===================================================================
--- trunk/contrib/subversion/tools/dev/prebuild-cleanup.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/prebuild-cleanup.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/prebuild-cleanup.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/random-commits.py
===================================================================
--- trunk/contrib/subversion/tools/dev/random-commits.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/random-commits.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/random-commits.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/remove-trailing-whitespace.sh
===================================================================
--- trunk/contrib/subversion/tools/dev/remove-trailing-whitespace.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/remove-trailing-whitespace.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/remove-trailing-whitespace.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/sbox-ospath.py
===================================================================
--- trunk/contrib/subversion/tools/dev/sbox-ospath.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/sbox-ospath.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/sbox-ospath.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/scramble-tree.py
===================================================================
--- trunk/contrib/subversion/tools/dev/scramble-tree.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/scramble-tree.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/scramble-tree.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/stress.pl
===================================================================
--- trunk/contrib/subversion/tools/dev/stress.pl 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/stress.pl 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/stress.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/svn-merge-revs.py
===================================================================
--- trunk/contrib/subversion/tools/dev/svn-merge-revs.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/svn-merge-revs.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/svn-merge-revs.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/svnqlite3-dump
===================================================================
--- trunk/contrib/subversion/tools/dev/svnqlite3-dump 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/svnqlite3-dump 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/svnqlite3-dump
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/trails.py
===================================================================
--- trunk/contrib/subversion/tools/dev/trails.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/trails.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/trails.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/verify-history.py
===================================================================
--- trunk/contrib/subversion/tools/dev/verify-history.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/verify-history.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/verify-history.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/warn-ignored-err.sh
===================================================================
--- trunk/contrib/subversion/tools/dev/warn-ignored-err.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/warn-ignored-err.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/warn-ignored-err.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/wc-format.py
===================================================================
--- trunk/contrib/subversion/tools/dev/wc-format.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/wc-format.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/wc-format.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/wc-ng/bump-to-19.py
===================================================================
--- trunk/contrib/subversion/tools/dev/wc-ng/bump-to-19.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/wc-ng/bump-to-19.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/wc-ng/bump-to-19.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/wc-ng/count-progress.py
===================================================================
--- trunk/contrib/subversion/tools/dev/wc-ng/count-progress.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/wc-ng/count-progress.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/wc-ng/count-progress.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/wc-ng/gather-data.sh
===================================================================
--- trunk/contrib/subversion/tools/dev/wc-ng/gather-data.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/wc-ng/gather-data.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/wc-ng/gather-data.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/wc-ng/graph-data.py
===================================================================
--- trunk/contrib/subversion/tools/dev/wc-ng/graph-data.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/wc-ng/graph-data.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/wc-ng/graph-data.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/wc-ng/populate-pristine.py
===================================================================
--- trunk/contrib/subversion/tools/dev/wc-ng/populate-pristine.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/wc-ng/populate-pristine.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/wc-ng/populate-pristine.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dev/which-error.py
===================================================================
--- trunk/contrib/subversion/tools/dev/which-error.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dev/which-error.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dev/which-error.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/backport.pl
===================================================================
--- trunk/contrib/subversion/tools/dist/backport.pl 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/backport.pl 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/backport.pl
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/checksums.py
===================================================================
--- trunk/contrib/subversion/tools/dist/checksums.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/checksums.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/checksums.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/collect_sigs.py
===================================================================
--- trunk/contrib/subversion/tools/dist/collect_sigs.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/collect_sigs.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/collect_sigs.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/dist.sh
===================================================================
--- trunk/contrib/subversion/tools/dist/dist.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/dist.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/dist.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/download-release.sh
===================================================================
--- trunk/contrib/subversion/tools/dist/download-release.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/download-release.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/download-release.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/extract-for-examination.sh
===================================================================
--- trunk/contrib/subversion/tools/dist/extract-for-examination.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/extract-for-examination.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/extract-for-examination.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/make-deps-tarball.sh
===================================================================
--- trunk/contrib/subversion/tools/dist/make-deps-tarball.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/make-deps-tarball.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/make-deps-tarball.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/nightly.sh
===================================================================
--- trunk/contrib/subversion/tools/dist/nightly.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/nightly.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/nightly.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/release.py
===================================================================
--- trunk/contrib/subversion/tools/dist/release.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/release.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/release.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/dist/test.sh
===================================================================
--- trunk/contrib/subversion/tools/dist/test.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/dist/test.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/dist/test.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/SvnCLBrowse
===================================================================
--- trunk/contrib/subversion/tools/examples/SvnCLBrowse 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/SvnCLBrowse 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/SvnCLBrowse
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/examples/blame.py
===================================================================
--- trunk/contrib/subversion/tools/examples/blame.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/blame.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -91,9 +91,9 @@
# print ''.join(diffresult)
# print annotresult
for x in range(len(annotresult.keys())):
- sys.stdout.write("Line %d (rev %d):%s" % (x,
- annotresult[x][0],
- annotresult[x][1]))
+ sys.stdout.write("Line %d (r%d):%s" % (x,
+ annotresult[x][0],
+ annotresult[x][1]))
def usage():
print("USAGE: blame.py [-r REV] repos-path file")
Property changes on: trunk/contrib/subversion/tools/examples/blame.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/check-modified.py
===================================================================
--- trunk/contrib/subversion/tools/examples/check-modified.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/check-modified.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/check-modified.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/dumpprops.py
===================================================================
--- trunk/contrib/subversion/tools/examples/dumpprops.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/dumpprops.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/dumpprops.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/get-location-segments.py
===================================================================
--- trunk/contrib/subversion/tools/examples/get-location-segments.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/get-location-segments.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/get-location-segments.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/getfile.py
===================================================================
--- trunk/contrib/subversion/tools/examples/getfile.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/getfile.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/getfile.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/geturl.py
===================================================================
--- trunk/contrib/subversion/tools/examples/geturl.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/geturl.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/geturl.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/putfile.py
===================================================================
--- trunk/contrib/subversion/tools/examples/putfile.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/putfile.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/putfile.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/revplist.py
===================================================================
--- trunk/contrib/subversion/tools/examples/revplist.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/revplist.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/revplist.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/svnlog2html.rb
===================================================================
--- trunk/contrib/subversion/tools/examples/svnlog2html.rb 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/svnlog2html.rb 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/svnlog2html.rb
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/svnlook.py
===================================================================
--- trunk/contrib/subversion/tools/examples/svnlook.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/svnlook.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/svnlook.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/svnlook.rb
===================================================================
--- trunk/contrib/subversion/tools/examples/svnlook.rb 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/svnlook.rb 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/svnlook.rb
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/svnshell.py
===================================================================
--- trunk/contrib/subversion/tools/examples/svnshell.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/svnshell.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/svnshell.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/svnshell.rb
===================================================================
--- trunk/contrib/subversion/tools/examples/svnshell.rb 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/svnshell.rb 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/svnshell.rb
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/examples/walk-config-auth.py
===================================================================
--- trunk/contrib/subversion/tools/examples/walk-config-auth.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/examples/walk-config-auth.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/examples/walk-config-auth.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/hook-scripts/commit-access-control.cfg.example
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/commit-access-control.cfg.example 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/commit-access-control.cfg.example 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,6 +1,6 @@
# This is a sample configuration file for commit-access-control.pl.
#
-# $Id: commit-access-control.cfg.example,v 1.1.1.1 2013-08-24 19:37:10 laffer1 Exp $
+# $Id: commit-access-control.cfg.example 845362 2003-03-12 05:56:21Z kfogel $
#
# This file uses the Windows ini style, where the file consists of a
# number of sections, each section starts with a unique section name
Index: trunk/contrib/subversion/tools/hook-scripts/commit-access-control.pl.in
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/commit-access-control.pl.in 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/commit-access-control.pl.in 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/commit-access-control.pl.in
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/commit-email.rb
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/commit-email.rb 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/commit-email.rb 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/commit-email.rb
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/control-chars.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/control-chars.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/control-chars.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/control-chars.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/log-police.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/log-police.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/log-police.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/log-police.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.conf.example
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.conf.example 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.conf.example 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,7 +1,7 @@
#
# mailer.conf: example configuration file for mailer.py
#
-# $Id: mailer.conf.example,v 1.1.1.1 2013-08-24 19:37:10 laffer1 Exp $
+# $Id: mailer.conf.example 1439592 2013-01-28 19:20:53Z danielsh $
[general]
Index: trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/mailer/mailer.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-init.sh
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-init.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-init.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-init.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-t1.sh
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-t1.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-t1.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-t1.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-tweak.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-tweak.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-tweak.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer-tweak.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer.conf
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer.conf 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/mailer/tests/mailer.conf 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,7 +1,7 @@
#
# mailer.conf: example configuration file for mailer.py
#
-# $Id: mailer.conf,v 1.1.1.1 2013-08-24 19:37:10 laffer1 Exp $
+# $Id: mailer.conf 1086097 2011-03-28 02:14:33Z gmcdonald $
#
# Licensed to the Apache Software Foundation (ASF) under one
Index: trunk/contrib/subversion/tools/hook-scripts/persist-ephemeral-txnprops.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/persist-ephemeral-txnprops.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/persist-ephemeral-txnprops.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/persist-ephemeral-txnprops.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/svn2feed.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/svn2feed.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/svn2feed.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/svn2feed.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/hook-scripts/svnperms.conf.example
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/svnperms.conf.example 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/svnperms.conf.example 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,6 +1,6 @@
## Example configuration file for svnperms.py. ##
-# $Id: svnperms.conf.example,v 1.1.1.1 2013-08-24 19:37:10 laffer1 Exp $
+# $Id: svnperms.conf.example 1028289 2010-10-28 13:20:45Z cmpilato $
#
# Multiple global [groups] sections are accepted, but be aware
# that it's the same as concatenating them all in a single entry.
Index: trunk/contrib/subversion/tools/hook-scripts/svnperms.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/svnperms.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/svnperms.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/svnperms.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/validate-extensions.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/validate-extensions.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/validate-extensions.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/validate-extensions.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/validate-files.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/validate-files.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/validate-files.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/validate-files.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/hook-scripts/verify-po.py
===================================================================
--- trunk/contrib/subversion/tools/hook-scripts/verify-po.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/hook-scripts/verify-po.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/hook-scripts/verify-po.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/po/l10n-report.py
===================================================================
--- trunk/contrib/subversion/tools/po/l10n-report.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/po/l10n-report.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# $Id: l10n-report.py,v 1.1.1.1 2013-08-24 19:37:10 laffer1 Exp $
+# $Id: l10n-report.py 1132657 2011-06-06 14:23:36Z julianfoad $
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -46,7 +46,7 @@
MAIL_THREAD_ID = '<translation_status_report_for_%s at subversion.apache.org>'
def _rev():
- dollar = "$Revision: 1.1.1.1 $"
+ dollar = "$Revision: 1132657 $"
return int(re.findall('[0-9]+', dollar)[0]);
def usage_and_exit(errmsg=None):
Property changes on: trunk/contrib/subversion/tools/po/l10n-report.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/po/po-update.sh
===================================================================
--- trunk/contrib/subversion/tools/po/po-update.sh 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/po/po-update.sh 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/po/po-update.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/fsfs-reshard.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/fsfs-reshard.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/fsfs-reshard.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/fsfs-reshard.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/server-side/fsfs-stats.c
===================================================================
--- trunk/contrib/subversion/tools/server-side/fsfs-stats.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/fsfs-stats.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -1240,7 +1240,7 @@
next = current ? strchr(++current, '\n') : NULL;
if (next == NULL)
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
- _("Corrupt directory representation in rev %ld at offset %ld"),
+ _("Corrupt directory representation in r%ld at offset %ld"),
representation->revision,
(long)representation->offset);
Modified: trunk/contrib/subversion/tools/server-side/mod_dontdothat/mod_dontdothat.c
===================================================================
--- trunk/contrib/subversion/tools/server-side/mod_dontdothat/mod_dontdothat.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/mod_dontdothat/mod_dontdothat.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -30,6 +30,7 @@
#include <util_filter.h>
#include <ap_config.h>
#include <apr_strings.h>
+#include <apr_uri.h>
#include <expat.h>
@@ -36,6 +37,8 @@
#include "mod_dav_svn.h"
#include "svn_string.h"
#include "svn_config.h"
+#include "svn_path.h"
+#include "private/svn_fspath.h"
module AP_MODULE_DECLARE_DATA dontdothat_module;
@@ -161,6 +164,34 @@
}
}
+/* duplicate of dav_svn__log_err() from mod_dav_svn/util.c */
+static void
+log_dav_err(request_rec *r,
+ dav_error *err,
+ int level)
+{
+ dav_error *errscan;
+
+ /* Log the errors */
+ /* ### should have a directive to log the first or all */
+ for (errscan = err; errscan != NULL; errscan = errscan->prev) {
+ apr_status_t status;
+
+ if (errscan->desc == NULL)
+ continue;
+
+#if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
+ status = errscan->aprerr;
+#else
+ status = errscan->save_errno;
+#endif
+
+ ap_log_rerror(APLOG_MARK, level, status, r,
+ "%s [%d, #%d]",
+ errscan->desc, errscan->status, errscan->error_id);
+ }
+}
+
static svn_boolean_t
is_this_legal(dontdothat_filter_ctx *ctx, const char *uri)
{
@@ -167,20 +198,37 @@
const char *relative_path;
const char *cleaned_uri;
const char *repos_name;
+ const char *uri_path;
int trailing_slash;
dav_error *derr;
- /* Ok, so we need to skip past the scheme, host, etc. */
- uri = ap_strstr_c(uri, "://");
- if (uri)
- uri = ap_strchr_c(uri + 3, '/');
+ /* uri can be an absolute uri or just a path, we only want the path to match
+ * against */
+ if (uri && svn_path_is_url(uri))
+ {
+ apr_uri_t parsed_uri;
+ apr_status_t rv = apr_uri_parse(ctx->r->pool, uri, &parsed_uri);
+ if (APR_SUCCESS != rv)
+ {
+ /* Error parsing the URI, log and reject request. */
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, ctx->r,
+ "mod_dontdothat: blocked request after failing "
+ "to parse uri: '%s'", uri);
+ return FALSE;
+ }
+ uri_path = parsed_uri.path;
+ }
+ else
+ {
+ uri_path = uri;
+ }
- if (uri)
+ if (uri_path)
{
const char *repos_path;
derr = dav_svn_split_uri(ctx->r,
- uri,
+ uri_path,
ctx->cfg->base_path,
&cleaned_uri,
&trailing_slash,
@@ -194,7 +242,7 @@
if (! repos_path)
repos_path = "";
- repos_path = apr_psprintf(ctx->r->pool, "/%s", repos_path);
+ repos_path = svn_fspath__canonicalize(repos_path, ctx->r->pool);
/* First check the special cases that are always legal... */
for (idx = 0; idx < ctx->allow_recursive_ops->nelts; ++idx)
@@ -228,7 +276,20 @@
}
}
}
+ else
+ {
+ log_dav_err(ctx->r, derr, APLOG_ERR);
+ return FALSE;
+ }
+
}
+ else
+ {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r,
+ "mod_dontdothat: empty uri passed to is_this_legal(), "
+ "module bug?");
+ return FALSE;
+ }
return TRUE;
}
Index: trunk/contrib/subversion/tools/server-side/svn-backup-dumps.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svn-backup-dumps.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svn-backup-dumps.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svn-backup-dumps.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svn_server_log_parse.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svn_server_log_parse.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svn_server_log_parse.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svn_server_log_parse.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/server-side/svnauthz.c
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnauthz.c 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnauthz.c 2017-02-20 02:39:09 UTC (rev 9266)
@@ -59,8 +59,10 @@
{"repository", svnauthz__repos, 1, ("repository authz name")},
{"transaction", 't', 1, ("transaction id")},
{"is", svnauthz__is, 1,
- ("instead of outputing, tests if the access is ARG\n"
+ ("instead of outputting, test if the access is\n"
" "
+ "exactly ARG\n"
+ " "
"ARG can be one of the following values:\n"
" "
" rw write access (which also implies read)\n"
@@ -67,10 +69,12 @@
" "
" r read-only access\n"
" "
- " no no access\n")
+ " no no access")
},
- {"groups-file", svnauthz__groups_file, 1, ("path to the global groups file")},
- {"recursive", 'R', 0, ("recursive access to path")},
+ {"groups-file", svnauthz__groups_file, 1,
+ ("use the groups from file ARG")},
+ {"recursive", 'R', 0,
+ ("determine recursive access to PATH")},
{0, 0, 0, 0}
};
@@ -129,27 +133,32 @@
{'t'} },
{"accessof", subcommand_accessof, {0} /* no aliases */,
("Print or test the permissions set by an authz file.\n"
- "usage: 1. svnauthz accessof [--username USER] [--groups-file GROUPS_FILE] TARGET\n"
- " 2. svnauthz accessof [--username USER] [--groups-file GROUPS_FILE] \\\n"
- " -t TXN REPOS_PATH FILE_PATH\n\n"
- " 1. Prints the access of USER based on TARGET.\n"
+ "usage: 1. svnauthz accessof TARGET\n"
+ " 2. svnauthz accessof -t TXN REPOS_PATH FILE_PATH\n"
+ "\n"
+ " 1. Prints the access of USER to PATH based on authorization file at TARGET.\n"
" TARGET can be a path to a file or an absolute file:// URL to an authz\n"
- " file in a repository, but cannot be a repository relative URL (^/).\n\n"
- " 2. Prints the access of USER based on authz file at FILE_PATH in the\n"
- " transaction TXN in the repository at REPOS_PATH.\n\n"
- " If the --username argument is omitted then access of an anonymous user\n"
- " will be printed. If --path argument is omitted prints if any access\n"
- " to the repo is allowed. If --groups-file is specified, the groups from\n"
- " GROUPS_FILE will be used.\n\n"
+ " file in a repository, but cannot be a repository relative URL (^/).\n"
+ "\n"
+ " 2. Prints the access of USER to PATH based on authz file at FILE_PATH in the\n"
+ " transaction TXN in the repository at REPOS_PATH.\n"
+ "\n"
+ " USER is the argument to the --username option; if that option is not\n"
+ " provided, then access of an anonymous user will be printed or tested.\n"
+ "\n"
+ " PATH is the argument to the --path option; if that option is not provided,\n"
+ " the maximal access to any path in the repository will be considered.\n"
+ "\n"
"Outputs one of the following:\n"
" rw write access (which also implies read)\n"
" r read access\n"
- " no no access\n\n"
+ " no no access\n"
+ "\n"
"Returns:\n"
- " 0 when syntax is OK and --is argument (if any) matches.\n"
+ " 0 when syntax is OK and '--is' argument (if any) matches.\n"
" 1 when syntax is invalid.\n"
" 2 operational error\n"
- " 3 when --is argument doesn't match\n"
+ " 3 when '--is' argument doesn't match\n"
),
{'t', svnauthz__username, svnauthz__path, svnauthz__repos, svnauthz__is,
svnauthz__groups_file, 'R'} },
Index: trunk/contrib/subversion/tools/server-side/svnpredumpfilter.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpredumpfilter.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpredumpfilter.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpredumpfilter.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/commit-hook.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/commit-hook.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/commit-hook.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/commit-hook.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/server-side/svnpubsub/daemonize.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/daemonize.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/daemonize.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -143,7 +143,14 @@
if daemon_accepting.signalled:
# the daemon is up and running, so save the pid and return success.
if self.pidfile:
- open(self.pidfile, 'w').write('%d\n' % pid)
+ # Be wary of symlink attacks
+ try:
+ os.remove(self.pidfile)
+ except OSError:
+ pass
+ fd = os.open(self.pidfile, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0444)
+ os.write(fd, '%d\n' % pid)
+ os.close(fd)
return DAEMON_STARTED
# some other signal popped us out of the pause. the daemon might not
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/irkerbridge.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/irkerbridge.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/irkerbridge.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/irkerbridge.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Copied: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub (from rev 9265, vendor/apache/subversion/dist/tools/server-side/svnpubsub/rc.d/svnpubsub)
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub (rev 0)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub 2017-02-20 02:39:09 UTC (rev 9266)
@@ -0,0 +1 @@
+link svnpubsub.freebsd
\ No newline at end of file
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.debian
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.debian 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.debian 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.debian
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.solaris
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.solaris 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.solaris 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnpubsub.solaris
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Copied: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub (from rev 9265, vendor/apache/subversion/dist/tools/server-side/svnpubsub/rc.d/svnwcsub)
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub (rev 0)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub 2017-02-20 02:39:09 UTC (rev 9266)
@@ -0,0 +1 @@
+link svnwcsub.freebsd
\ No newline at end of file
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.debian 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.debian 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/svntweet.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/svntweet.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/svntweet.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/svntweet.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Modified: trunk/contrib/subversion/tools/server-side/svnpubsub/svnwcsub.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/svnwcsub.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/svnwcsub.py 2017-02-20 02:39:09 UTC (rev 9266)
@@ -465,7 +465,15 @@
# Otherwise, we should write this (foreground) PID into the file.
if options.pidfile and not options.daemon:
pid = os.getpid()
- open(options.pidfile, 'w').write('%s\n' % pid)
+ # Be wary of symlink attacks
+ try:
+ os.remove(options.pidfile)
+ except OSError:
+ pass
+ fd = os.open(options.pidfile, os.O_WRONLY | os.O_CREAT | os.O_EXCL,
+ 0444)
+ os.write(fd, '%d\n' % pid)
+ os.close(fd)
logging.info('pid %d written to %s', pid, options.pidfile)
if options.gid:
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/svnwcsub.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/testserver.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/testserver.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/testserver.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/testserver.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/svnpubsub/watcher.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/svnpubsub/watcher.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/svnpubsub/watcher.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/svnpubsub/watcher.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/contrib/subversion/tools/server-side/test_svn_server_log_parse.py
===================================================================
--- trunk/contrib/subversion/tools/server-side/test_svn_server_log_parse.py 2017-02-20 02:37:30 UTC (rev 9265)
+++ trunk/contrib/subversion/tools/server-side/test_svn_server_log_parse.py 2017-02-20 02:39:09 UTC (rev 9266)
Property changes on: trunk/contrib/subversion/tools/server-side/test_svn_server_log_parse.py
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list