Woot! Great to see you coming back to these improvements!
On Nov 24, 2012 3:31 PM, <ashod_at_apache.org> wrote:
> Author: ashod
> Date: Sat Nov 24 20:29:11 2012
> New Revision: 1413258
>
> URL: http://svn.apache.org/viewvc?rev=1413258&view=rev
> Log:
> Catching up trunk at r1405190.
>
> Added:
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/ImportFilterCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/ImportFilterCallback.h
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_pseudo_md5.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/iprops.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra/deprecated.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/inherited_props.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/util_error.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/pseudo_md5.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db_update_move.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/reports/inherited-props.c
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stderr
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR1.noo/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR2.doo/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR2.doo/file1.txt
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR3.foo/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR3.foo/file2.txt
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR4.goo/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR4.goo/file3.txt
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR4.goo/file4.noo
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR5.moo/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR5.moo/file5.txt
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/DIR7/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/DIR7/DIR8.noo/
> (with props)
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/DIR7/file7.foo
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/file6.foo
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/iprop_authz_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/iprop_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/merge_automatic_tests.py
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/
> (with props)
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/cl.h
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/client_errors.h
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/help-cmd.c
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/main.c
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/notify.c
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/null-export-cmd.c
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/null-list-cmd.c
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/null-log-cmd.c
>
> subversion/branches/compressed-pristines/tools/client-side/svn-bench/util.c
>
> subversion/branches/compressed-pristines/tools/dev/benchmarks/suite1/generate_charts
>
> subversion/branches/compressed-pristines/tools/hook-scripts/persist-ephemeral-txnprops.py
> subversion/branches/compressed-pristines/tools/server-side/fsfs-reorg.c
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/irkerbridge.py
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/rc.d/svnpubsub.freebsd
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/rc.d/svnwcsub.freebsd
> Removed:
> subversion/branches/compressed-pristines/build/strip-po-charset.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/merge_symmetric_tests.py
> Modified:
> subversion/branches/compressed-pristines/CHANGES
> subversion/branches/compressed-pristines/COMMITTERS
> subversion/branches/compressed-pristines/Makefile.in
> subversion/branches/compressed-pristines/NOTICE
> subversion/branches/compressed-pristines/build.conf
> subversion/branches/compressed-pristines/build/ac-macros/apache.m4
> subversion/branches/compressed-pristines/build/ac-macros/berkeley-db.m4
> subversion/branches/compressed-pristines/build/ac-macros/macosx.m4
> subversion/branches/compressed-pristines/build/ac-macros/serf.m4
> subversion/branches/compressed-pristines/build/ac-macros/sqlite.m4
> subversion/branches/compressed-pristines/build/generator/gen_base.py
> subversion/branches/compressed-pristines/build/generator/gen_make.py
> subversion/branches/compressed-pristines/build/generator/gen_win.py
>
> subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt
>
> subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt
>
> subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcproj.ezt
>
> subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcxproj.ezt
> subversion/branches/compressed-pristines/build/run_tests.py
> subversion/branches/compressed-pristines/configure.ac
>
> subversion/branches/compressed-pristines/contrib/client-side/emacs/dsvn.el
>
> subversion/branches/compressed-pristines/contrib/server-side/fsfsfixer/fix-repo
>
> subversion/branches/compressed-pristines/notes/directory-index/dirindex.py
>
> subversion/branches/compressed-pristines/notes/directory-index/schema.sql
> subversion/branches/compressed-pristines/notes/fsfs
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/BlameCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/ChangelistCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/ClientContext.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/CommitCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/CommitMessage.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/InfoCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/InputStream.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/ListCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/LogMessageCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/OutputStream.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/PatchCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/Prompter.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/ProplistCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNClient.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNClient.h
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNRepos.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/SVNRepos.h
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/StatusCallback.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
>
> subversion/branches/compressed-pristines/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/core.i
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/include/svn_containers.swg
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/include/svn_types.swg
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/Client.pm
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/Core.pm
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/Fs.pm
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/
> Makefile.PL.in
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/Repos.pm
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/Wc.pm
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/0use.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/1repos.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/2fs.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/3client.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/4pool.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/5delta-compat.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/5delta.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/6ra.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/7editor.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/perl/native/t/8lock.t
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/python/svn/delta.py
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/python/tests/core.py
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/python/tests/pool.py
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/svn_delta.i
>
> subversion/branches/compressed-pristines/subversion/bindings/swig/svn_wc.i
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_cache.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_client_private.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_cmdline_private.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_dav_protocol.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_debug.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_dep_compat.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_eol_private.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_fs_util.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_log.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_mergeinfo_private.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_named_atomic.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_ra_private.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_skel.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_sqlite.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_string_private.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_subr_private.h
>
> subversion/branches/compressed-pristines/subversion/include/private/svn_wc_private.h
>
> subversion/branches/compressed-pristines/subversion/include/svn_client.h
>
> subversion/branches/compressed-pristines/subversion/include/svn_config.h
> subversion/branches/compressed-pristines/subversion/include/svn_dav.h
> subversion/branches/compressed-pristines/subversion/include/svn_delta.h
> subversion/branches/compressed-pristines/subversion/include/svn_diff.h
>
> subversion/branches/compressed-pristines/subversion/include/svn_error_codes.h
> subversion/branches/compressed-pristines/subversion/include/svn_fs.h
> subversion/branches/compressed-pristines/subversion/include/svn_io.h
>
> subversion/branches/compressed-pristines/subversion/include/svn_mergeinfo.h
> subversion/branches/compressed-pristines/subversion/include/svn_props.h
> subversion/branches/compressed-pristines/subversion/include/svn_ra.h
>
> subversion/branches/compressed-pristines/subversion/include/svn_ra_svn.h
> subversion/branches/compressed-pristines/subversion/include/svn_repos.h
>
> subversion/branches/compressed-pristines/subversion/include/svn_string.h
> subversion/branches/compressed-pristines/subversion/include/svn_types.h
>
> subversion/branches/compressed-pristines/subversion/include/svn_version.h
> subversion/branches/compressed-pristines/subversion/include/svn_wc.h
> subversion/branches/compressed-pristines/subversion/include/svn_xml.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
> subversion/branches/compressed-pristines/subversion/libsvn_client/add.c
> subversion/branches/compressed-pristines/subversion/libsvn_client/cat.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/cleanup.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/client.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/commit.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/commit_util.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/copy.c
> subversion/branches/compressed-pristines/subversion/libsvn_client/ctx.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/delete.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/deprecated.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/diff.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/externals.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/merge.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/mergeinfo.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/prop_commands.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/repos_diff.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/revisions.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/switch.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_client/update.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_delta/compat.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_delta/deprecated.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_delta/editor.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_delta/path_driver.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_delta/svndiff.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_delta/text_delta.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_diff/diff_file.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_diff/parse-diff.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs/fs-loader.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs/fs-loader.h
> subversion/branches/compressed-pristines/subversion/libsvn_fs_base/fs.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_base/tree.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/caching.c
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/dag.c
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/dag.h
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/fs.c
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/fs.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/fs_fs.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/fs_fs.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/rep-cache-db.sql
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/rep-cache.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/rep-cache.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/structure
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/temp_serializer.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/temp_serializer.h
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/tree.c
> subversion/branches/compressed-pristines/subversion/libsvn_fs_fs/tree.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_fs_util/fs-util.c
> subversion/branches/compressed-pristines/subversion/libsvn_ra/compat.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra/deprecated.c
> subversion/branches/compressed-pristines/subversion/libsvn_ra/editor.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra/ra_loader.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra/ra_loader.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_local/ra_plugin.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_local/split_url.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/commit.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/options.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/property.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/ra_serf.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/replay.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/sb_bucket.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/serf.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/update.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/util.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_serf/xml.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/client.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/cyrus_auth.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/editorp.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/marshal.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/protocol
>
> subversion/branches/compressed-pristines/subversion/libsvn_ra_svn/ra_svn.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/authz.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/commit.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/delta.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/deprecated.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/fs-wrap.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/hooks.c
> subversion/branches/compressed-pristines/subversion/libsvn_repos/log.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/replay.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/reporter.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/repos.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_repos/repos.h
> subversion/branches/compressed-pristines/subversion/libsvn_subr/auth.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/cache-membuffer.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/cache-memcache.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/cache_config.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/cmdline.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/config.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/config_file.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/deprecated.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/dirent_uri.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/eol.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/error.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/gpg_agent.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/io.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/log.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/mergeinfo.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/named_atomic.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/nls.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/opt.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/opt.h
> subversion/branches/compressed-pristines/subversion/libsvn_subr/path.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/simple_providers.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/skel.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/sqlite.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/string.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/subst.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/sysinfo.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/sysinfo.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/temp_serializer.c
> subversion/branches/compressed-pristines/subversion/libsvn_subr/utf.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/utf_validate.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/version.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_subr/win32_crypto.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/adm_files.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/adm_ops.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/cleanup.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/conflicts.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/conflicts.h
> subversion/branches/compressed-pristines/subversion/libsvn_wc/context.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/copy.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/deprecated.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/entries.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/entries.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/externals.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/info.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/lock.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/lock.h
> subversion/branches/compressed-pristines/subversion/libsvn_wc/node.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/old-and-busted.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/props.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/status.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/tree_conflicts.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/update_editor.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/upgrade.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/util.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc-metadata.sql
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc-queries.sql
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc.h
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db.c
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db_private.h
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db_util.c
>
> subversion/branches/compressed-pristines/subversion/libsvn_wc/wc_db_wcroot.c
>
> subversion/branches/compressed-pristines/subversion/mod_authz_svn/mod_authz_svn.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/activity.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/dav_svn.h
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/deadprops.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/liveprops.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/mod_dav_svn.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/posts/create_txn.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/reports/file-revs.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/reports/replay.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/reports/update.c
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/repos.c
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/util.c
>
> subversion/branches/compressed-pristines/subversion/mod_dav_svn/version.c
> subversion/branches/compressed-pristines/subversion/po/es.po
> subversion/branches/compressed-pristines/subversion/po/pl.po
> subversion/branches/compressed-pristines/subversion/po/pt_BR.po
> subversion/branches/compressed-pristines/subversion/po/zh_CN.po
> subversion/branches/compressed-pristines/subversion/po/zh_TW.po
> subversion/branches/compressed-pristines/subversion/svn/cl.h
>
> subversion/branches/compressed-pristines/subversion/svn/conflict-callbacks.c
> subversion/branches/compressed-pristines/subversion/svn/file-merge.c
> subversion/branches/compressed-pristines/subversion/svn/log-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/main.c
> subversion/branches/compressed-pristines/subversion/svn/merge-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/mergeinfo-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/move-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/notify.c
> subversion/branches/compressed-pristines/subversion/svn/propedit-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/propget-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/proplist-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/props.c
> subversion/branches/compressed-pristines/subversion/svn/resolve-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/status-cmd.c
> subversion/branches/compressed-pristines/subversion/svn/switch-cmd.c
>
> subversion/branches/compressed-pristines/subversion/svn/tree-conflicts.c
> subversion/branches/compressed-pristines/subversion/svn/update-cmd.c
>
> subversion/branches/compressed-pristines/subversion/svn_private_config.hw
> subversion/branches/compressed-pristines/subversion/svnadmin/main.c
>
> subversion/branches/compressed-pristines/subversion/svndumpfilter/main.c
> subversion/branches/compressed-pristines/subversion/svnlook/main.c
>
> subversion/branches/compressed-pristines/subversion/svnrdump/load_editor.c
> subversion/branches/compressed-pristines/subversion/svnrdump/svnrdump.c
>
> subversion/branches/compressed-pristines/subversion/svnserve/cyrus_auth.c
> subversion/branches/compressed-pristines/subversion/svnserve/main.c
> subversion/branches/compressed-pristines/subversion/svnserve/serve.c
> subversion/branches/compressed-pristines/subversion/svnserve/server.h
> subversion/branches/compressed-pristines/subversion/svnversion/main.c
>
> subversion/branches/compressed-pristines/subversion/svnversion/svnversion.1
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/autoprop_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/copy_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/export_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/externals_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/getopt_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/import_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/log_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/merge_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/merge_tree_conflict_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/mergeinfo_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/patch_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/prop_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/resolve_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/schedule_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/special_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/stat_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/svnadmin_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/svndumpfilter_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/svnlook_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/svntest/actions.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/svntest/main.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/tree_conflict_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/update_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/cmdline/upgrade_tests.py
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_fs/fs-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_repos/repos-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/auth-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/cache-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/checksum-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/compat-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/dirent_uri-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/named_atomic-test-proc.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/named_atomic-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_subr/string-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/conflict-data-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/db-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/entries-compat.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/op-depth-test.c
>
> subversion/branches/compressed-pristines/subversion/tests/libsvn_wc/utils.c
>
> subversion/branches/compressed-pristines/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
>
> subversion/branches/compressed-pristines/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
>
> subversion/branches/compressed-pristines/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
>
> subversion/branches/compressed-pristines/tools/dev/benchmarks/suite1/benchmark.py
>
> subversion/branches/compressed-pristines/tools/dev/benchmarks/suite1/cronjob
>
> subversion/branches/compressed-pristines/tools/dev/benchmarks/suite1/run
>
> subversion/branches/compressed-pristines/tools/dev/svnraisetreeconflict/main.c
>
> subversion/branches/compressed-pristines/tools/dev/unix-build/Makefile.svn
> subversion/branches/compressed-pristines/tools/dist/backport.pl
>
> subversion/branches/compressed-pristines/tools/dist/make-deps-tarball.sh
> subversion/branches/compressed-pristines/tools/dist/nightly.sh
> subversion/branches/compressed-pristines/tools/dist/release.py
>
> subversion/branches/compressed-pristines/tools/server-side/svnauthz-validate.c
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/README.txt
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/commit-hook.py
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/example.conf
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/rc.d/svnpubsub
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/rc.d/svnpubsub.debian
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/rc.d/svnwcsub
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/rc.d/svnwcsub.debian
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/rc.d/svnwcsub.solaris
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnpubsub/client.py
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnpubsub/server.py
>
> subversion/branches/compressed-pristines/tools/server-side/svnpubsub/svnwcsub.py
>
> Modified: subversion/branches/compressed-pristines/CHANGES
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/CHANGES?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/CHANGES (original)
> +++ subversion/branches/compressed-pristines/CHANGES Sat Nov 24 20:29:11
> 2012
> @@ -4,7 +4,7 @@ http://svn.apache.org/repos/asf/subversi
>
> User-visible changes:
> - General:
> - * remove extraneous externals output from 'svn status -q' (issue
> #1935)
> + *
>
> - Major new features:
> *
> @@ -12,6 +12,7 @@ http://svn.apache.org/repos/asf/subversi
> - Minor new features and improvements:
> * new 'svnadmin load --revision' load filtering support (issue #3734)
> * new 'commit --include-externals' option (related to issues #1167,
> #3563)
> + * remove extraneous externals output from 'svn status -q' (issue
> #1935)
> * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
> * reject some attempts to merge between unrelated branches (r1215273)
> * support GPG agent for password storage on UNIX-like platforms
> (r1150783)
> @@ -25,9 +26,14 @@ http://svn.apache.org/repos/asf/subversi
> * 'svn diff' can compare arbitrary files and directories (r1310291,
> et al)
> * ra_serf avoids re-downloading content present in pristine store
> (r1333936)
> * 'svn mergeinfo' now honors the --revision (-r) option (issue #4199)
> - * new --search and --isearch options for 'svn log' (r1354666, -830)
> + * 'svn mergeinfo' now shows a summary graph by default (issue #4239)
> + * new --search and --search-and options for 'svn log' (r1354666,
> -83518)
> * new built-in interactive text conflict merge tool (r1357864, et al)
> * new 'svn --version --verbose' option shows runtime environment info
> + * new 'svnadmin freeze' subcommand (r1376228)
> + * 'svndumpfilter' now supports --delta dumpfiles (r1351009, -3745)
> + * client version info now reported to commit hooks (issue #4124)
> + * 'svn merge' now uses reintegrate mode automatically when needed
>
> - Client-side bugfixes:
> *
> @@ -46,7 +52,46 @@ http://svn.apache.org/repos/asf/subversi
> * fix inconsistent handling of log revs without changed paths (issue
> #3694)
>
> - Bindings:
> - *
> + * star-imports in swig-py only import 'svn_*' symbols (r1303375)
> +
> +
> +Version 1.7.7
> +(09 Oct 2012, from /branches/1.7.x)
> +http://svn.apache.org/repos/asf/subversion/tags/1.7.7
> + User-visible changes
> + - Client- and server-side bugfixes:
> + * fix memory read bug (r137614)
> + * update Chinese translation
> +
> + - Client-side bugfixes:
> + * fix issues with applying Git patch files (r1374800, et al)
> + * fix status does not descend into dir externals after upgrade (issue
> #4016)
> + * fix file externals don't update with old mod_dav_svn (issue #4224)
> + * fix external diff tool duplicates Index: lines with 'svn diff'
> (r1380697)
> + * fix GNOME keyring library fails with very old glib (r1378847)
> + * fix unknown password stores in config file cause error (r1375052)
> + * fix assertions in ra_serf running against server root (r1365519, et
> al)
> + * fix ra_serf checkout/export aborts early on Windows (issue #4174)
> +
> + - Server-side bugfixes:
> + * fix an assert with SVNAutoVersioning in mod_dav_svn (issue #4231)
> + * fix unbounded memory use with SVNPathAuthz short_circuit (r1387943)
> + * fix svndumpfilter exclude --targets requires leading slash (issue
> #4234)
> + * fix connection ttl for memcache should be 50 seconds (r1391641)
> + * stabilize order of paths in dumpfiles with APR 1.4.6 (r1344864, et
> al)
> +
> + Developer-visible changes:
> + - General:
> + * print "All tests successful" at the end of 'make check' (r1375089)
> + * fix sandbox violation in a test (r1371282)
> + * fix tests fail when running within a format 30 WC (r1391188, et al)
> + * fix return value of svn_client_update4() incorrect (r1380295)
> + * fix make check summary missing test failures (r1390965)
> + * fix build does not fail when apache httpd is not available
> (r1374198)
> +
> + - Bindings:
> + * fix swig-pl build fails with swig 2.0.7 and newer. (r1389658)
> + * fix swig-py runtime problems with swig 2.0.5 and newer (r1351117)
>
>
> Version 1.7.6
> @@ -487,6 +532,20 @@ the 1.6 release: http://subversion.apac
> * fixed setting binary properties in JavaHL (issue #3770)
> * fix type mapping of svn_txdelta_window_t in python bindings (issue
> #3688)
>
> +Version 1.6.19
> +(10 Sep 2012, from /branches/1.6.x)
> +http://svn.apache.org/repos/asf/subversion/tags/1.6.19
> +
> + - Client-side bugfixes:
> + * handle missing svn:date reported by svnserve gracefully (r1306111)
> +
> + - Server-side bugfixes:
> + * fix possible server hang if a hook script fails to start (r1330410)
> + * fix write-through proxy commit regression introduced in 1.6.17
> (r1088602)
> + * partial sync drops properties when converting to adds (issue #4184)
> +
> + - Developer-visible changes:
> + * fix the testsuite to avoid FAILs on APR hash order (r1230714, et al)
>
> Version 1.6.18
> (29 Mar 2012, from /branches/1.6.x)
>
> Modified: subversion/branches/compressed-pristines/COMMITTERS
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/COMMITTERS?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/COMMITTERS [UTF-8] (original)
> +++ subversion/branches/compressed-pristines/COMMITTERS [UTF-8] Sat Nov 24
> 20:29:11 2012
> @@ -41,7 +41,7 @@ Blanket commit access:
> lgo Lieven Govaerts <lgo_at_mobsol.be>
> hwright Hyrum Wright <hyrum_at_hyrumwright.org>
> vgeorgescu Vlad Georgescu <vgeorgescu_at_gmail.com>
> - kameshj Kamesh Jayachandran <kamesh_at_collab.net>
> + kameshj Kamesh Jayachandran <kamesh.jayachandran_at_gmail.com>
> markphip Mark Phippard <mphippard_at_collab.net>
> arfrever Arfrever Frehtes Taifersar Arahesis <
> arfrever.fta_at_gmail.com>
> stsp Stefan Sperling <stsp_at_elego.de>
> @@ -55,7 +55,7 @@ Blanket commit access:
> jwhitlock Jeremy Whitlock <jcscoobyrs_at_gmail.com>
> sbutler Stephen Butler <sbutler_at_elego.de>
> dannas Daniel Näslund <dannas_at_dannas.name>
> - stefan2 Stefan Fuhrmann <stefanfuhrmann_at_alice-dsl.de>
> + stefan2 Stefan Fuhrmann <stefan.fuhrmann_at_wandisco.com>
> jcorvel Johan Corveleyn <jcorvel_at_gmail.com>
> trent Trent Nelson <trent_at_snakebite.org>
>
> @@ -82,6 +82,7 @@ Partial committers who have asked to be
> kon Kalle Olavi Niemitalo <kon_at_iki.fi> (psvn.el)
> rassilon Bill Tutt <bill_at_tutts.org> (Win32, COM, issue-1003-dev
> br.)
> pll Paul lussier <p.lussier_at_comcast.net> (releases)
> + rdonch Роман Донченко <dpb_at_corrigendum.ru>
> (Swig-Python b.)
>
>
> Commit access for specific areas:
> @@ -94,7 +95,6 @@ Commit access for specific areas:
> joeswatosh Joe Swatosh <joe.swatosh_at_gmail.com> (Swig-Ruby
> b.)
> jrvernooij Jelmer Vernooij <jelmer_at_samba.org> (Python
> bindings)
> sage Sage LaTorra <sagelt_at_gmail.com>
> (Ctypes-Python b.)
> - rdonch Роман Донченко <dpb_at_corrigendum.ru>
> (Swig-Python b.)
> vmpn Vladimir Berezniker <vmpn_at_hitechman.com> (JavaHL
> bindings)
>
> Packages:
>
> Modified: subversion/branches/compressed-pristines/Makefile.in
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/Makefile.in?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/Makefile.in (original)
> +++ subversion/branches/compressed-pristines/Makefile.in Sat Nov 24
> 20:29:11 2012
> @@ -250,6 +250,7 @@ INSTALL_INCLUDE = $(INSTALL) -m 644
> INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)"
> @MOD_ACTIVATION@
> INSTALL_DATA = $(INSTALL) -m 644
> INSTALL_LOCALE = $(INSTALL_DATA)
> +INSTALL_APACHE_MODS = @INSTALL_APACHE_MODS@
>
> ### this isn't correct yet
> INSTALL_SWIG_PY = $(INSTALL_LIB)
> @@ -280,6 +281,19 @@ INSTALL_EXTRA_SWIG_PY=\
> compileall.compile_dir("$(DESTDIR)$(swig_pydir_extra)", 1, \
> "$(swig_pydir_extra)");'
>
> +# export an env variable so that the tests can run without being installed
> +TEST_SHLIB_VAR_SWIG_PY=\
> + if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
> + for d in $(SWIG_PY_DIR)/libsvn_swig_py
> $(SWIG_PY_DIR)/../../../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;
> +
> # The path to generated and complementary source files for the SWIG
> # bindings.
> SWIG_PL_DIR = $(abs_builddir)/subversion/bindings/swig/perl
> @@ -310,6 +324,19 @@ INSTALL_EXTRA_SWIG_RB=\
> $(INSTALL_DATA) "$$i" $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
> done
>
> +# 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 \
> + 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;
> +
> APXS = @APXS@
>
> PYTHON = @PYTHON@
> @@ -790,6 +817,7 @@ copy-swig-py: autogen-swig-py $(SWIG_PY_
> swig-py: autogen-swig-py copy-swig-py
>
> check-swig-py: swig-py
> + $(TEST_SHLIB_VAR_SWIG_PY) \
> cd $(SWIG_PY_DIR); \
> $(PYTHON) $(SWIG_PY_SRC_DIR)/tests/run_all.py
>
> @@ -812,6 +840,7 @@ extraclean-swig-py: clean-swig-py
> swig-rb: autogen-swig-rb
>
> check-swig-rb: swig-rb svnserve
> + $(TEST_SHLIB_VAR_SWIG_RB) \
> cd $(SWIG_RB_DIR); \
> $(RUBY) -I $(SWIG_RB_SRC_DIR) \
> $(SWIG_RB_SRC_DIR)/test/run-test.rb \
>
> Modified: subversion/branches/compressed-pristines/NOTICE
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/NOTICE?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/NOTICE (original)
> +++ subversion/branches/compressed-pristines/NOTICE Sat Nov 24 20:29:11
> 2012
> @@ -16,3 +16,8 @@ see: build/install-sh
> This product includes software developed by Markus Kuhn under a permissive
> license, see LICENSE.
>
> +This software contains code derived from the RSA Data Security
> +Inc. MD5 Message-Digest Algorithm, including various
> +modifications by Spyglass Inc., Carnegie Mellon University, and
> +Bell Communications Research, Inc (Bellcore).
> +
>
> Modified: subversion/branches/compressed-pristines/build.conf
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build.conf?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build.conf (original)
> +++ subversion/branches/compressed-pristines/build.conf Sat Nov 24
> 20:29:11 2012
> @@ -64,9 +64,9 @@ test-scripts =
>
> bdb-test-scripts =
>
> -swig-python-opts = -python -classic
> -swig-perl-opts = -perl -nopm -noproxy
> -swig-ruby-opts = -ruby
> +swig-python-opts = $(CPPFLAGS) -python -classic
> +swig-perl-opts = $(CPPFLAGS) -perl -nopm -noproxy
> +swig-ruby-opts = $(CPPFLAGS) -ruby
> swig-languages = python perl ruby
> swig-dirs =
> subversion/bindings/swig/python
> @@ -83,6 +83,27 @@ swig-checkout-files = common.swg swigrun
> #
> # BUILD TARGETS
> #
> +# Target parameters:
> +# description - optional build target description
> +# type - the target type, defines how to build it
> +# when - the name of an autoconf-substed variable that
> muset be
> +# defined to either "true" or "false", that
> determines
> +# whether this target should be built and installed.
> +# path - relative path to target sources
> +# sources - explicit list of target sources
> +# install - the installation group/type
> +# manpages - the man pages associated with this target
> +# libs - libraries that this target depends on
> +# nonlibs - dependencies that are not linked into the target
> +# lang - bindings for language $(lang)
> +# msvc-libs - additional libraries to link with on Windows
> +# msvc-export - additional list of files to expose in
> dsp/vc(x)proj
> +# msvc-static - visual studio target produces only a static lib
> +# add-deps - expands to additional autoconf-defined
> dependencies
> +# add-install-deps - like add-deps, but for the install step
> +# external-lib - expands to additional autoconf-defined libs
> +# external-project - visual studio project to depend on
> +#
>
> # The subversion command-line client
> [svn]
> @@ -327,6 +348,7 @@ msvc-export = svn_wc.h private\svn_wc_pr
> # Subversion plugin for Apache's mod_dav
> [mod_dav_svn]
> description = Subversion plug-in for the Apache DAV module
> +when = INSTALL_APACHE_MODS
> type = apache-mod
> path = subversion/mod_dav_svn
> sources = *.c reports/*.c posts/*.c
> @@ -337,6 +359,7 @@ msvc-libs = mod_dav.lib libhttpd.lib
>
> [mod_authz_svn]
> description = Subversion path-based authorization module for Apache
> +when = INSTALL_APACHE_MODS
> type = apache-mod
> path = subversion/mod_authz_svn
> nonlibs = mod_dav_svn apr aprutil
> @@ -346,6 +369,7 @@ msvc-libs = libhttpd.lib
>
> [mod_dontdothat]
> description = Apache Httpd module to block certain kinds of Apache
> Subversion requests
> +when = INSTALL_APACHE_MODS
> type = apache-mod
> path = tools/server-side/mod_dontdothat
> nonlibs = mod_dav_svn apr aprutil
> @@ -1156,7 +1180,7 @@ libs = __ALL__
> ra-local-test
> svndiff-test vdelta-test
> entries-dump atomic-ra-revprop-change wc-lock-tester
> wc-incomplete-tester
> - diff diff3 diff4
> + diff diff3 diff4 fsfs-reorg svn-bench
> client-test
> conflict-data-test db-test pristine-store-test entries-compat-test
> op-depth-test dirent_uri-test wc-queries-test
> @@ -1205,6 +1229,13 @@ libs = __JAVAHL__ javahl-tests javahl-co
> #
> ----------------------------------------------------------------------------
> # Contrib and tools
>
> +[fsfs-reorg]
> +type = exe
> +path = tools/server-side
> +sources = fsfs-reorg.c
> +install = tools
> +libs = libsvn_delta libsvn_subr apr
> +
> [diff]
> type = exe
> path = tools/diff
> @@ -1226,6 +1257,13 @@ sources = diff4.c
> install = tools
> libs = libsvn_diff libsvn_subr apriconv apr
>
> +[svn-bench]
> +type = exe
> +path = tools/client-side/svn-bench
> +install = tools
> +libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr libsvn_delta
> + apriconv apr
> +
> [svnauthz-validate]
> description = Authz config file validator
> type = exe
>
> Modified:
> subversion/branches/compressed-pristines/build/ac-macros/apache.m4
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/ac-macros/apache.m4?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build/ac-macros/apache.m4
> (original)
> +++ subversion/branches/compressed-pristines/build/ac-macros/apache.m4 Sat
> Nov 24 20:29:11 2012
> @@ -128,6 +128,7 @@ AC_ARG_WITH(apache-libexecdir,
> APACHE_LIBEXECDIR="$withval"
> ])
>
> +INSTALL_APACHE_MODS=false
> if test -n "$APXS" && test "$APXS" != "no"; then
> APXS_CC="`$APXS -q CC`"
> APACHE_INCLUDES="$APACHE_INCLUDES -I$APXS_INCLUDE"
> @@ -140,6 +141,7 @@ if test -n "$APXS" && test "$APXS" != "n
>
> BUILD_APACHE_RULE=apache-mod
> INSTALL_APACHE_RULE=install-mods-shared
> + INSTALL_APACHE_MODS=true
>
> case $host in
> *-*-cygwin*)
> @@ -157,6 +159,7 @@ AC_SUBST(APXS)
> AC_SUBST(APACHE_LDFLAGS)
> AC_SUBST(APACHE_INCLUDES)
> AC_SUBST(APACHE_LIBEXECDIR)
> +AC_SUBST(INSTALL_APACHE_MODS)
>
> # there aren't any flags that interest us ...
> #if test -n "$APXS" && test "$APXS" != "no"; then
>
> Modified:
> subversion/branches/compressed-pristines/build/ac-macros/berkeley-db.m4
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/ac-macros/berkeley-db.m4?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> ---
> subversion/branches/compressed-pristines/build/ac-macros/berkeley-db.m4
> (original)
> +++
> subversion/branches/compressed-pristines/build/ac-macros/berkeley-db.m4 Sat
> Nov 24 20:29:11 2012
> @@ -175,13 +175,24 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB_TRY,
> svn_check_berkeley_db_minor=$2
> svn_check_berkeley_db_patch=$3
>
> - # Extract only the -ldb.* flag from the libs supplied by apu-config
> - # Otherwise we get bit by the fact that expat might not be built yet
> - # Or that it resides in a non-standard location which we would have
> - # to compensate with using something like -R`$apu_config
> --prefix`/lib.
> - #
> - if test -z "$SVN_DB_LIBS"; then
> - SVN_DB_LIBS=["`$apu_config --libs | $SED -e
> 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`"]
> + if test -z "$SVN_DB_LIBS"; then
> + # We pass --dbm-libs here since Debian has modified apu-config not
> + # to return -ldb unless --dbm-libs is passed. This may also produce
> + # extra output beyond -ldb but since we're only filtering for -ldb
> + # it won't matter to us. However, --dbm-libs was added to
> apu-config
> + # in 1.3.8 so it's possible the version we have doesn't support it
> + # so fallback without it if we get an error.
> + svn_db_libs_prefiltered=["`$apu_config --libs --dbm-libs`"]
> + if test $? -ne 0; then
> + svn_db_libs_prefiltered=["`$apu_config --libs`"]
> + fi
> +
> + # Extract only the -ldb.* flag from the libs supplied by apu-config
> + # Otherwise we get bit by the fact that expat might not be built yet
> + # Or that it resides in a non-standard location which we would have
> + # to compensate with using something like -R`$apu_config
> --prefix`/lib.
> + #
> + SVN_DB_LIBS=["`echo \"$svn_db_libs_prefiltered\" | $SED -e
> 's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`"]
> fi
>
> CPPFLAGS="$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES $CPPFLAGS"
>
> Modified:
> subversion/branches/compressed-pristines/build/ac-macros/macosx.m4
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/ac-macros/macosx.m4?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build/ac-macros/macosx.m4
> (original)
> +++ subversion/branches/compressed-pristines/build/ac-macros/macosx.m4 Sat
> Nov 24 20:29:11 2012
> @@ -19,6 +19,32 @@ dnl ====================================
> dnl
> dnl Mac OS X specific checks
>
> +dnl SVN_LIB_MACHO_ITERATE
> +dnl Check for _dyld_image_name and _dyld_image_header availability
> +AC_DEFUN(SVN_LIB_MACHO_ITERATE,
> +[
> + AC_MSG_CHECKING([for Mach-O dynamic module iteration functions])
> +
> + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
> + #include <mach-o/dyld.h>
> + #include <mach-o/loader.h>
> + int check(void) {
> + const struct mach_header *header = _dyld_get_image_header(0);
> + const char *name = _dyld_get_image_name(0);
> + if (name && header) return 1;
> + return 0;
> + }
> + ]],[[]])],[have_macho_iterate=yes],[have_macho_iterate=no])
> +
> + if test "$have_macho_iterate" = "yes"; then
> + AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1],
> + [Is Mach-O low-level _dyld API available?])
> + AC_MSG_RESULT([yes])
> + else
> + AC_MSG_RESULT([no])
> + fi
> +])
> +
> dnl SVN_LIB_MACOS_PLIST
> dnl Assign variables for Mac OS property list support
> AC_DEFUN(SVN_LIB_MACOS_PLIST,
>
> Modified: subversion/branches/compressed-pristines/build/ac-macros/serf.m4
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/ac-macros/serf.m4?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build/ac-macros/serf.m4
> (original)
> +++ subversion/branches/compressed-pristines/build/ac-macros/serf.m4 Sat
> Nov 24 20:29:11 2012
> @@ -19,50 +19,101 @@ dnl ====================================
> dnl
> dnl SVN_LIB_SERF(min_major_num, min_minor_num, min_micro_num)
> dnl
> -dnl Check configure options and assign variables related to
> -dnl the serf library.
> +dnl Search for a suitable version of serf. min_major_num,
> +dnl min_minor_num, and min_micro_num are used to determine
> +dnl if the serf library is at least that version.
> +dnl
> +dnl If a --with-serf option (no argument) or --with-serf=yes
> +dnl option is passed, then a search for serf on the system will be
> +dnl performed with pkg-config. If --with-serf=yes was actually passed
> +dnl then we error if we can't actually find serf.
> +dnl
> +dnl If a --with-serf=PREFIX option is passed search for a suitable
> +dnl serf installed on the system under that PREFIX. We will
> +dnl error if we can't find serf.
> +dnl
> +dnl If a --with-serf=no option is passed then no search will be
> +dnl conducted.
> +dnl
> +dnl If the search for serf fails, set svn_lib_serf to no, otherwise set
> +dnl it to yes.
> dnl
>
> AC_DEFUN(SVN_LIB_SERF,
> [
> serf_found=no
> + serf_required=no
> + serf_skip=no
>
> serf_check_major="$1"
> serf_check_minor="$2"
> serf_check_patch="$3"
> + serf_check_version="$1.$2.$3"
>
> AC_ARG_WITH(serf,AS_HELP_STRING([--with-serf=PREFIX],
> - [Serf HTTP client library]),
> + [Serf HTTP client library (enabled by
> default if found)]),
> [
> if test "$withval" = "yes" ; then
> - AC_MSG_ERROR([--with-serf requires an argument.])
> - elif test "$withval" != "no" ; then
> - AC_MSG_NOTICE([serf library configuration])
> - serf_prefix=$withval
> - for serf_major in serf-2 serf-1; do
> - if ! test -d $serf_prefix/include/$serf_major; then continue; fi
> - save_cppflags="$CPPFLAGS"
> - CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES
> -I$serf_prefix/include/$serf_major"
> - AC_CHECK_HEADERS(serf.h,[
> - save_ldflags="$LDFLAGS"
> - LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
> - AC_CHECK_LIB($serf_major, serf_context_create,[
> - AC_TRY_COMPILE([
> + serf_required=yes
> + elif test "$withval" = "no" ; then
> + serf_skip=yes
> + else
> + SVN_SERF_PREFIX_CONFIG()
> + fi
> + ])
> +
> + if test "$serf_skip" = "no" ; then
> + if test "$serf_found" = "no" ; then
> + SVN_SERF_PKG_CONFIG()
> + fi
> +
> + AC_MSG_CHECKING([was serf enabled])
> + if test "$serf_found" = "yes"; then
> + AC_MSG_RESULT([yes])
> + else
> + AC_MSG_RESULT([no])
> + SVN_DOWNLOAD_SERF()
> + if test "$serf_required" = "yes"; then
> + AC_MSG_ERROR([Serf was explicitly enabled but an appropriate
> version was not found.])
> + fi
> + fi
> + fi
> +
> + svn_lib_serf=$serf_found
> +
> + AC_SUBST(SVN_SERF_INCLUDES)
> + AC_SUBST(SVN_SERF_LIBS)
> +])
> +
> +dnl SVN_SERF_PREFIX_CONFIG()
> +dnl Use user provided prefix to try and detect and configure serf
> +AC_DEFUN(SVN_SERF_PREFIX_CONFIG,
> +[
> + AC_MSG_NOTICE([serf library configuration via prefix])
> + serf_required=yes
> + serf_prefix=$withval
> + for serf_major in serf-2 serf-1; do
> + if ! test -d $serf_prefix/include/$serf_major; then continue; fi
> + save_cppflags="$CPPFLAGS"
> + CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES
> -I$serf_prefix/include/$serf_major"
> + AC_CHECK_HEADERS(serf.h,[
> + save_ldflags="$LDFLAGS"
> + LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
> + AC_CHECK_LIB($serf_major, serf_context_create,[
> + AC_TRY_COMPILE([
> #include <stdlib.h>
> #include "serf.h"
> ],[
> #if ! SERF_VERSION_AT_LEAST($serf_check_major, $serf_check_minor,
> $serf_check_patch)
> -#error Serf version too old: need
> $serf_check_major.$serf_check_minor.$serf_check_patch
> +#error Serf version too old: need $serf_check_version
> #endif
> -], [serf_found=yes], [AC_MSG_WARN([Serf version too old: need
> $serf_check_major.$serf_check_minor.$serf_check_patch])
> - serf_found=no])], ,
> - $SVN_APRUTIL_LIBS $SVN_APR_LIBS -lz)
> - LDFLAGS="$save_ldflags"])
> - CPPFLAGS="$save_cppflags"
> - test $serf_found = yes && break
> - done
> - fi
> - ])
> +], [serf_found=yes], [AC_MSG_WARN([Serf version too old: need
> $serf_check_version])
> + serf_found=no])], ,
> + $SVN_APRUTIL_LIBS $SVN_APR_LIBS -lz)
> + LDFLAGS="$save_ldflags"])
> + CPPFLAGS="$save_cppflags"
> + test $serf_found = yes && break
> + done
>
> if test $serf_found = "yes"; then
> SVN_SERF_INCLUDES="-I$serf_prefix/include/$serf_major"
> @@ -73,9 +124,45 @@ AC_DEFUN(SVN_LIB_SERF,
> LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
> fi
> fi
> +])
>
> - svn_lib_serf=$serf_found
> +dnl SVN_SERF_PKG_CONFIG()
> +dnl Use pkg-config to try and detect and configure serf
> +AC_DEFUN(SVN_SERF_PKG_CONFIG,
> +[
> + AC_MSG_NOTICE([serf library configuration via pkg-config])
> + if test -n "$PKG_CONFIG"; then
> + for serf_major in serf-2 serf-1; do
> + AC_MSG_CHECKING([for $serf_major library])
> + if $PKG_CONFIG $serf_major --exists; then
> + AC_MSG_RESULT([yes])
> + AC_MSG_CHECKING([serf library version])
> + SERF_VERSION=`$PKG_CONFIG $serf_major --modversion`
> + AC_MSG_RESULT([$SERF_VERSION])
> + AC_MSG_CHECKING([serf version is suitable])
> + if $PKG_CONFIG $serf_major --atleast-version=$serf_check_version;
> then
> + AC_MSG_RESULT([yes])
> + serf_found=yes
> + SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_major --cflags | $SED -e
> 's/-D[^ ]*//g'`]
> + SVN_SERF_LIBS=`$PKG_CONFIG $serf_major --libs`
> + else
> + AC_MSG_RESULT([no])
> + AC_MSG_WARN([Serf version too old: need $serf_check_version])
> + fi
> + else
> + AC_MSG_RESULT([no])
> + fi
> + done
> + fi
> +])
>
> - AC_SUBST(SVN_SERF_INCLUDES)
> - AC_SUBST(SVN_SERF_LIBS)
> +dnl SVN_DOWNLOAD_SERF()
> +dnl no serf found, print out a message telling the user what to do
> +AC_DEFUN(SVN_DOWNLOAD_SERF,
> +[
> + echo ""
> + echo "An appropriate version of serf could not be found, so
> libsvn_ra_serf"
> + echo "will not be built. If you want to build libsvn_ra_serf, please"
> + echo "install serf $serf_check_version or newer."
> + echo ""
> ])
>
> Modified:
> subversion/branches/compressed-pristines/build/ac-macros/sqlite.m4
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/ac-macros/sqlite.m4?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build/ac-macros/sqlite.m4
> (original)
> +++ subversion/branches/compressed-pristines/build/ac-macros/sqlite.m4 Sat
> Nov 24 20:29:11 2012
> @@ -189,10 +189,15 @@ AC_DEFUN(SVN_SQLITE_FILE_CONFIG,
> SQLITE_VERSION_OKAY
> #endif],
> [AC_MSG_RESULT([amalgamation found and is okay])
> + _SVN_SQLITE_DSO_LIBS
> AC_DEFINE(SVN_SQLITE_INLINE, 1,
> [Defined if svn should use the amalgamated version of
> sqlite])
> SVN_SQLITE_INCLUDES="-I`dirname $sqlite_amalg`"
> - SVN_SQLITE_LIBS="-ldl -lpthread"
> + if test -n "$svn_sqlite_dso_ldflags"; then
> + SVN_SQLITE_LIBS="$svn_sqlite_dso_ldflags -lpthread"
> + else
> + SVN_SQLITE_LIBS="-lpthread"
> + fi
> svn_lib_sqlite="yes"],
> [AC_MSG_RESULT([unsupported amalgamation SQLite
> version])])
> fi
> @@ -244,3 +249,50 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
> echo ""
> AC_MSG_ERROR([Subversion requires SQLite])
> ])
> +
> +dnl _SVN_SQLITE_DSO_LIBS() dnl Find additional libraries that the
> +dnl sqlite amalgamation code should link in order to load
> +dnl shared libraries. Copied from build/libtool.m4
> +AC_DEFUN(_SVN_SQLITE_DSO_LIBS,
> +[
> + case $host_os in
> + beos* | mingw* | pw32* | cegcc* | cygwin*)
> + svn_sqlite_dso_ldflags=
> + ;;
> +
> + darwin*)
> + # if libdl is installed we need to link against it
> + AC_CHECK_LIB([dl], [dlopen],
> + [lt_cv_dlopen="dlopen" svn_sqlite_dso_ldflags="-ldl"],[
> + svn_sqlite_dso_ldflags=
> + ])
> + ;;
> +
> + *)
> + AC_CHECK_FUNC([shl_load],
> + [svn_sqlite_dso_ldflags=],
> + [AC_CHECK_LIB([dld], [shl_load],
> + [svn_sqlite_dso_ldflags="-ldld"],
> + [AC_CHECK_FUNC([dlopen],
> + [svn_sqlite_dso_ldflags=],
> + [AC_CHECK_LIB([dl], [dlopen],
> + [svn_sqlite_dso_ldflags="-ldl"],
> + [AC_CHECK_LIB([svld], [dlopen],
> + [svn_sqlite_dso_ldflags="-lsvld"],
> + [AC_CHECK_LIB([dld], [dld_link],
> + [svn_sqlite_dso_ldflags="-ldld"])
> + ])
> + ])
> + ])
> + ])
> + ])
> + ;;
> + esac
> +
> + AC_MSG_CHECKING([additional libraries for sqlite])
> + if test -n "$svn_sqlite_dso_ldflags"; then
> + AC_MSG_RESULT(${svn_sqlite_dso_ldflags})
> + else
> + AC_MSG_RESULT(none)
> + fi
> +])
>
> Modified:
> subversion/branches/compressed-pristines/build/generator/gen_base.py
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/gen_base.py?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build/generator/gen_base.py
> (original)
> +++ subversion/branches/compressed-pristines/build/generator/gen_base.py
> Sat Nov 24 20:29:11 2012
> @@ -300,15 +300,16 @@ for _dt in dep_types:
> globals()[_dt] = _dt
>
> class DependencyNode:
> - def __init__(self, filename):
> + def __init__(self, filename, when = None):
> self.filename = filename
> + self.when = when
>
> def __str__(self):
> return self.filename
>
> class ObjectFile(DependencyNode):
> - def __init__(self, filename, compile_cmd = None):
> - DependencyNode.__init__(self, filename)
> + def __init__(self, filename, compile_cmd = None, when = None):
> + DependencyNode.__init__(self, filename, when)
> self.compile_cmd = compile_cmd
> self.source_generated = 0
>
> @@ -362,6 +363,7 @@ class Target(DependencyNode):
> self.name = name
> self.gen_obj = gen_obj
> self.desc = options.get('description')
> + self.when = options.get('when')
> self.path = options.get('path', '')
> self.add_deps = options.get('add-deps', '')
> self.add_install_deps = options.get('add-install-deps', '')
> @@ -434,7 +436,7 @@ class TargetLinked(Target):
> else:
> raise GenError('ERROR: unknown file extension on ' + src)
>
> - ofile = ObjectFile(objname, self.compile_cmd)
> + ofile = ObjectFile(objname, self.compile_cmd, self.when)
>
> # object depends upon source
> self.gen_obj.graph.add(DT_OBJECT, ofile, SourceFile(src,
> reldir))
> @@ -554,7 +556,7 @@ class TargetI18N(Target):
> else:
> raise GenError('ERROR: unknown file extension on ' + src)
>
> - ofile = ObjectFile(objname, self.compile_cmd)
> + ofile = ObjectFile(objname, self.compile_cmd, self.when)
>
> # object depends upon source
> self.gen_obj.graph.add(DT_OBJECT, ofile, SourceFile(src, reldir))
> @@ -699,7 +701,8 @@ class TargetJavaHeaders(TargetJava):
> class_pkg_list = self.package.split('.')
> class_pkg = build_path_join(*class_pkg_list)
> class_file = ObjectFile(build_path_join(self.classes, class_pkg,
> - class_name + self.objext))
> + class_name + self.objext),
> + self.when)
> class_file.source_generated = 1
> class_file.class_name = class_name
> hfile = HeaderFile(class_header, self.package + '.' + class_name,
> @@ -759,7 +762,7 @@ class TargetJavaClasses(TargetJava):
> else:
> raise GenError('ERROR: unknown file extension on "' + src + '"')
>
> - ofile = ObjectFile(objname, self.compile_cmd)
> + ofile = ObjectFile(objname, self.compile_cmd, self.when)
> sfile = SourceFile(src, reldir)
> sfile.sourcepath = sourcepath
>
> @@ -1126,6 +1129,10 @@ class IncludeDependencyInfo:
> # of <>/"" convention.
> return hdrs
>
> +class FileInfo:
> + def __init__(self, filename, when):
> + self.filename = filename
> + self.when = when
>
> def _sorted_files(graph, area):
> "Given a list of targets, sort them based on their dependencies."
> @@ -1163,9 +1170,9 @@ def _sorted_files(graph, area):
> s = graph.get_sources(DT_LINK, t.name)
> for d in s:
> if d not in targets:
> - files.append(d.filename)
> + files.append(FileInfo(d.filename, d.when))
> else:
> - files.append(t.filename)
> + files.append(FileInfo(t.filename, t.when))
>
> # don't consider this target any more
> targets.remove(t)
>
> Modified:
> subversion/branches/compressed-pristines/build/generator/gen_make.py
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/gen_make.py?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build/generator/gen_make.py
> (original)
> +++ subversion/branches/compressed-pristines/build/generator/gen_make.py
> Sat Nov 24 20:29:11 2012
> @@ -289,6 +289,7 @@ class Generator(gen_base.GeneratorBase):
> add_deps=target_ob.add_deps,
> objects=objects,
> deps=deps,
> + when=target_ob.when,
> )
> data.target.append(ezt_target)
>
> @@ -375,11 +376,11 @@ class Generator(gen_base.GeneratorBase):
>
> def apache_file_to_eztdata(file):
> # cd to dirname before install to work around libtool 1.4.2 bug.
> - dirname, fname = build_path_splitfile(file)
> + dirname, fname = build_path_splitfile(file.filename)
> base, ext = os.path.splitext(fname)
> name = base.replace('mod_', '')
> - return _eztdata(fullname=file, dirname=dirname,
> - name=name, filename=fname)
> + return _eztdata(fullname=file.filename, dirname=dirname,
> + name=name, filename=fname, when=file.when)
> if area == 'apache-mod':
> data.areas.append(ezt_area)
>
> @@ -396,7 +397,8 @@ class Generator(gen_base.GeneratorBase):
>
> # ### TODO: This is a hack. See discussion here:
> # ### http://mid.gmane.org/20120316191639.GA28451@daniel3.local
> - apache_files = [t.filename for t in inst_targets
> + apache_files = [gen_base.FileInfo(t.filename, t.when)
> + for t in inst_targets
> if isinstance(t, gen_base.TargetApacheMod)]
>
> files = [f for f in files if f not in apache_files]
> @@ -404,9 +406,9 @@ class Generator(gen_base.GeneratorBase):
> ezt_area.apache_files.append(apache_file_to_eztdata(file))
> for file in files:
> # cd to dirname before install to work around libtool 1.4.2 bug.
> - dirname, fname = build_path_splitfile(file)
> - ezt_file = _eztdata(dirname=dirname, fullname=file,
> - filename=fname)
> + dirname, fname = build_path_splitfile(file.filename)
> + ezt_file = _eztdata(dirname=dirname, fullname=file.filename,
> + filename=fname, when=file.when)
> if area == 'locale':
> lang, objext = os.path.splitext(fname)
> installdir = '$(DESTDIR)$(%sdir)/%s/LC_MESSAGES' % (area_var,
> lang)
> @@ -456,6 +458,7 @@ class Generator(gen_base.GeneratorBase):
>
> for objname, sources in obj_deps:
> dep = _eztdata(name=str(objname),
> + when=objname.when,
> deps=list(map(str, sources)),
> cmd=objname.compile_cmd,
> source=str(sources[0]))
>
> Modified:
> subversion/branches/compressed-pristines/build/generator/gen_win.py
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/gen_win.py?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build/generator/gen_win.py
> (original)
> +++ subversion/branches/compressed-pristines/build/generator/gen_win.py
> Sat Nov 24 20:29:11 2012
> @@ -1615,7 +1615,6 @@ class POFile:
> "Item class for holding po file info"
> def __init__(self, base):
> self.po = base + '.po'
> - self.spo = base + '.spo'
> self.mo = base + '.mo'
>
> # MSVC paths always use backslashes regardless of current platform
>
> Modified:
> subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> ---
> subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt
> (original)
> +++
> subversion/branches/compressed-pristines/build/generator/templates/build_locale.ezt
> Sat Nov 24 20:29:11 2012
> @@ -22,11 +22,8 @@ cd ..\..\..\subversion\po
> mkdir ..\..\%1\mo
> set exitcode=0
> [for pofiles]echo Running msgfmt on [pofiles.po]...
> -python ..\..\build\strip-po-charset.py [pofiles.po] [pofiles.spo]
> +msgfmt.exe -c -o ..\..\%1\mo\[pofiles.mo] [pofiles.po]
> if errorlevel 1 goto err
> -msgfmt.exe -c -o ..\..\%1\mo\[pofiles.mo] [pofiles.spo]
> -if errorlevel 1 goto err
> -del [pofiles.spo]
> [end]
> goto end
> @rem
> **************************************************************************
>
> Modified:
> subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> ---
> subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt
> (original)
> +++
> subversion/branches/compressed-pristines/build/generator/templates/makefile.ezt
> Sat Nov 24 20:29:11 2012
> @@ -112,7 +112,7 @@ $([target.varname]_OBJECTS): $([target.v
> [else][target.varname]_DEPS = [target.add_deps][for target.objects]
> [target.objects][end][for target.deps] [target.deps][end]
> [target.varname]_OBJECTS =[for target.objnames] [target.objnames][end]
> [target.filename]: $([target.varname]_DEPS)
> - cd [target.path] && [target.link_cmd] $([target.varname]_LDFLAGS)
> -o [target.basename] [target.undefined_flag]
> $([target.varname]_OBJECTS)[for target.libs] [target.libs][end] $(LIBS)
> + [if-any target.when]if $([target.when]) ; then [else][end]cd
> [target.path] && [target.link_cmd] $([target.varname]_LDFLAGS) -o
> [target.basename] [target.undefined_flag] $([target.varname]_OBJECTS)[for
> target.libs] [target.libs][end] $(LIBS)[if-any target.when] ; else echo
> "fake" > [target.filename] ; fi[else][end]
> [end][end][end]
>
> ########################################
> @@ -127,13 +127,13 @@ $([target.varname]_OBJECTS): $([target.v
> ########################################
> [for areas]
> [is areas.type "apache-mod"]install-mods-shared:[for areas.files]
> [areas.files.fullname][end][for areas.files]
> - cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ;
> $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
> + [if-any areas.files.when]if $([areas.files.when]) ; then
> [else][end]cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ;
> $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any
> areas.files.when] ; fi[else][end][end]
> [else]install-[areas.type]: [for areas.files][if-index areas.files
> first][else] [end][areas.files.fullname][end] [for areas.apache_files]
> [areas.apache_files.fullname][end]
> $(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is
> areas.type "locale"]
> $(MKDIR) [areas.files.installdir]
> - cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar])
> [areas.files.filename]
> [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
> - cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar])
> [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for
> areas.apache_files]
> - cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)"
> ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name]
> [areas.apache_files.filename][end]
> + [if-any areas.files.when]if $([areas.files.when]) ; then
> [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar])
> [areas.files.filename]
> [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][if-any
> areas.files.when] ; fi[else][end][else]
> + [if-any areas.files.when]if $([areas.files.when]) ; then
> [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar])
> [areas.files.filename] $(DESTDIR)[areas.files.install_fname][if-any
> areas.files.when] ; fi[else][end][end][end][for areas.apache_files]
> + [if-any areas.apache_files.when]if $([areas.apache_files.when]) ;
> then [else][end]cd [areas.apache_files.dirname] ; $(MKDIR)
> "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name]
> [areas.apache_files.filename][if-any areas.apache_files.when] ;
> fi[else][end][end]
> [if-any areas.extra_install] $(INSTALL_EXTRA_[areas.uppervar])
> [end][end][end]
>
> @@ -156,5 +156,5 @@ install-include:[for includes] [includes
> ########################################
> [for deps]
> [deps.name]:[for deps.deps] [deps.deps][end][if-any deps.cmd]
> - [deps.cmd] [if-any
> deps.generated][else]$(canonicalized_srcdir)[end][deps.source][end]
> + [if-any deps.when]if $([deps.when]) ; then [else][end][deps.cmd]
> [if-any
> deps.generated][else]$(canonicalized_srcdir)[end][deps.source][end][if-any
> deps.when] ; else echo "fake" > [deps.name] ; fi[else][end]
> [end]
>
> Modified:
> subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcproj.ezt
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcproj.ezt?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> ---
> subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcproj.ezt
> (original)
> +++
> subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcproj.ezt
> Sat Nov 24 20:29:11 2012
> @@ -31,9 +31,9 @@
> <Configurations>
> [for platforms][for configs] <Configuration
> Name="[configs]|[platforms]"
> - OutputDirectory="..\..\[configs]\mo"
> + OutputDirectory="..\..\..\[configs]\mo"
>
> BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
> - IntermediateDirectory="..\..\[configs]\mo"
> + IntermediateDirectory="..\..\..\[configs]\mo"
> ConfigurationType="0"
> UseOfMFC="0"
> ATLMinimizesCRunTimeLibraryUsage="FALSE">
>
> Modified:
> subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcxproj.ezt
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcxproj.ezt?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> ---
> subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcxproj.ezt
> (original)
> +++
> subversion/branches/compressed-pristines/build/generator/templates/svn_locale.vcxproj.ezt
> Sat Nov 24 20:29:11 2012
> @@ -32,7 +32,7 @@
> </PropertyGroup>
> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
> [for platforms][for configs] <PropertyGroup
> Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'"
> Label="Configuration">
> - <ConfigurationType>Utility</ConfigurationType>
> + <ConfigurationType>Makefile</ConfigurationType>
> <CLRSupport>false</CLRSupport>
> <PlatformToolset>[toolset_version]</PlatformToolset>
> </PropertyGroup>
> @@ -44,8 +44,8 @@
> </ImportGroup>
> [end][end] <PropertyGroup Label="UserMacros" />
> <PropertyGroup>
> -[for configs][for platforms] <OutDir
> Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\[configs]\mo\</OutDir>
> - <IntDir
> Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\[configs]\mo\</IntDir>
> +[for configs][for platforms] <OutDir
> Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\..\[configs]\mo\</OutDir>
> + <IntDir
> Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">..\..\..\[configs]\mo\</IntDir>
> <NMakeBuildCommandLine
> Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
> build_locale.bat [configs]</NMakeBuildCommandLine>
> <NMakeReBuildCommandLine
> Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
> build_locale.bat [configs]</NMakeReBuildCommandLine>
> <NMakeCleanCommandLine
> Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'">cmd /c
> del $(OutDir)*.mo</NMakeCleanCommandLine>
>
> Modified: subversion/branches/compressed-pristines/build/run_tests.py
> URL:
> http://svn.apache.org/viewvc/subversion/branches/compressed-pristines/build/run_tests.py?rev=1413258&r1=1413257&r2=1413258&view=diff
>
> ==============================================================================
> --- subversion/branches/compressed-pristines/build/run_tests.py (original)
> +++ subversion/branches/compressed-pristines/build/run_tests.py Sat Nov 24
> 20:29:11 2012
> @@ -45,7 +45,7 @@ separated list of test numbers; the defa
> # A few useful constants
> SVN_VER_MINOR = 8
>
> -import os, re, subprocess, sys, imp
> +import os, re, subprocess, sys, imp, threading
> from datetime import datetime
>
> import getopt
> @@ -317,6 +317,12 @@ class TestHarness:
> print("WARNING: no failures, but '%s' exists from a previous run."
> % self.faillogfile)
>
> + # Summary.
> + if failed or xpassed or failed_list:
> + print("SUMMARY: Some tests failed.\n")
> + else:
> + print("SUMMARY: All tests successful.\n")
> +
> self._close_log()
> return failed
>
> @@ -377,12 +383,13 @@ class TestHarness:
> # This has to be class-scoped for use in the progress_func()
> self.dots_written = 0
> def progress_func(completed):
> + if not self.log or self.dots_written >= dot_count:
> + return
> dots = (completed * dot_count) / total
> -
> + if dots > dot_count:
> + dots = dot_count
> dots_to_write = dots - self.dots_written
> - if self.log:
> - os.write(sys.stdout.fileno(), '.' * dots_to_write)
> -
> + os.write(sys.stdout.fileno(), '.' * dots_to_write)
> self.dots_written = dots
>
> tests_completed = 0
> @@ -478,21 +485,28 @@ class TestHarness:
> sys.stdout.flush()
> sys.stderr.flush()
> self.log.flush()
> - old_stdout = os.dup(1)
> - old_stderr = os.dup(2)
> - os.dup2(self.log.fileno(), 1)
> - os.dup2(self.log.fileno(), 2)
> + old_stdout = os.dup(sys.stdout.fileno())
> + old_stderr = os.dup(sys.stderr.fileno())
> + os.dup2(self.log.fileno(), sys.stdout.fileno())
> + os.dup2(self.log.fileno(), sys.stderr.fileno())
>
> - # This has to be class-scoped for use in the progress_func()
> + # These have to be class-scoped for use in the progress_func()
> self.dots_written = 0
> + self.progress_lock = threading.Lock()
> def progress_func(completed, total):
> + """Report test suite progress. Can be called from multiple threads
> + in parallel mode."""
> + if not self.log:
> + return
> dots = (completed * dot_count) / total
> -
> - dots_to_write = dots - self.dots_written
> - if self.log:
> + if dots > dot_count:
> + dots = dot_count
> + self.progress_lock.acquire()
> + if self.dots_written < dot_count:
> + dots_to_write = dots - self.dots_written
> + self.dots_written = dots
> os.write(old_stdout, '.' * dots_to_write)
> -
> - self.dots_written = dots
> + self.progress_lock.release()
>
> serial_only = hasattr(prog_mod, 'serial_only') and
> prog_mod.serial_only
>
> @@ -525,8 +539,8 @@ class TestHarness:
> if self.log:
> sys.stdout.flush()
> sys.stderr.flush()
> - os.dup2(old_stdout, 1)
> - os.dup2(old_stderr, 2)
> + os.dup2(old_stdout, sys.stdout.fileno())
> + os.dup2(old_stderr, sys.stderr.fileno())
> os.close(old_stdout)
> os.close(old_stderr)
>
>
>
>
Received on 2012-11-25 06:50:34 CET