subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1220893 [1/19] - in /subversion/branches/fs-py: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/client-side/emacs/ contrib/server-side/mod_dontdothat/ notes/ subversion/bindings/javahl/native/ su...
Date Mon, 19 Dec 2011 18:49:43 GMT
Author: hwright
Date: Mon Dec 19 18:49:34 2011
New Revision: 1220893

URL: http://svn.apache.org/viewvc?rev=1220893&view=rev
Log:
On the fs-py branch:
Bring up-to-date with trunk.

("Why?" you may ask.  The simple answer is "because I can," the the longer
answer is that this is still a backburnered pet project of mine, and when I
decide to hack a bit more on it, I'll want it up-to-date.  Because it needs to
track changes in the FSFS backend, and a few of those have been made in the
past few weeks, it's wise to do the catchup merge now, while those changes are
still fresh in our collective heads.)

Added:
    subversion/branches/fs-py/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent.tar.bz2
      - copied unchanged from r1220874, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent.tar.bz2
    subversion/branches/fs-py/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent_repos.tar.bz2
      - copied unchanged from r1220874, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_absent_repos.tar.bz2
    subversion/branches/fs-py/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
      - copied unchanged from r1220874, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_missing_replaced.tar.bz2
    subversion/branches/fs-py/subversion/tests/cmdline/upgrade_tests_data/upgrade_not_present_replaced.tar.bz2
      - copied unchanged from r1220874, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_not_present_replaced.tar.bz2
    subversion/branches/fs-py/subversion/tests/libsvn_wc/wc-incomplete-tester.c
      - copied unchanged from r1220874, subversion/trunk/subversion/tests/libsvn_wc/wc-incomplete-tester.c
    subversion/branches/fs-py/tools/server-side/mod_dontdothat/   (props changed)
      - copied from r1220874, subversion/trunk/tools/server-side/mod_dontdothat/
Removed:
    subversion/branches/fs-py/contrib/server-side/mod_dontdothat/
    subversion/branches/fs-py/subversion/tests/libsvn_delta/editor-test.c
    subversion/branches/fs-py/tools/client-side/svnmucc/svnmucc-test.py
Modified:
    subversion/branches/fs-py/   (props changed)
    subversion/branches/fs-py/CHANGES
    subversion/branches/fs-py/INSTALL
    subversion/branches/fs-py/Makefile.in
    subversion/branches/fs-py/build.conf
    subversion/branches/fs-py/build/ac-macros/berkeley-db.m4
    subversion/branches/fs-py/build/ac-macros/sqlite.m4
    subversion/branches/fs-py/build/generator/gen_win.py
    subversion/branches/fs-py/build/generator/templates/vcnet_vcproj.ezt
    subversion/branches/fs-py/build/generator/templates/vcnet_vcxproj.ezt
    subversion/branches/fs-py/build/getversion.py
    subversion/branches/fs-py/build/transform_sql.py
    subversion/branches/fs-py/build/win32/svn.rc
    subversion/branches/fs-py/configure.ac
    subversion/branches/fs-py/contrib/client-side/emacs/dsvn.el
    subversion/branches/fs-py/contrib/client-side/emacs/vc-svn.el
    subversion/branches/fs-py/notes/editor-v2.txt
    subversion/branches/fs-py/notes/knobs
    subversion/branches/fs-py/notes/repos-dictated-config
    subversion/branches/fs-py/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/fs-py/subversion/bindings/javahl/native/SVNRepos.cpp
    subversion/branches/fs-py/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/branches/fs-py/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/fs-py/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/branches/fs-py/subversion/bindings/swig/svn_wc.i
    subversion/branches/fs-py/subversion/include/private/svn_adler32.h   (props changed)
    subversion/branches/fs-py/subversion/include/private/svn_cache.h
    subversion/branches/fs-py/subversion/include/private/svn_client_private.h
    subversion/branches/fs-py/subversion/include/private/svn_debug.h
    subversion/branches/fs-py/subversion/include/private/svn_dep_compat.h
    subversion/branches/fs-py/subversion/include/private/svn_fspath.h
    subversion/branches/fs-py/subversion/include/private/svn_mergeinfo_private.h
    subversion/branches/fs-py/subversion/include/private/svn_mutex.h
    subversion/branches/fs-py/subversion/include/private/svn_opt_private.h
    subversion/branches/fs-py/subversion/include/private/svn_ra_private.h
    subversion/branches/fs-py/subversion/include/private/svn_string_private.h   (props changed)
    subversion/branches/fs-py/subversion/include/private/svn_temp_serializer.h   (props changed)
    subversion/branches/fs-py/subversion/include/private/svn_wc_private.h
    subversion/branches/fs-py/subversion/include/svn_client.h
    subversion/branches/fs-py/subversion/include/svn_delta.h
    subversion/branches/fs-py/subversion/include/svn_dirent_uri.h
    subversion/branches/fs-py/subversion/include/svn_editor.h
    subversion/branches/fs-py/subversion/include/svn_fs.h
    subversion/branches/fs-py/subversion/include/svn_mergeinfo.h
    subversion/branches/fs-py/subversion/include/svn_path.h
    subversion/branches/fs-py/subversion/include/svn_ra.h
    subversion/branches/fs-py/subversion/include/svn_repos.h
    subversion/branches/fs-py/subversion/include/svn_sorts.h
    subversion/branches/fs-py/subversion/include/svn_string.h
    subversion/branches/fs-py/subversion/include/svn_wc.h
    subversion/branches/fs-py/subversion/libsvn_client/add.c
    subversion/branches/fs-py/subversion/libsvn_client/blame.c
    subversion/branches/fs-py/subversion/libsvn_client/cleanup.c
    subversion/branches/fs-py/subversion/libsvn_client/client.h
    subversion/branches/fs-py/subversion/libsvn_client/cmdline.c
    subversion/branches/fs-py/subversion/libsvn_client/commit.c
    subversion/branches/fs-py/subversion/libsvn_client/commit_util.c
    subversion/branches/fs-py/subversion/libsvn_client/copy.c
    subversion/branches/fs-py/subversion/libsvn_client/delete.c
    subversion/branches/fs-py/subversion/libsvn_client/deprecated.c
    subversion/branches/fs-py/subversion/libsvn_client/diff.c
    subversion/branches/fs-py/subversion/libsvn_client/export.c
    subversion/branches/fs-py/subversion/libsvn_client/externals.c
    subversion/branches/fs-py/subversion/libsvn_client/info.c
    subversion/branches/fs-py/subversion/libsvn_client/list.c
    subversion/branches/fs-py/subversion/libsvn_client/log.c
    subversion/branches/fs-py/subversion/libsvn_client/merge.c
    subversion/branches/fs-py/subversion/libsvn_client/mergeinfo.c
    subversion/branches/fs-py/subversion/libsvn_client/mergeinfo.h
    subversion/branches/fs-py/subversion/libsvn_client/patch.c
    subversion/branches/fs-py/subversion/libsvn_client/prop_commands.c
    subversion/branches/fs-py/subversion/libsvn_client/ra.c
    subversion/branches/fs-py/subversion/libsvn_client/relocate.c
    subversion/branches/fs-py/subversion/libsvn_client/repos_diff.c
    subversion/branches/fs-py/subversion/libsvn_client/status.c
    subversion/branches/fs-py/subversion/libsvn_client/switch.c
    subversion/branches/fs-py/subversion/libsvn_client/update.c
    subversion/branches/fs-py/subversion/libsvn_client/url.c
    subversion/branches/fs-py/subversion/libsvn_client/util.c
    subversion/branches/fs-py/subversion/libsvn_delta/compat.c
    subversion/branches/fs-py/subversion/libsvn_delta/compose_delta.c
    subversion/branches/fs-py/subversion/libsvn_delta/editor.c
    subversion/branches/fs-py/subversion/libsvn_delta/svndiff.c
    subversion/branches/fs-py/subversion/libsvn_delta/text_delta.c
    subversion/branches/fs-py/subversion/libsvn_diff/diff_file.c
    subversion/branches/fs-py/subversion/libsvn_diff/diff_memory.c
    subversion/branches/fs-py/subversion/libsvn_diff/parse-diff.c
    subversion/branches/fs-py/subversion/libsvn_fs/fs-loader.c
    subversion/branches/fs-py/subversion/libsvn_fs/fs-loader.h
    subversion/branches/fs-py/subversion/libsvn_fs_base/bdb/changes-table.c
    subversion/branches/fs-py/subversion/libsvn_fs_base/bdb/env.c
    subversion/branches/fs-py/subversion/libsvn_fs_base/bdb/locks-table.c
    subversion/branches/fs-py/subversion/libsvn_fs_base/fs.c
    subversion/branches/fs-py/subversion/libsvn_fs_base/reps-strings.c
    subversion/branches/fs-py/subversion/libsvn_fs_base/tree.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/caching.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/dag.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/fs.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/fs-py/subversion/libsvn_fs_fs/key-gen.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/lock.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/rep-cache-db.sql
    subversion/branches/fs-py/subversion/libsvn_fs_fs/rep-cache.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/rep-cache.h
    subversion/branches/fs-py/subversion/libsvn_fs_fs/temp_serializer.c   (props changed)
    subversion/branches/fs-py/subversion/libsvn_fs_fs/temp_serializer.h   (props changed)
    subversion/branches/fs-py/subversion/libsvn_fs_fs/tree.c
    subversion/branches/fs-py/subversion/libsvn_fs_fs/tree.h
    subversion/branches/fs-py/subversion/libsvn_ra/compat.c
    subversion/branches/fs-py/subversion/libsvn_ra/ra_loader.c
    subversion/branches/fs-py/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/commit.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/fetch.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/file_revs.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/get_dated_rev.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/get_deleted_rev.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/get_location_segments.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/get_locations.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/get_locks.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/lock.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/log.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/merge.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/mergeinfo.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/options.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/props.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/replay.c
    subversion/branches/fs-py/subversion/libsvn_ra_neon/util.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/blame.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/commit.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/get_deleted_rev.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/getdate.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/getlocations.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/locks.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/log.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/merge.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/mergeinfo.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/options.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/property.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/replay.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/update.c
    subversion/branches/fs-py/subversion/libsvn_ra_serf/util.c
    subversion/branches/fs-py/subversion/libsvn_ra_svn/client.c
    subversion/branches/fs-py/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/fs-py/subversion/libsvn_repos/authz.c
    subversion/branches/fs-py/subversion/libsvn_repos/commit.c
    subversion/branches/fs-py/subversion/libsvn_repos/deprecated.c
    subversion/branches/fs-py/subversion/libsvn_repos/dump.c
    subversion/branches/fs-py/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/fs-py/subversion/libsvn_repos/log.c
    subversion/branches/fs-py/subversion/libsvn_repos/replay.c
    subversion/branches/fs-py/subversion/libsvn_repos/repos.c
    subversion/branches/fs-py/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/fs-py/subversion/libsvn_subr/adler32.c   (props changed)
    subversion/branches/fs-py/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/fs-py/subversion/libsvn_subr/cmdline.c
    subversion/branches/fs-py/subversion/libsvn_subr/config.c
    subversion/branches/fs-py/subversion/libsvn_subr/config_file.c
    subversion/branches/fs-py/subversion/libsvn_subr/config_win.c
    subversion/branches/fs-py/subversion/libsvn_subr/debug.c
    subversion/branches/fs-py/subversion/libsvn_subr/deprecated.c
    subversion/branches/fs-py/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/fs-py/subversion/libsvn_subr/dso.c
    subversion/branches/fs-py/subversion/libsvn_subr/hash.c   (props changed)
    subversion/branches/fs-py/subversion/libsvn_subr/io.c
    subversion/branches/fs-py/subversion/libsvn_subr/log.c
    subversion/branches/fs-py/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/fs-py/subversion/libsvn_subr/opt.c
    subversion/branches/fs-py/subversion/libsvn_subr/prompt.c
    subversion/branches/fs-py/subversion/libsvn_subr/quoprint.c
    subversion/branches/fs-py/subversion/libsvn_subr/sorts.c
    subversion/branches/fs-py/subversion/libsvn_subr/sqlite.c
    subversion/branches/fs-py/subversion/libsvn_subr/subst.c
    subversion/branches/fs-py/subversion/libsvn_subr/svn_base64.c
    subversion/branches/fs-py/subversion/libsvn_subr/svn_mutex.c
    subversion/branches/fs-py/subversion/libsvn_subr/svn_string.c
    subversion/branches/fs-py/subversion/libsvn_subr/svn_temp_serializer.c   (props changed)
    subversion/branches/fs-py/subversion/libsvn_subr/target.c
    subversion/branches/fs-py/subversion/libsvn_subr/win32_xlate.c
    subversion/branches/fs-py/subversion/libsvn_subr/xml.c
    subversion/branches/fs-py/subversion/libsvn_wc/adm_crawler.c
    subversion/branches/fs-py/subversion/libsvn_wc/adm_files.c
    subversion/branches/fs-py/subversion/libsvn_wc/adm_ops.c
    subversion/branches/fs-py/subversion/libsvn_wc/copy.c
    subversion/branches/fs-py/subversion/libsvn_wc/deprecated.c
    subversion/branches/fs-py/subversion/libsvn_wc/diff_editor.c
    subversion/branches/fs-py/subversion/libsvn_wc/entries.c
    subversion/branches/fs-py/subversion/libsvn_wc/externals.c
    subversion/branches/fs-py/subversion/libsvn_wc/node.c
    subversion/branches/fs-py/subversion/libsvn_wc/props.c
    subversion/branches/fs-py/subversion/libsvn_wc/questions.c
    subversion/branches/fs-py/subversion/libsvn_wc/status.c
    subversion/branches/fs-py/subversion/libsvn_wc/tree_conflicts.c
    subversion/branches/fs-py/subversion/libsvn_wc/update_editor.c
    subversion/branches/fs-py/subversion/libsvn_wc/upgrade.c
    subversion/branches/fs-py/subversion/libsvn_wc/util.c
    subversion/branches/fs-py/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/fs-py/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/fs-py/subversion/libsvn_wc/wc.h
    subversion/branches/fs-py/subversion/libsvn_wc/wc_db.c
    subversion/branches/fs-py/subversion/libsvn_wc/wc_db.h
    subversion/branches/fs-py/subversion/libsvn_wc/wc_db_pristine.c
    subversion/branches/fs-py/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/fs-py/subversion/libsvn_wc/workqueue.c
    subversion/branches/fs-py/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/fs-py/subversion/mod_dav_svn/reports/log.c
    subversion/branches/fs-py/subversion/mod_dav_svn/repos.c
    subversion/branches/fs-py/subversion/mod_dav_svn/util.c
    subversion/branches/fs-py/subversion/po/de.po
    subversion/branches/fs-py/subversion/po/fr.po
    subversion/branches/fs-py/subversion/svn/add-cmd.c
    subversion/branches/fs-py/subversion/svn/blame-cmd.c
    subversion/branches/fs-py/subversion/svn/cat-cmd.c
    subversion/branches/fs-py/subversion/svn/changelist-cmd.c
    subversion/branches/fs-py/subversion/svn/cl.h
    subversion/branches/fs-py/subversion/svn/commit-cmd.c
    subversion/branches/fs-py/subversion/svn/copy-cmd.c
    subversion/branches/fs-py/subversion/svn/delete-cmd.c
    subversion/branches/fs-py/subversion/svn/diff-cmd.c
    subversion/branches/fs-py/subversion/svn/import-cmd.c
    subversion/branches/fs-py/subversion/svn/info-cmd.c
    subversion/branches/fs-py/subversion/svn/list-cmd.c
    subversion/branches/fs-py/subversion/svn/log-cmd.c
    subversion/branches/fs-py/subversion/svn/main.c
    subversion/branches/fs-py/subversion/svn/merge-cmd.c
    subversion/branches/fs-py/subversion/svn/mergeinfo-cmd.c
    subversion/branches/fs-py/subversion/svn/mkdir-cmd.c
    subversion/branches/fs-py/subversion/svn/move-cmd.c
    subversion/branches/fs-py/subversion/svn/notify.c
    subversion/branches/fs-py/subversion/svn/propedit-cmd.c
    subversion/branches/fs-py/subversion/svn/proplist-cmd.c
    subversion/branches/fs-py/subversion/svn/props.c
    subversion/branches/fs-py/subversion/svn/relocate-cmd.c
    subversion/branches/fs-py/subversion/svn/status-cmd.c
    subversion/branches/fs-py/subversion/svn/status.c
    subversion/branches/fs-py/subversion/svn/tree-conflicts.c
    subversion/branches/fs-py/subversion/svn/util.c
    subversion/branches/fs-py/subversion/svnadmin/main.c
    subversion/branches/fs-py/subversion/svndumpfilter/main.c
    subversion/branches/fs-py/subversion/svnlook/main.c
    subversion/branches/fs-py/subversion/svnrdump/dump_editor.c
    subversion/branches/fs-py/subversion/svnrdump/load_editor.c
    subversion/branches/fs-py/subversion/svnrdump/svnrdump.c
    subversion/branches/fs-py/subversion/svnserve/serve.c
    subversion/branches/fs-py/subversion/svnsync/main.c
    subversion/branches/fs-py/subversion/svnsync/sync.c
    subversion/branches/fs-py/subversion/tests/cmdline/authz_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/basic_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/cat_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/commit_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/copy_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/dav-mirror-autocheck.sh
    subversion/branches/fs-py/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/fs-py/subversion/tests/cmdline/depth_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/diff_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/externals_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
    subversion/branches/fs-py/subversion/tests/cmdline/input_validation_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/log_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/merge_authz_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/merge_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/patch_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/prop_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/resolve_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/special_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/stat_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/svnmucc_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/fs-py/subversion/tests/cmdline/svntest/main.py
    subversion/branches/fs-py/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/update_tests.py
    subversion/branches/fs-py/subversion/tests/cmdline/upgrade_tests.py
    subversion/branches/fs-py/subversion/tests/libsvn_client/client-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_diff/diff-diff3-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_fs/locks-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_fs_base/strings-reps-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_subr/config-test.cfg
    subversion/branches/fs-py/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_subr/mergeinfo-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_subr/path-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_subr/subst_translate-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_wc/   (props changed)
    subversion/branches/fs-py/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/fs-py/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/fs-py/subversion/tests/svn_test_fs.c
    subversion/branches/fs-py/tools/client-side/svnmucc/svnmucc.c
    subversion/branches/fs-py/tools/dev/benchmarks/suite1/benchmark.py
    subversion/branches/fs-py/tools/dev/benchmarks/suite1/cronjob
    subversion/branches/fs-py/tools/dev/benchmarks/suite1/run
    subversion/branches/fs-py/tools/dev/unix-build/Makefile.svn
    subversion/branches/fs-py/tools/dist/backport.pl
    subversion/branches/fs-py/tools/dist/dist.sh
    subversion/branches/fs-py/tools/server-side/svnauthz-validate.c
    subversion/branches/fs-py/tools/server-side/svnpredumpfilter.py

Propchange: subversion/branches/fs-py/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 18:49:34 2011
@@ -23,6 +23,7 @@
 /subversion/branches/integrate-partial-getter:1072558-1076552
 /subversion/branches/integrate-readline-speedup:1072553-1072555
 /subversion/branches/integrate-stream-api-extensions:1068695-1072516
+/subversion/branches/integrate-string-improvements:1068251-1190617
 /subversion/branches/integrate-txdelta-caching:1072541-1078213
 /subversion/branches/issue-2779-dev:965496-984198
 /subversion/branches/issue-2843-dev:871432-874179
@@ -37,7 +38,7 @@
 /subversion/branches/log-g-performance:870941-871032
 /subversion/branches/merge-skips-obstructions:874525-874615
 /subversion/branches/nfc-nfd-aware-client:870276,870376
-/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,1029342,1029344,
 1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/performance:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-1029340,10
 29342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
 /subversion/branches/py-tests-as-modules:956579-1033052
 /subversion/branches/ra_serf-digest-authn:875693-876404
 /subversion/branches/reintegrate-improvements:873853-874164
@@ -56,4 +57,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1154223-1182874
+/subversion/trunk:1154223-1220874

Modified: subversion/branches/fs-py/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/CHANGES?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/CHANGES (original)
+++ subversion/branches/fs-py/CHANGES Mon Dec 19 18:49:34 2011
@@ -3,22 +3,102 @@ Version 1.8.0
 http://svn.apache.org/repos/asf/subversion/tags/1.8.0
 
  User-visible changes:
+  - General:
+    * remove extraneous externals output from 'svn status -q' (issue #1935)
+
+  - Major new features:
+    *
 
+  - Minor new features and improvements:
+    * new 'svnadmin load --revision' load filtering support (issue #3734)
+    * new 'commit --include-externals' option (related to issues #1167, #3563)
+    * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
+    * reject some attempts to merge between unrelated branches (r1215273)
+
+  - Client-side bugfixes:
+    *
+
+  - Server-side bugfixes:
+    *
+
+  - Other tool improvements and bugfixes:
+    *
+  
  Developer-visible changes:
+  - General:
+    *
+
   - API changes:
     * fix inconsistent handling of log revs without changed paths (issue #3694)
 
+  - Bindings:
+    *
+
+
+Version 1.7.2
+(02 Dec 2011, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.2
+
+  User-visible changes:
+   * fix working copy corruption after interrupted update/switch (issue #4040)
+   * avoid segfaults against pre-1.5 servers (r1186928)
+   * improve configure error message if apr-util uses old or no bdb (r1186784)
+   * make 'svn patch' ignore '/dev/null' targets for compat with git (r1197998)
+   * fix 'svn patch' segfault on patch that skips and deletes files (r1199950)
+   * omit "Committed revision N." output from 'svn commit --quiet' (r1200837)
+   * fix authz denial when svnserve root is a repository (issue #4060)
+   * fix uninitialized memory read in client diff code (r1201002)
+   * avoid potential segfault during merges (r1202807)
+   * fix an assertion failure when a symlink is updated (r1186944, -81, -83)
+   * make working copy operations fail if nodes have no base checksum (r1202630)
+   * fix nested <Location>s when using v2 protocol (r1203546, -651, -653)
+   * make mod_dav_svn ignore non-Subversion POST requests (r1187695)
+   * avoid reading freed memory (r1204478)
+   * recognize empty (only byte order mark) UTF-8 files as text (issue #4064)
+   * fix 1.7 client regression when operating against a 1.0.x server (r1199876)
+   * remove empty parent dirs of removed externals on update (issue #4044)
+   * make 'svn diff -c N' work for files added in rN (issue #2873)
+   * plug a memory leak in the bdb backend (r1205726)
+   * fix 'svn import' with native eol-style and inconsistent EOLs (r1205193)
+   * fix reading beyond the end of a string in bdb backend (r1205839, -48)
+   * don't assert when committing an incomplete directory (issue #4042)
+
+  Developer-visible changes:
+   * JavaHL: allow 'status -u' to function properly (r1189190, -395)
+   * don't put '\r' characters in our generate sql headers (r1189580)
+   * properly define WIN64 on Windows x64 builds (r1188609)
+   * better adherence to C89 in enum definitions (r1189665)
+   * bump copyright year in Windows DLLs (r1189261)
+   * log a better error when opening rep-cache.db fails (r1204610, -73)
+
 
 Version 1.7.1
-(?? ??? 2011, from /branches/1.7.x)
+(24 Oct 2011, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.1
 
   User-visible changes:
    * improve performance of 'svn info' (r1164386)
-   * improve sorting performance (r1167659)
-   * update base completion for 1.7 (r1177001)
+   * improve hash table sorting performance (r1167659)
+   * update bash completion for 1.7 (r1177001)
    * make 'svn ls' continue to work with 1.0-1.3 repos (r1154278, -379, -82)
-   * improve error messages generated by SASL (r1179767)
+   * improve handling of error messages generated by Cyrus SASL (r1179767)
+   * update INSTALL documentation file (r1182115, and others)
+   * error instead of assert when upgrading corrupt WCs (r1182904, -9)
+   * improve memory usage in merge (r1176915)
+   * fix an invalid assertion in merge (r1149103, -35)
+   * improve performance of 'merge --reintegrate' in edge-case (r1167681)
+   * fixed: 'svn mergeinfo' shows wrong revisions for added nodes (issue #3791)
+   * make 'svn add --parents D/file' work if D is deleted (r1185222)
+   * improve performance of trivial text file merges (issue #4009)
+   * add FSFS sanity check to prevent corruption seen in the wild (r1178280)
+   * improve correctness/performance of recursive info and proplist (r1164426)
+   * fix memory leak in 'merge --reintegrate' (r1180154)
+   * fix handling of directories after 'update --set-depth=empty' (r1185911)
+   * fix 'checksum != NULL' assertions in some upgraded WCs (r1177732)
+   * fix upgrading of WCs containing authz-restricted dirs (r1185738)
+   * make the server tolerate svn:mergeinfo with malformed paths (r1182771)
+   * fix some erroneous warning messages from the svn client (r1185746)
+   * fix WC upgrade with replaced nodes in edge-case (issue #4033)
 
   Developer-visible changes:
    * fix object lifetime issues in the JavaHL bindings (r1175888)
@@ -27,6 +107,10 @@ http://svn.apache.org/repos/asf/subversi
    * improve zlib configuration (r1174761, -98, -806)
    * improve SQLite runtime init for OS X 10.7 compat (r1181666)
    * improve test suite correctness (r1174111)
+   * fix potential segfault seen by TSVN (r1183263)
+   * fix backward compat crashes in JavaHL (r1183054, -347)
+   * fill in repos_* fields of svn_wc_status3_t for repos-only nodes (r1181609)
+   * disable the SQLite shared process cache (r1185242, r1185280)
 
 
 Version 1.7.0
@@ -252,10 +336,10 @@ http://svn.apache.org/repos/asf/subversi
     * fix 'log -g' excessive duplicate output (issue #3650)
     * fix svnsync copyfrom handling bug with BDB (r1036429)
     * server-side validation of svn:mergeinfo syntax during commit (issue #3895)
-    * fix remotely triggerable mod_dav_svn DoS
+    * fix remotely triggerable mod_dav_svn DoS (r1130303)
             See CVE-2011-1783, and descriptive advisory at
             http://subversion.apache.org/security/CVE-2011-1783-advisory.txt
-    * fix potential leak of authz-protected file contents
+    * fix potential leak of authz-protected file contents (r1130303)
             See CVE-2011-1921, and descriptive advisory at
             http://subversion.apache.org/security/CVE-2011-1921-advisory.txt
 

Modified: subversion/branches/fs-py/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/INSTALL?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/INSTALL (original)
+++ subversion/branches/fs-py/INSTALL Mon Dec 19 18:49:34 2011
@@ -449,7 +449,7 @@ I.    INTRODUCTION
       a precompiled version of the Berkeley DB library is available for
       download at the Subversion web site "Documents & files" area:
 
-          http://subversion.tigris.org/servlets/ProjectDocumentList
+          http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
 
       Look in the "Releases > Windows > Windows BDB" section.
 
@@ -887,8 +887,8 @@ II.   INSTALLATION
         libraries is not supported.
       * [Optional] Berkeley DB for backend support of the server
         components -- versions 4.3.27 and 4.4.20 are available from
-        http://subversion.tigris.org/servlets/ProjectDocumentList as
-        db-4.3.27-win32.zip and db-4.4.20-win32.zip.
+        http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
+        as db-4.3.27-win32.zip and db-4.4.20-win32.zip.
         For more information see Section I.5.
       * [Optional] Openssl 0.9.7f or higher can be obtained from
         http://www.openssl.org/source/openssl-0.9.7f.tar.gz

Modified: subversion/branches/fs-py/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/Makefile.in?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/Makefile.in (original)
+++ subversion/branches/fs-py/Makefile.in Mon Dec 19 18:49:34 2011
@@ -99,6 +99,10 @@ javahl_libdir = @libdir@
 javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work
 javahl_test_srcdir=$(abs_srcdir)/subversion/bindings/javahl
 
+gnome_auth_dir = $(abs_builddir)/subversion/libsvn_auth_gnome_keyring/.libs
+kwallet_auth_dir = $(abs_builddir)/subversion/libsvn_auth_kwallet/.libs
+auth_plugin_dirs = $(gnome_auth_dir):$(kwallet_auth_dir)
+
 MSGFMT = @MSGFMT@
 MSGFMTFLAGS = @MSGFMTFLAGS@
 MSGMERGE = @MSGMERGE@
@@ -432,11 +436,18 @@ clean-javahl:
 
 extraclean-javahl: clean-javahl
 
-check-javahl: javahl javahl-compat
+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_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.apache.subversion.javahl.RunTests
 	$(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
+
+check-javahl: check-apache-javahl
+
+check-all-javahl: check-apache-javahl check-tigris-javahl
+
 # "make check CLEANUP=true" will clean up directories for successful tests.
 # "make check TESTS=subversion/tests/cmdline/basic_tests.py"
 #  will perform only basic tests (likewise for other tests).
@@ -477,6 +488,7 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 	    flags="--list --milestone-filter=$(MILESTONE_FILTER)             \
 		   --mode-filter=$(MODE_FILTER) --log-to-stdout $$flags";    \
 	  fi;                                                                \
+	  LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)'           \
 	  $(PYTHON) $(top_srcdir)/build/run_tests.py                         \
 	            --config-file $(top_srcdir)/subversion/tests/tests.conf  \
 	            $$flags                                                  \

Modified: subversion/branches/fs-py/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build.conf?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build.conf (original)
+++ subversion/branches/fs-py/build.conf Mon Dec 19 18:49:34 2011
@@ -370,6 +370,15 @@ libs = libsvn_repos libsvn_subr
 install = apache-mod
 msvc-libs = libhttpd.lib
 
+[mod_dontdothat]
+description = Apache Httpd module to block certain kinds of Apache Subversion requests
+type = apache-mod
+path = tools/server-side/mod_dontdothat
+nonlibs = mod_dav_svn apr aprutil
+libs = libsvn_subr
+install = apache-mod
+msvc-libs = libhttpd.lib
+
 # ----------------------------------------------------------------------------
 #
 # CONSTRUCTED HEADERS
@@ -882,14 +891,6 @@ sources = random-test.c
 install = test
 libs = libsvn_test libsvn_delta libsvn_subr apriconv apr
 
-[editor-test]
-description = Test the editor v2 interface
-type = exe
-path = subversion/tests/libsvn_delta
-sources = editor-test.c
-install = test
-libs = libsvn_repos libsvn_fs libsvn_test libsvn_delta libsvn_subr apriconv apr
-
 [window-test]
 description = Test delta window generation
 type = exe
@@ -1031,6 +1032,14 @@ install = test
 libs = libsvn_wc libsvn_subr apriconv apr
 testing = skip
 
+[wc-incomplete-tester]
+type = exe
+path = subversion/tests/libsvn_wc
+sources = wc-incomplete-tester.c
+install = test
+libs = libsvn_wc libsvn_subr apriconv apr
+testing = skip
+
 # ----------------------------------------------------------------------------
 #
 # EXTERNAL TARGETS (NO BUILD NEEDED)
@@ -1121,7 +1130,7 @@ type = project
 path = build/win32
 libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync
        svnversion
-       mod_authz_svn mod_dav_svn
+       mod_authz_svn mod_dav_svn mod_dontdothat
        svnauthz-validate svnraisetreeconflict
 
 [__ALL_TESTS__]
@@ -1132,7 +1141,7 @@ libs = __ALL__
        strings-reps-test changes-test locks-test repos-test
        checksum-test compat-test config-test hashdump-test mergeinfo-test
        opt-test path-test stream-test string-test time-test utf-test
-       target-test error-test cache-test editor-test spillbuf-test
+       target-test error-test cache-test spillbuf-test
        revision-test
        subst_translate-test
        translate-test
@@ -1140,7 +1149,7 @@ libs = __ALL__
        diff-diff3-test
        ra-local-test
        svndiff-test vdelta-test
-       entries-dump atomic-ra-revprop-change wc-lock-tester
+       entries-dump atomic-ra-revprop-change wc-lock-tester wc-incomplete-tester
        diff diff3 diff4
        client-test
        tree-conflict-data-test db-test pristine-store-test entries-compat-test

Modified: subversion/branches/fs-py/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build/ac-macros/berkeley-db.m4?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/fs-py/build/ac-macros/berkeley-db.m4 Mon Dec 19 18:49:34 2011
@@ -65,11 +65,11 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
 
       if test "$withval" = "yes"; then
         if test "$apu_db_version" -lt "4"; then
-          AC_MSG_ERROR([APR-UTIL wasn't linked against Berkeley DB 4,
-                        while the fs component is required.  Reinstall
-                        APR-UTIL with the appropiate options.])
+          AC_MSG_ERROR([APR-UTIL was linked against Berkeley DB version $apu_db_version,
+                        while version 4 or higher is required.  Reinstall
+                        APR-UTIL with the appropriate options.])
         fi
-        
+
         bdb_status=required
 
       elif test "$apu_found" != "reconfig"; then

Modified: subversion/branches/fs-py/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build/ac-macros/sqlite.m4?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/fs-py/build/ac-macros/sqlite.m4 Mon Dec 19 18:49:34 2011
@@ -106,7 +106,7 @@ AC_DEFUN(SVN_SQLITE_PKG_CONFIG,
       sqlite_version=`$PKG_CONFIG $SQLITE_PKGNAME --modversion --silence-errors`
 
       if test -n "$sqlite_version"; then
-        SVN_SQLITE_VERNUM_PARSE
+        SVN_SQLITE_VERNUM_PARSE([$sqlite_version], [sqlite_ver_num])
 
         if test "$sqlite_ver_num" -ge "$sqlite_min_ver_num"; then
           AC_MSG_RESULT([$sqlite_version])
@@ -198,20 +198,22 @@ SQLITE_VERSION_OKAY
   fi
 ])
 
-dnl SVN_SQLITE_VERNUM_PARSE()
+dnl SVN_SQLITE_VERNUM_PARSE(version_string, result_var)
 dnl
-dnl Parse a x.y[.z] version string sqlite_version into a number sqlite_ver_num.
+dnl Parse a x.y[.z] version string version_string into a number result_var.
 AC_DEFUN(SVN_SQLITE_VERNUM_PARSE,
 [
-  sqlite_major=`expr $sqlite_version : '\([[0-9]]*\)'`
-  sqlite_minor=`expr $sqlite_version : '[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_micro=`expr $sqlite_version : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-  if test -z "$sqlite_micro"; then
-    sqlite_micro=0
+  version_string="$1"
+  
+  major=`expr $version_string : '\([[0-9]]*\)'`
+  minor=`expr $version_string : '[[0-9]]*\.\([[0-9]]*\)'`
+  micro=`expr $version_string : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+  if test -z "$micro"; then
+    micro=0
   fi
-  sqlite_ver_num=`expr $sqlite_major \* 1000000 \
-                    \+ $sqlite_minor \* 1000 \
-                    \+ $sqlite_micro`
+  $2=`expr $major \* 1000000 \
+        \+ $minor \* 1000 \
+        \+ $micro`
 ])
 
 dnl SVN_SQLITE_MIN_VERNUM_PARSE()
@@ -220,12 +222,7 @@ dnl Parse a x.y.z version string SQLITE_
 dnl sqlite_min_ver_num.
 AC_DEFUN(SVN_SQLITE_MIN_VERNUM_PARSE,
 [
-  sqlite_min_major=`expr $SQLITE_MINIMUM_VER : '\([[0-9]]*\)'`
-  sqlite_min_minor=`expr $SQLITE_MINIMUM_VER : '[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_min_micro=`expr $SQLITE_MINIMUM_VER : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-  sqlite_min_ver_num=`expr $sqlite_min_major \* 1000000 \
-                        \+ $sqlite_min_minor \* 1000 \
-                        \+ $sqlite_min_micro`
+  SVN_SQLITE_VERNUM_PARSE([$SQLITE_MINIMUM_VER], [sqlite_min_ver_num])
 ])
 
 dnl SVN_DOWNLOAD_SQLITE()

Modified: subversion/branches/fs-py/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build/generator/gen_win.py?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build/generator/gen_win.py (original)
+++ subversion/branches/fs-py/build/generator/gen_win.py Mon Dec 19 18:49:34 2011
@@ -834,7 +834,8 @@ class WinGeneratorBase(GeneratorBase):
 
     fakedefines = ["WIN32","_WINDOWS","alloca=_alloca",
                    "_CRT_SECURE_NO_DEPRECATE=",
-                   "_CRT_NONSTDC_NO_DEPRECATE="]
+                   "_CRT_NONSTDC_NO_DEPRECATE=",
+                   "_CRT_SECURE_NO_WARNINGS="]
 
     if self.sqlite_inline:
       fakedefines.append("SVN_SQLITE_INLINE")

Modified: subversion/branches/fs-py/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build/generator/templates/vcnet_vcproj.ezt?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/fs-py/build/generator/templates/vcnet_vcproj.ezt Mon Dec 19 18:49:34 2011
@@ -46,7 +46,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
 [end]				AdditionalIncludeDirectories="[for includes][includes][if-index includes last][else];[end][end]"
-				PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines][if-index configs.defines last][else];[end][end];_CRT_SECURE_NO_WARNINGS"
 [is configs.name "Debug"]				MinimalRebuild="TRUE"
 				RuntimeLibrary="3"
 				BasicRuntimeChecks="3"

Modified: subversion/branches/fs-py/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build/generator/templates/vcnet_vcxproj.ezt?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/fs-py/build/generator/templates/vcnet_vcxproj.ezt Mon Dec 19 18:49:34 2011
@@ -56,7 +56,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <StringPooling>true</StringPooling>
 [end]      <AdditionalIncludeDirectories>[for includes][includes];[end]%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][for configs.defines][configs.defines];[end]_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>[if-any instrument_apr_pools]APR_POOL_DEBUG=[instrument_apr_pools];[end][is platforms "x64"]WIN64;[end][for configs.defines][configs.defines];[end]%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <BrowseInformation>true</BrowseInformation>

Modified: subversion/branches/fs-py/build/getversion.py
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build/getversion.py?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build/getversion.py (original)
+++ subversion/branches/fs-py/build/getversion.py Mon Dec 19 18:49:34 2011
@@ -85,7 +85,7 @@ def sqlite_extractor(parser, include_fil
 
 extractors = {
   'SVN' : svn_extractor,
-  'SQLITE' : sqlite_extractor,
+  # 'SQLITE' : sqlite_extractor, # not used
   }
 
 def usage_and_exit(msg):

Modified: subversion/branches/fs-py/build/transform_sql.py
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build/transform_sql.py?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build/transform_sql.py (original)
+++ subversion/branches/fs-py/build/transform_sql.py Mon Dec 19 18:49:34 2011
@@ -129,7 +129,7 @@ class Processor(object):
         # got something besides whitespace. write it out. include some whitespace
         # to separate the SQL commands. and a backslash to continue the string
         # onto the next line.
-        self.output.write('  "%s " \\\n' % line)
+        self.output.write('  "%s " \\\n' % line.rstrip())
 
     # previous line had a continuation. end the madness.
     self.close_define()

Modified: subversion/branches/fs-py/build/win32/svn.rc
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/build/win32/svn.rc?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/build/win32/svn.rc (original)
+++ subversion/branches/fs-py/build/win32/svn.rc Mon Dec 19 18:49:34 2011
@@ -66,7 +66,7 @@ BEGIN
       VALUE "FileDescription", APR_STRINGIFY(SVN_FILE_DESCRIPTION) "\0"
       VALUE "FileVersion", SVN_VER_NUMBER "\0"
       VALUE "InternalName", "SVN\0"
-      VALUE "LegalCopyright", "Copyright (c) 2009 The Apache Software Foundation\0"
+      VALUE "LegalCopyright", "Copyright (c) 2011 The Apache Software Foundation\0"
       VALUE "OriginalFilename", APR_STRINGIFY(SVN_FILE_NAME) "\0"
       VALUE "ProductName", "Subversion\0"
       VALUE "ProductVersion", SVN_VERSION "\0"

Modified: subversion/branches/fs-py/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/configure.ac?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/configure.ac (original)
+++ subversion/branches/fs-py/configure.ac Mon Dec 19 18:49:34 2011
@@ -172,6 +172,18 @@ SQLITE_URL="http://www.sqlite.org/sqlite
 SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
                ${SQLITE_URL})
 
+AC_ARG_ENABLE(sqlite-compatibility-version,
+  AS_HELP_STRING([--enable-sqlite-compatibility-version=X.Y.Z],
+                 [Allow binary to run against SQLite as old as ARG]),
+  [sqlite_compat_ver=$enableval],[sqlite_compat_ver=no])
+
+if test -n "$sqlite_compat_ver" && test "$sqlite_compat_ver" != no; then
+  SVN_SQLITE_VERNUM_PARSE([$sqlite_compat_ver],
+                          [sqlite_compat_ver_num])
+  CFLAGS="-DSVN_SQLITE_MIN_VERSION='\"$sqlite_compat_ver\"' $CFLAGS"
+  CFLAGS="-DSVN_SQLITE_MIN_VERSION_NUMBER=$sqlite_compat_ver_num $CFLAGS"
+fi
+
 dnl Set up a number of directories ---------------------
 
 dnl Create SVN_BINDIR for proper substitution

Modified: subversion/branches/fs-py/contrib/client-side/emacs/dsvn.el
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/contrib/client-side/emacs/dsvn.el?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/branches/fs-py/contrib/client-side/emacs/dsvn.el Mon Dec 19 18:49:34 2011
@@ -130,12 +130,19 @@
   :type 'boolean
   :group 'dsvn)
 
+;; start-file-process and process-file are needed for tramp but only appeared
+;; in Emacs 23 and 22 respectively.
+(setq svn-start-file-process
+  (if (fboundp 'start-file-process) 'start-file-process 'start-process))
+(setq svn-process-file
+  (if (fboundp 'process-file) 'process-file 'call-process))
+
 (defun svn-call-process (program buffer &rest args)
   "Run svn and wait for it to finish.
 Argument PROGRAM is the svn binary to run.
 Argument BUFFER is the buffer in which to insert output.
 Optional argument ARGS are the arguments to svn."
-  (let ((proc (apply 'start-process "svn" buffer program args)))
+  (let ((proc (apply svn-start-file-process "svn" buffer program args)))
     (set-process-coding-system proc 'utf-8)
     (set-process-filter proc 'svn-output-filter)
     (while (eq (process-status proc) 'run)
@@ -161,7 +168,7 @@ Return non-NIL if there was any output."
       (setq buffer-read-only t)
       (let ((cmd `(,svn-program ,subcommand ,@args))
             proc)
-        (setq proc (apply 'start-process "svn" buf cmd))
+        (setq proc (apply svn-start-file-process "svn" buf cmd))
         (set-process-coding-system proc 'utf-8)
         (set-process-filter proc 'svn-output-filter)
         (while (eq (process-status proc) 'run)
@@ -184,7 +191,7 @@ Returns the buffer that holds the output
     (with-current-buffer buf
       (erase-buffer)
       (setq default-directory dir))
-    (apply 'call-process svn-program nil buf nil (symbol-name command) args)
+    (apply svn-process-file svn-program nil buf nil (symbol-name command) args)
     buf))
 
 (defun svn-run-for-stdout (command args)
@@ -192,7 +199,7 @@ Returns the buffer that holds the output
 Argument COMMAND is the svn subcommand to run.
 Optional argument ARGS is a list of arguments."
   (let ((output-buffer (generate-new-buffer "*svn-stdout*")))
-    (apply 'call-process svn-program nil (list output-buffer nil) nil
+    (apply svn-process-file svn-program nil (list output-buffer nil) nil
 	   (symbol-name command) args)
     (let ((stdout (with-current-buffer output-buffer (buffer-string))))
       (kill-buffer output-buffer)
@@ -255,7 +262,7 @@ buffer to describe what is going on."
             args (cons "-v" args)))
     (unless (memq command svn-noninteractive-blacklist)
       (setq args (cons "--non-interactive" args)))
-    (setq proc (apply 'start-process "svn" (current-buffer)
+    (setq proc (apply svn-start-file-process "svn" (current-buffer)
                       svn-program command-s args))
     (if (fboundp filter-func)
         (set-process-filter proc filter-func)
@@ -1154,7 +1161,8 @@ With prefix arg, prompt for REVISION."
     (?D . "Deleted")
     (?U . "Updated")
     (?G . "Merged")
-    (?C . "Conflict")))
+    (?C . "Conflict")
+    (?E . "Existed")))
 
 (defvar svn-merging nil)
 
@@ -1182,7 +1190,7 @@ With prefix arg, prompt for REVISION."
       (goto-char svn-output-marker)
       (while (not nomore)
         (cond ((looking-at
-                "\\([ ADUCG][ ADUCG][ B]\\)  \\(.*\\)\n")
+                "\\([ ADUCGE][ ADUCGE][ B]\\)  \\(.*\\)\n")
                (let* ((status (match-string 1))
                       (file-status (elt status 0))
                       (prop-status (elt status 1))

Modified: subversion/branches/fs-py/contrib/client-side/emacs/vc-svn.el
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/contrib/client-side/emacs/vc-svn.el?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/contrib/client-side/emacs/vc-svn.el (original)
+++ subversion/branches/fs-py/contrib/client-side/emacs/vc-svn.el Mon Dec 19 18:49:34 2011
@@ -3,18 +3,28 @@
 
 ;;; #########################################################################
 ;;; ##                                                                     ##
-;;; ##          NOTE: THIS IS NOT THE MASTER VERSION OF VC-SVN.EL          ##
+;;; ##                NOTE: THIS FILE IS ONLY FOR EMACS 21                 ##
 ;;; ##                                                                     ##
-;;; ## The canonical vc-svn.el now lives in the FSF Emacs tree, at         ##
-;;; ## http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/vc-svn.el. ##
-;;; ## The version here is maintained only because it is compatible with   ##
-;;; ## older releases of Emacs, since (as of this writing) the one in the  ##
-;;; ## FSF tree hasn't made it into an official release of Emacs yet.      ##
-;;; ## Eventually it will, though, and sometime after that the version     ##
-;;; ## here will go away.                                                  ##
+;;; ## Emacs 21 does not come with a working vc-mode for Subversion, and   ##
+;;; ## in particular, dsvn.el needs one. This file is provided for those   ##
+;;; ## who use that Emacs version.					   ##
 ;;; ##                                                                     ##
+;;; ## Emacs 22 and newer versions come with a Subversion-capable vc-mode  ##
+;;; ## and should not use this file.					   ##
+;;; ##									   ##
+;;; ## This file is a mild fork of vc-svn.el from the Emacs source tree.   ##
+;;; ## It may go away at some undetermined point in the future, when	   ##
+;;; ## support of Emacs 21 becomes completely irrelevant.		   ##
+;;; ## 									   ##
+;;; ## Maintenance of the vc-mode for Subversion should be done first and  ##
+;;; ## foremost in the Emacs tree, and changes done to this file only	   ##
+;;; ## when necessary.							   ##
+;;; ## 									   ##
 ;;; #########################################################################
 
+(if (> emacs-major-version 21)
+    (error "This file should only be used by Emacs versions 21 and earlier"))
+
 ;;; Writing this back end has shown up some problems in VC: bugs,
 ;;; shortcomings in the back end interface, and so on.  But I want to
 ;;; first produce code that Subversion users can use with an already

Modified: subversion/branches/fs-py/notes/editor-v2.txt
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/notes/editor-v2.txt?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/notes/editor-v2.txt (original)
+++ subversion/branches/fs-py/notes/editor-v2.txt Mon Dec 19 18:49:34 2011
@@ -1,3 +1,11 @@
+###
+###
+### THIS FILE IS HISTORICAL ONLY. FOR CURRENT INFORMATION, PLEASE SEE:
+###     include/svn_editor.h
+###
+###
+
+
 NOTES on a revamped editor interface
 
 -- all paths are relpaths

Modified: subversion/branches/fs-py/notes/knobs
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/notes/knobs?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/notes/knobs (original)
+++ subversion/branches/fs-py/notes/knobs Mon Dec 19 18:49:34 2011
@@ -44,6 +44,8 @@ SVN_MERGE__ALLOW_ALL_FORWARD_MERGES_FROM
 SVN_USE_WIN32_CRASHHANDLER
 SVN_DAV_SEND_VTXN_NAME
 SVN_DISABLE_PREFIX_SUFFIX_SCANNING
+SVN_SQLITE_MIN_VERSION_NUMBER
+SVN_SQLITE_MIN_VERSION
 
 2.3 Debugging Support
 
@@ -205,6 +207,24 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Default:   not defined
   Suggested: not defined
 
+4.8 SVN_SQLITE_MIN_VERSION_NUMBER
+
+  Scope:     libsvn_subr
+  Purpose:   The minimum SQLite version to have run-time support for.
+  Range:     SQLite version numbers, as packed integers
+  Default:   SQLITE_VERSION_NUMBER (i.e., the compile-time-sqlite version)
+  Suggested: not defined (to use default)
+
+4.9 SVN_SQLITE_MIN_VERSION
+
+  Scope:     libsvn_subr
+  Purpose:   See SVN_SQLITE_MIN_VERSION_NUMBER.  The two must be overridden
+             (or not overridden) together; defining one but leaving the other
+             at its default will cause undefined behaviour.
+  Range:     SQLite versions, as string literals
+  Default:   SQLITE_VERSION
+  Suggested: not defined (to use default)
+
 
 5 Defines controling debug support
 ==================================

Modified: subversion/branches/fs-py/notes/repos-dictated-config
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/notes/repos-dictated-config?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/notes/repos-dictated-config (original)
+++ subversion/branches/fs-py/notes/repos-dictated-config Mon Dec 19 18:49:34 2011
@@ -1,58 +1,2 @@
-Some thoughts on repository-dictated configuration
-
-Introduction
-============
-Many software development shops of non-trivial size desire to have an enforce
-a uniform configuration environment among the various clients which commit
-to their repositories.  Although these shops my have the ability to control
-the environment on the client machines (dictating software versions, etc),
-relying up on the client for setting various configuration parameters can
-be time-consuming and problematic.
-
-Subversion already provides the means of enforcing much (but not all) of this
-configuration through the hook script mechanism.  What our users desire is
-some way of having the server dictate a default or recommended configuration
-to clients.  The parameters of interest typically come from the standard
-client-side config: things like global-excludes or auto-props.  Allowing the
-administrator to store a default config on the server, which then gets pushed
-to the clients, would save both time and frustration.
-
-
-Behavioral specification
-========================
-The high-level behavior for repository-dictated configuration is relatively
-simple: the repository maintains a list of configuration parameters and
-values, and upon request, provides these to the client who then applies them
-appropriately.
-
-It should be noted that the configuration the server dictates is only a
-*suggestion* to the client.  Clients may choose to override the suggestion
-with a configuration of their own, so appropriate server-side enforcement
-(often via hook scripts) is still recommended.
-
-
-Server-client transmission mechanism
-====================================
-As part of the OPTIONS request, the client will send to the server the 
-sha1 hash of the version of the server-dictated config that it current has
-cached.  If the server has a different version, it will send that to the
-client in the OPTIONS response.
-
-
-Server-side storage
-===================
-[TODO]
-
-
-Client-side storage
-===================
-The client current maintains a global configuration file in
-~/.subversion/config  This feature will introduce the ~/.subversion/repos/
-directory, which will hold additional subdirectories keyed on the UUID of the
-repository.  It is in this subdirectory that the cached version of the
-repository configuration will be stored.
-
-
-Configuration Hierarchy
-=======================
-[TODO]
+[  The contents and further evolution of this document have been moved to  ]
+[  http://wiki.apache.org/subversion/ServerDictatedConfiguration           ]

Modified: subversion/branches/fs-py/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/bindings/javahl/native/CreateJ.cpp?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/fs-py/subversion/bindings/javahl/native/CreateJ.cpp Mon Dec 19 18:49:34 2011
@@ -533,11 +533,16 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
       || text_status == svn_wc_status_conflicted)
     text_status = status->text_status;
 
+  enum svn_wc_status_kind repos_text_status = status->repos_node_status;
+
+  if (repos_text_status == svn_wc_status_modified
+      || repos_text_status == svn_wc_status_conflicted)
+    repos_text_status = status->repos_text_status;
+
   jboolean jIsConflicted = (status->conflicted == 1) ? JNI_TRUE : JNI_FALSE;
   jobject jTextType = EnumMapper::mapStatusKind(text_status);
   jobject jPropType = EnumMapper::mapStatusKind(status->prop_status);
-  jobject jRepositoryTextType = EnumMapper::mapStatusKind(
-                                                  status->repos_text_status);
+  jobject jRepositoryTextType = EnumMapper::mapStatusKind(repos_text_status);
   jobject jRepositoryPropType = EnumMapper::mapStatusKind(
                                                   status->repos_prop_status);
   jboolean jIsCopied = (status->copied == 1) ? JNI_TRUE: JNI_FALSE;

Modified: subversion/branches/fs-py/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/branches/fs-py/subversion/bindings/javahl/native/SVNRepos.cpp Mon Dec 19 18:49:34 2011
@@ -678,7 +678,6 @@ jobject SVNRepos::lslocks(File &path, sv
 void SVNRepos::rmlocks(File &path, StringArray &locks)
 {
   SVN::Pool requestPool;
-  apr_pool_t *pool = requestPool.getPool();
   svn_repos_t *repos;
   svn_fs_t *fs;
   svn_fs_access_t *access;
@@ -700,10 +699,11 @@ void SVNRepos::rmlocks(File &path, Strin
     apr_uid_t uid;
     apr_gid_t gid;
     char *un;
-    if (apr_uid_current (&uid, &gid, pool) == APR_SUCCESS &&
-        apr_uid_name_get (&un, uid, pool) == APR_SUCCESS)
+    if (apr_uid_current (&uid, &gid, requestPool.getPool()) == APR_SUCCESS &&
+        apr_uid_name_get (&un, uid, requestPool.getPool()) == APR_SUCCESS)
       {
-        svn_error_t *err = svn_utf_cstring_to_utf8(&username, un, pool);
+        svn_error_t *err = svn_utf_cstring_to_utf8(&username, un,
+                                                   requestPool.getPool());
         svn_error_clear (err);
         if (err)
           username = "administrator";
@@ -711,7 +711,7 @@ void SVNRepos::rmlocks(File &path, Strin
   }
 
   /* Create an access context describing the current user. */
-  SVN_JNI_ERR(svn_fs_create_access(&access, username, pool), );
+  SVN_JNI_ERR(svn_fs_create_access(&access, username, requestPool.getPool()), );
 
   /* Attach the access context to the filesystem. */
   SVN_JNI_ERR(svn_fs_set_access(fs, access), );

Modified: subversion/branches/fs-py/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/fs-py/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Mon Dec 19 18:49:34 2011
@@ -324,10 +324,20 @@ public class SVNClient implements SVNCli
         implements org.apache.subversion.javahl.callback.UserPasswordCallback
     {
         PromptUserPassword oldPrompt;
+        PromptUserPassword2 oldPrompt2;
+        PromptUserPassword3 oldPrompt3;
 
         PromptUser1Wrapper(PromptUserPassword prompt)
         {
             oldPrompt = prompt;
+
+            /* This mirrors the insanity that was going on in the C++ layer
+               prior to 1.7.  Don't ask, just pray it works. */
+            if (prompt instanceof PromptUserPassword2)
+              oldPrompt2 = (PromptUserPassword2) prompt;
+
+            if (prompt instanceof PromptUserPassword3)
+              oldPrompt3 = (PromptUserPassword3) prompt;
         }
 
         public String getPassword()
@@ -359,7 +369,10 @@ public class SVNClient implements SVNCli
 
         public int askTrustSSLServer(String info, boolean allowPermanently)
         {
-            return askTrustSSLServer(info, allowPermanently);
+            if (oldPrompt2 != null)
+                return oldPrompt2.askTrustSSLServer(info, allowPermanently);
+            else
+                return 0;
         }
 
         public boolean userAllowedSave()
@@ -370,12 +383,19 @@ public class SVNClient implements SVNCli
         public String askQuestion(String realm, String question,
                                   boolean showAnswer, boolean maySave)
         {
-            return askQuestion(realm, question, showAnswer);
+            if (oldPrompt3 != null)
+                return oldPrompt3.askQuestion(realm, question, showAnswer,
+                                              maySave);
+            else
+                return askQuestion(realm, question, showAnswer);
         }
 
         public boolean prompt(String realm, String username, boolean maySave)
         {
-            return prompt(realm, username);
+            if (oldPrompt3 != null)
+                return oldPrompt3.prompt(realm, username, maySave);
+            else
+                return prompt(realm, username);
         }
     }
 

Modified: subversion/branches/fs-py/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/fs-py/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Mon Dec 19 18:49:34 2011
@@ -2737,7 +2737,7 @@ public class BasicTests extends SVNTests
             "## -0,0 +1 ##" + NL +
             "+Test property value." + NL;
 
-        setprop(aPath, "testprop", "Test property value.");
+        setprop(aPath, "testprop", "Test property value." + NL);
         client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, wcPath,
                     diffOutput.getPath(), Depth.infinity, null, true, true,
                     false, false);
@@ -2755,7 +2755,7 @@ public class BasicTests extends SVNTests
             "## -0,0 +1 ##" + NL +
             "+Test property value." + NL;
 
-        setprop(aPath, "testprop", "Test property value.");
+        setprop(aPath, "testprop", "Test property value." + NL);
         client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, aPath,
                     diffOutput.getPath(), Depth.infinity, null, true, true,
                     false, false);

Modified: subversion/branches/fs-py/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/fs-py/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Mon Dec 19 18:49:34 2011
@@ -2674,7 +2674,8 @@ public class BasicTests extends SVNTests
             "## -0,0 +1 ##" + NL +
             "+Test property value." + NL;
 
-        client.propertySet(aPath, "testprop", "Test property value.", false);
+        client.propertySet(aPath, "testprop", "Test property value." + NL,
+                           false);
         client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, wcPath,
                     diffOutput.getPath(), Depth.infinity, null, true, true,
                     false);
@@ -2692,7 +2693,8 @@ public class BasicTests extends SVNTests
             "## -0,0 +1 ##" + NL +
             "+Test property value." + NL;
 
-        client.propertySet(aPath, "testprop", "Test property value.", false);
+        client.propertySet(aPath, "testprop", "Test property value." + NL,
+                           false);
         client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, aPath,
                     diffOutput.getPath(), Depth.infinity, null, true, true,
                     false);

Modified: subversion/branches/fs-py/subversion/bindings/swig/svn_wc.i
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/bindings/swig/svn_wc.i?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/bindings/swig/svn_wc.i (original)
+++ subversion/branches/fs-py/subversion/bindings/swig/svn_wc.i Mon Dec 19 18:49:34 2011
@@ -45,6 +45,7 @@
 
 #ifdef SWIGRUBY
 %ignore svn_wc_external_item_create;
+%ignore svn_wc_external_item2_create;
 %ignore svn_wc_external_item_dup;
 %ignore svn_wc_external_item2_dup;
 %ignore svn_wc_revision_status;
@@ -268,11 +269,11 @@ svn_wc_swig_init_asp_dot_net_hack (apr_p
 {
   svn_wc_external_item2_t(apr_pool_t *pool) {
     svn_error_t *err;
-    const svn_wc_external_item2_t *self;
-    err = svn_wc_external_item_create(&self, pool);
+    svn_wc_external_item2_t *self;
+    err = svn_wc_external_item2_create(&self, pool);
     if (err)
       svn_swig_rb_handle_svn_error(err);
-    return (svn_wc_external_item2_t *)self;
+    return self;
   };
 
   ~svn_wc_external_item2_t() {

Propchange: subversion/branches/fs-py/subversion/include/private/svn_adler32.h
            ('svn:mergeinfo' removed)

Modified: subversion/branches/fs-py/subversion/include/private/svn_cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/include/private/svn_cache.h?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/include/private/svn_cache.h (original)
+++ subversion/branches/fs-py/subversion/include/private/svn_cache.h Mon Dec 19 18:49:34 2011
@@ -295,8 +295,9 @@ svn_cache__membuffer_cache_create(svn_me
  * svn_string_t; if @a serialize_func is NULL, then the data is
  * assumed to be an svn_stringbuf_t.
  *
- * These caches themselves are thread safe, the shared @a memcache may
- * be not, depending on its creation parameters.
+ * If @a thread_safe is true, and APR is compiled with threads, all
+ * accesses to the cache will be protected with a mutex, if the shared 
+ * @a memcache has also been created with thread_safe flag set.
  *
  * These caches do not support svn_cache__iter.
  */
@@ -307,6 +308,7 @@ svn_cache__create_membuffer_cache(svn_ca
                                   svn_cache__deserialize_func_t deserialize,
                                   apr_ssize_t klen,
                                   const char *prefix,
+                                  svn_boolean_t thread_safe,
                                   apr_pool_t *result_pool);
 
 /**

Modified: subversion/branches/fs-py/subversion/include/private/svn_client_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/include/private/svn_client_private.h?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/include/private/svn_client_private.h (original)
+++ subversion/branches/fs-py/subversion/include/private/svn_client_private.h Mon Dec 19 18:49:34 2011
@@ -59,6 +59,29 @@ svn_client__create_status(svn_client_sta
                           apr_pool_t *result_pool,
                           apr_pool_t *scratch_pool);
 
+/* Set *ANCESTOR_URL and *ANCESTOR_REVISION to the URL and revision,
+ * respectively, of the youngest common ancestor of the two locations
+ * PATH_OR_URL1@REV1 and PATH_OR_URL2@REV2.  Set *ANCESTOR_RELPATH to
+ * NULL and *ANCESTOR_REVISION to SVN_INVALID_REVNUM if they have no
+ * common ancestor.  This function assumes that PATH_OR_URL1@REV1 and
+ * PATH_OR_URL2@REV2 both refer to the same repository.
+ *
+ * Use the authentication baton cached in CTX to authenticate against
+ * the repository.
+ *
+ * See also svn_client__get_youngest_common_ancestor().
+ */
+svn_error_t *
+svn_client__youngest_common_ancestor(const char **ancestor_url,
+                                     svn_revnum_t *ancestor_rev,
+                                     const char *path_or_url1,
+                                     const svn_opt_revision_t *revision1,
+                                     const char *path_or_url2,
+                                     const svn_opt_revision_t *revision2,
+                                     svn_client_ctx_t *ctx,
+                                     apr_pool_t *result_pool,
+                                     apr_pool_t *scratch_pool);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/branches/fs-py/subversion/include/private/svn_debug.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/include/private/svn_debug.h?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/include/private/svn_debug.h (original)
+++ subversion/branches/fs-py/subversion/include/private/svn_debug.h Mon Dec 19 18:49:34 2011
@@ -37,13 +37,17 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* A couple helper functions for the macros below.  */
+/* A few helper functions for the macros below.  */
 void
 svn_dbg__preamble(const char *file, long line, FILE *output);
 void
 svn_dbg__printf(const char *fmt, ...)
   __attribute__((format(printf, 1, 2)));
-
+void
+svn_dbg__print_props(apr_hash_t *props,
+                     const char *header_fmt,
+                     ...)
+  __attribute__((format(printf, 2, 3)));
 
 /* Print to stdout. Edit this line if you need stderr.  */
 #define SVN_DBG_OUTPUT stdout
@@ -55,6 +59,7 @@ svn_dbg__printf(const char *fmt, ...)
 #ifdef SVN_DBG_QUIET
 
 #define SVN_DBG(ARGS) svn_dbg__preamble(__FILE__, __LINE__, NULL)
+#define SVN_DBG_PROPS(ARGS) svn_dbg__preamble(__FILE__, __LINE__, NULL)
 
 #else
 
@@ -77,6 +82,9 @@ svn_dbg__printf(const char *fmt, ...)
  */
 #define SVN_DBG(ARGS) (svn_dbg__preamble(__FILE__, __LINE__, SVN_DBG_OUTPUT), \
                        svn_dbg__printf ARGS)
+#define SVN_DBG_PROPS(ARGS) (svn_dbg__preamble(__FILE__, __LINE__, \
+                                               SVN_DBG_OUTPUT), \
+                             svn_dbg__print_props ARGS)
 
 #endif
 

Modified: subversion/branches/fs-py/subversion/include/private/svn_dep_compat.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/include/private/svn_dep_compat.h?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/branches/fs-py/subversion/include/private/svn_dep_compat.h Mon Dec 19 18:49:34 2011
@@ -107,6 +107,32 @@ typedef apr_uint32_t apr_uintptr_t;
 #endif /* SERF_VERSION_AT_LEAST */
 
 /**
+ * By default, if libsvn is built against one version of SQLite
+ * and then run using an older version, svn will error out:
+ *
+ *     svn: Couldn't perform atomic initialization
+ *     svn: SQLite compiled for 3.7.4, but running with 3.7.3
+ *
+ * That can be annoying when building on a modern system in order
+ * to deploy on a less modern one.  So these constants allow one
+ * to specify how old the system being deployed on might be.
+ * For example,
+ *
+ *     EXTRA_CFLAGS += -DSVN_SQLITE_MIN_VERSION_NUMBER=3007003
+ *     EXTRA_CFLAGS += '-DSVN_SQLITE_MIN_VERSION="3.7.3"'
+ *
+ * turns on code that works around infelicities in older versions
+ * as far back as 3.7.3 and relaxes the check at initialization time
+ * to permit them.
+ *
+ * @since New in 1.8.
+ */
+#ifndef SVN_SQLITE_MIN_VERSION_NUMBER
+#define SVN_SQLITE_MIN_VERSION_NUMBER SQLITE_VERSION_NUMBER
+#define SVN_SQLITE_MIN_VERSION SQLITE_VERSION
+#endif /* SVN_SQLITE_MIN_VERSION_NUMBER */
+
+/**
  * Check at compile time if the SQLite version is at least a certain
  * level.
  * @param major The major version component of the version checked
@@ -120,7 +146,7 @@ typedef apr_uint32_t apr_uintptr_t;
  */
 #ifndef SQLITE_VERSION_AT_LEAST
 #define SQLITE_VERSION_AT_LEAST(major,minor,patch)                     \
-((major*1000000 + minor*1000 + patch) <= SQLITE_VERSION_NUMBER)
+((major*1000000 + minor*1000 + patch) <= SVN_SQLITE_MIN_VERSION_NUMBER)
 #endif /* SQLITE_VERSION_AT_LEAST */
 
 #ifdef __cplusplus

Modified: subversion/branches/fs-py/subversion/include/private/svn_fspath.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/include/private/svn_fspath.h?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/include/private/svn_fspath.h (original)
+++ subversion/branches/fs-py/subversion/include/private/svn_fspath.h Mon Dec 19 18:49:34 2011
@@ -123,23 +123,6 @@ svn_boolean_t
 svn_fspath__is_root(const char *fspath,
                     apr_size_t len);
 
-/** Test if @a child_fspath is a child of @a parent_fspath.  If not, return
- * NULL.  If so, return the relpath which, if joined to @a parent_fspath,
- * would yield @a child_fspath.
- *
- * If @a child_fspath is the same as @a parent_fspath, it is not considered
- * a child, so the result is NULL; an empty string is never returned.
- *
- * If @a pool is NULL, a pointer into @a child_fspath will be returned to
- * identify the remainder fspath.
- *
- * @since New in 1.7.
- */
-const char *
-svn_fspath__is_child(const char *parent_fspath,
-                     const char *child_fspath,
-                     apr_pool_t *pool);
-
 /** Return the relative path part of @a child_fspath that is below
  * @a parent_fspath, or just "" if @a parent_fspath is equal to
  * @a child_fspath. If @a child_fspath is not below @a parent_fspath
@@ -151,15 +134,6 @@ const char *
 svn_fspath__skip_ancestor(const char *parent_fspath,
                           const char *child_fspath);
 
-/** Return TRUE if @a parent_fspath is an ancestor of @a child_fspath or
- * the fspaths are equal, and FALSE otherwise.
- *
- * @since New in 1.7.
- */
-svn_boolean_t
-svn_fspath__is_ancestor(const char *parent_fspath,
-                        const char *child_fspath);
-
 /** Return the longest common path shared by two fspaths, @a fspath1 and
  * @a fspath2.  If there's no common ancestor, return "/".
  *
@@ -179,9 +153,7 @@ svn_fspath__get_longest_ancestor(const c
 #define svn_urlpath__basename             svn_fspath__basename
 #define svn_urlpath__dirname              svn_fspath__dirname
 #define svn_urlpath__get_longest_ancestor svn_fspath__get_longest_ancestor
-#define svn_urlpath__is_ancestor          svn_fspath__is_ancestor
 #define svn_urlpath__is_canonical         svn_fspath__is_canonical
-#define svn_urlpath__is_child             svn_fspath__is_child
 #define svn_urlpath__is_root              svn_fspath__is_root
 #define svn_urlpath__join                 svn_fspath__join
 #define svn_urlpath__skip_ancestor        svn_fspath__skip_ancestor

Modified: subversion/branches/fs-py/subversion/include/private/svn_mergeinfo_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/include/private/svn_mergeinfo_private.h?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/include/private/svn_mergeinfo_private.h (original)
+++ subversion/branches/fs-py/subversion/include/private/svn_mergeinfo_private.h Mon Dec 19 18:49:34 2011
@@ -44,6 +44,18 @@ void
 svn_rangelist__set_inheritance(apr_array_header_t *rangelist,
                                svn_boolean_t inheritable);
 
+/* Parse a rangelist from the string STR. Set *RANGELIST to the result,
+ * allocated in RESULT_POOL. Return an error if the rangelist is not
+ * well-formed (for example, if it contains invalid characters or if
+ * R1 >= R2 in a "R1-R2" range element).
+ *
+ * Unlike svn_mergeinfo_parse(), this does not sort the ranges into order
+ * or combine adjacent and overlapping ranges. */
+svn_error_t *
+svn_rangelist__parse(apr_array_header_t **rangelist,
+                     const char *str,
+                     apr_pool_t *result_pool);
+
 /* Set inheritability of all rangelists in MERGEINFO to INHERITABLE.
    If MERGEINFO is NULL do nothing.  If a rangelist in MERGEINFO is
    NULL leave it alone. */
@@ -112,11 +124,25 @@ svn_mergeinfo__add_prefix_to_catalog(svn
                                      apr_pool_t *result_pool,
                                      apr_pool_t *scratch_pool);
 
-/* Set *OUT_MERGEINFO to a deep copy of MERGEINFO with the relpath
+/* Set *OUT_MERGEINFO to a shallow copy of MERGEINFO with each source path
+   converted to a (URI-encoded) URL based on REPOS_ROOT_URL. *OUT_MERGEINFO
+   is declared as 'apr_hash_t *' because its key do not obey the rules of
+   'svn_mergeinfo_t'.
+
+   Allocate *OUT_MERGEINFO and the new keys in RESULT_POOL.  Use
+   SCRATCH_POOL for any temporary allocations. */
+svn_error_t *
+svn_mergeinfo__relpaths_to_urls(apr_hash_t **out_mergeinfo,
+                                svn_mergeinfo_t mergeinfo,
+                                const char *repos_root_url,
+                                apr_pool_t *result_pool,
+                                apr_pool_t *scratch_pool);
+
+/* Set *OUT_MERGEINFO to a shallow copy of MERGEINFO with the relpath
    SUFFIX_RELPATH added to the end of each key path.
 
-   Allocate *OUT_MERGEINFO in RESULT_POOL.  Use SCRATCH_POOL for any
-   temporary allocations. */
+   Allocate *OUT_MERGEINFO and the new keys in RESULT_POOL.  Use
+   SCRATCH_POOL for any temporary allocations. */
 svn_error_t *
 svn_mergeinfo__add_suffix_to_mergeinfo(svn_mergeinfo_t *out_mergeinfo,
                                        svn_mergeinfo_t mergeinfo,
@@ -208,15 +234,6 @@ svn_boolean_t
 svn_mergeinfo__is_noninheritable(svn_mergeinfo_t mergeinfo,
                                  apr_pool_t *scratch_pool);
 
-/* If MERGEINFO_STR is a string representation of non-inheritable mergeinfo
-   set *IS_NONINHERITABLE to TRUE, set it to FALSE otherwise.  MERGEINFO_STR
-   may be NULL or empty.  If MERGEINFO_STR cannot be parsed return
-   SVN_ERR_MERGEINFO_PARSE_ERROR. */
-svn_error_t *
-svn_mergeinfo__string_has_noninheritable(svn_boolean_t *is_noninheritable,
-                                         const char *mergeinfo_str,
-                                         apr_pool_t *scratch_pool);
-
 /* Return a rangelist with one svn_merge_range_t * element defined by START,
    END, and INHERITABLE.  The rangelist and its contents are allocated in
    RESULT_POOL. */
@@ -254,8 +271,8 @@ svn_mergeinfo__mergeinfo_from_segments(s
 
 /* Merge every rangelist in MERGEINFO into the given MERGED_RANGELIST,
  * ignoring the source paths of MERGEINFO. MERGED_RANGELIST may
- * initially be empty. New elements added to @a rangelist are allocated in
- * @a result_pool. See svn_rangelist_merge2() for details of inheritability
+ * initially be empty. New elements added to RANGELIST are allocated in
+ * RESULT_POOL. See svn_rangelist_merge2() for details of inheritability
  * etc. */
 svn_error_t *
 svn_rangelist__merge_many(apr_array_header_t *merged_rangelist,

Modified: subversion/branches/fs-py/subversion/include/private/svn_mutex.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/include/private/svn_mutex.h?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/include/private/svn_mutex.h (original)
+++ subversion/branches/fs-py/subversion/include/private/svn_mutex.h Mon Dec 19 18:49:34 2011
@@ -42,8 +42,8 @@ extern "C" {
 #if APR_HAS_THREADS
 
 /** A mutex for synchronization between threads. It may be NULL, in
- * which case no synchronization will take place. The latter is useful,
- * if implement some functionality where synchronization is optional.
+ * which case no synchronization will take place. The latter is useful
+ * when implementing some functionality with optional synchronization.
  */
 typedef apr_thread_mutex_t svn_mutex__t;
 
@@ -55,17 +55,16 @@ typedef void svn_mutex__t;
 
 #endif
 
-/** Initialize the @a *mutex. If @a enable_mutex is TRUE, the mutex will
+/** Initialize the @a *mutex. If @a mutex_required is TRUE, the mutex will
  * actually be created with a lifetime defined by @a result_pool. Otherwise,
  * the pointer will be set to @c NULL and @ref svn_mutex__lock as well as
  * @ref svn_mutex__unlock will be no-ops.
  * 
- * If @a enable_mutex is set but threading is not supported by APR, this 
- * function returns an @c APR_ENOTIMPL error.
+ * If threading is not supported by APR, this function is a no-op.
  */
 svn_error_t *
 svn_mutex__init(svn_mutex__t **mutex,
-                svn_boolean_t enable_mutex,
+                svn_boolean_t mutex_required,
                 apr_pool_t *result_pool);
 
 /** Acquire the @a mutex, if that has been enabled in @ref svn_mutex__init.
@@ -111,7 +110,7 @@ do {                                    
   if (e) return svn_error_trace(e);       \
   e = svn_mutex__unlock(m, (expr));       \
   if (e) return svn_error_trace(e);       \
-} while (0);
+} while (0)
 
 #ifdef __cplusplus
 }

Modified: subversion/branches/fs-py/subversion/include/private/svn_opt_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/include/private/svn_opt_private.h?rev=1220893&r1=1220892&r2=1220893&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/include/private/svn_opt_private.h (original)
+++ subversion/branches/fs-py/subversion/include/private/svn_opt_private.h Mon Dec 19 18:49:34 2011
@@ -129,6 +129,26 @@ const char *
 svn_opt__revision_to_string(const svn_opt_revision_t *revision,
                             apr_pool_t *result_pool);
 
+/**
+ * Create a revision range structure from two revisions.  Return a new range
+ * allocated in @a result_pool with the start and end initialized to
+ * (deep copies of) @a *start_revision and @a *end_revision.
+ */
+svn_opt_revision_range_t *
+svn_opt__revision_range_create(const svn_opt_revision_t *start_revision,
+                               const svn_opt_revision_t *end_revision,
+                               apr_pool_t *result_pool);
+
+/**
+ * Create a revision range structure from two revnums.  Return a new range
+ * allocated in @a result_pool with the start and end kinds initialized to
+ * #svn_opt_revision_number and values @a start_revnum and @a end_revnum.
+ */
+svn_opt_revision_range_t *
+svn_opt__revision_range_from_revnums(svn_revnum_t start_revnum,
+                                     svn_revnum_t end_revnum,
+                                     apr_pool_t *result_pool);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */



Mime
View raw message