subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1403849 [1/19] - in /subversion/branches/master-passphrase: ./ build/ build/ac-macros/ build/hudson/ contrib/server-side/fsfsfixer/ notes/ notes/api-errata/1.8/ notes/directory-index/ notes/obliterate/ notes/tree-conflicts/ subversion/bind...
Date Tue, 30 Oct 2012 20:03:39 GMT
Author: cmpilato
Date: Tue Oct 30 20:03:28 2012
New Revision: 1403849

URL: http://svn.apache.org/viewvc?rev=1403849&view=rev
Log:
Sync the 'master-passphrase' branch with recent trunk changes.
(Merged /subversion/trunk:r1390051-1403823.)

Added:
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ImportFilterCallback.cpp
      - copied unchanged from r1403823, subversion/trunk/subversion/bindings/javahl/native/ImportFilterCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ImportFilterCallback.h
      - copied unchanged from r1403823, subversion/trunk/subversion/bindings/javahl/native/ImportFilterCallback.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
      - copied unchanged from r1403823, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
    subversion/branches/master-passphrase/subversion/include/private/svn_pseudo_md5.h
      - copied unchanged from r1403823, subversion/trunk/subversion/include/private/svn_pseudo_md5.h
    subversion/branches/master-passphrase/subversion/libsvn_client/iprops.c
      - copied unchanged from r1403823, subversion/trunk/subversion/libsvn_client/iprops.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/deprecated.h
      - copied unchanged from r1403823, subversion/trunk/subversion/libsvn_ra/deprecated.h
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/inherited_props.c
      - copied unchanged from r1403823, subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/util_error.c
      - copied unchanged from r1403823, subversion/trunk/subversion/libsvn_ra_serf/util_error.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/pseudo_md5.c
      - copied unchanged from r1403823, subversion/trunk/subversion/libsvn_subr/pseudo_md5.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db_update_move.c
      - copied unchanged from r1403823, subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/reports/inherited-props.c
      - copied unchanged from r1403823, subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/   (props changed)
      - copied from r1403823, subversion/trunk/subversion/tests/cmdline/import_tests_data/
    subversion/branches/master-passphrase/subversion/tests/cmdline/iprop_authz_tests.py
      - copied unchanged from r1403823, subversion/trunk/subversion/tests/cmdline/iprop_authz_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/iprop_tests.py
      - copied unchanged from r1403823, subversion/trunk/subversion/tests/cmdline/iprop_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_automatic_tests.py
      - copied unchanged from r1403823, subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
    subversion/branches/master-passphrase/tools/client-side/svn-bench/   (props changed)
      - copied from r1403823, subversion/trunk/tools/client-side/svn-bench/
    subversion/branches/master-passphrase/tools/hook-scripts/persist-ephemeral-txnprops.py
      - copied unchanged from r1403823, subversion/trunk/tools/hook-scripts/persist-ephemeral-txnprops.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/irkerbridge.py
      - copied unchanged from r1403823, subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py
Removed:
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_symmetric_tests.py
Modified:
    subversion/branches/master-passphrase/   (props changed)
    subversion/branches/master-passphrase/CHANGES
    subversion/branches/master-passphrase/COMMITTERS
    subversion/branches/master-passphrase/Makefile.in
    subversion/branches/master-passphrase/NOTICE
    subversion/branches/master-passphrase/build.conf
    subversion/branches/master-passphrase/build/ac-macros/berkeley-db.m4
    subversion/branches/master-passphrase/build/ac-macros/serf.m4
    subversion/branches/master-passphrase/build/hudson/README   (props changed)
    subversion/branches/master-passphrase/build/run_tests.py
    subversion/branches/master-passphrase/configure.ac
    subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fix-repo
    subversion/branches/master-passphrase/notes/api-changes-1.7.txt   (props changed)
    subversion/branches/master-passphrase/notes/api-errata/1.8/fs001.txt   (props changed)
    subversion/branches/master-passphrase/notes/diff-data-flows.txt   (props changed)
    subversion/branches/master-passphrase/notes/directory-index/dirindex.py
    subversion/branches/master-passphrase/notes/directory-index/schema.sql
    subversion/branches/master-passphrase/notes/fsfs
    subversion/branches/master-passphrase/notes/obliterate/design-audit.html   (props changed)
    subversion/branches/master-passphrase/notes/obliterate/design-authz.html   (props changed)
    subversion/branches/master-passphrase/notes/obliterate/design-repos.html   (props changed)
    subversion/branches/master-passphrase/notes/obliterate/design-wc.html   (props changed)
    subversion/branches/master-passphrase/notes/obliterate/plan-milestones.html   (props changed)
    subversion/branches/master-passphrase/notes/ra-serf-testing.txt   (props changed)
    subversion/branches/master-passphrase/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt   (props changed)
    subversion/branches/master-passphrase/notes/wc_node_walkers.txt   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/BlameCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ChangelistCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ClientContext.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitMessage.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/InfoCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/InputStream.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ListCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/LogMessageCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/OutputStream.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/PatchCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/Prompter.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ProplistCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/SVNRepos.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/SVNRepos.h
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/StatusCallback.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/master-passphrase/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
    subversion/branches/master-passphrase/subversion/bindings/swig/core.i
    subversion/branches/master-passphrase/subversion/bindings/swig/include/svn_containers.swg
    subversion/branches/master-passphrase/subversion/bindings/swig/include/svn_types.swg
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/   (props changed)
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/Client.pm
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/Core.pm
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/Fs.pm
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/Makefile.PL.in
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/Repos.pm
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/Wc.pm
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/0use.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/1repos.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/2fs.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/3client.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/4pool.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/5delta-compat.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/5delta.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/6ra.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/7editor.t
    subversion/branches/master-passphrase/subversion/bindings/swig/perl/native/t/8lock.t
    subversion/branches/master-passphrase/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/branches/master-passphrase/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
    subversion/branches/master-passphrase/subversion/bindings/swig/python/tests/core.py
    subversion/branches/master-passphrase/subversion/bindings/swig/python/tests/pool.py
    subversion/branches/master-passphrase/subversion/bindings/swig/svn_wc.i
    subversion/branches/master-passphrase/subversion/include/private/svn_cache.h
    subversion/branches/master-passphrase/subversion/include/private/svn_client_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_cmdline_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_dav_protocol.h
    subversion/branches/master-passphrase/subversion/include/private/svn_dep_compat.h
    subversion/branches/master-passphrase/subversion/include/private/svn_fs_util.h
    subversion/branches/master-passphrase/subversion/include/private/svn_log.h
    subversion/branches/master-passphrase/subversion/include/private/svn_mergeinfo_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_ra_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_skel.h
    subversion/branches/master-passphrase/subversion/include/private/svn_sqlite.h
    subversion/branches/master-passphrase/subversion/include/private/svn_string_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_subr_private.h
    subversion/branches/master-passphrase/subversion/include/private/svn_wc_private.h
    subversion/branches/master-passphrase/subversion/include/svn_client.h
    subversion/branches/master-passphrase/subversion/include/svn_config.h
    subversion/branches/master-passphrase/subversion/include/svn_dav.h
    subversion/branches/master-passphrase/subversion/include/svn_delta.h
    subversion/branches/master-passphrase/subversion/include/svn_error_codes.h
    subversion/branches/master-passphrase/subversion/include/svn_fs.h
    subversion/branches/master-passphrase/subversion/include/svn_io.h
    subversion/branches/master-passphrase/subversion/include/svn_props.h
    subversion/branches/master-passphrase/subversion/include/svn_ra.h
    subversion/branches/master-passphrase/subversion/include/svn_ra_svn.h
    subversion/branches/master-passphrase/subversion/include/svn_repos.h
    subversion/branches/master-passphrase/subversion/include/svn_wc.h
    subversion/branches/master-passphrase/subversion/libsvn_client/add.c
    subversion/branches/master-passphrase/subversion/libsvn_client/cat.c
    subversion/branches/master-passphrase/subversion/libsvn_client/cleanup.c
    subversion/branches/master-passphrase/subversion/libsvn_client/client.h
    subversion/branches/master-passphrase/subversion/libsvn_client/commit.c
    subversion/branches/master-passphrase/subversion/libsvn_client/commit_util.c
    subversion/branches/master-passphrase/subversion/libsvn_client/copy.c
    subversion/branches/master-passphrase/subversion/libsvn_client/ctx.c
    subversion/branches/master-passphrase/subversion/libsvn_client/delete.c
    subversion/branches/master-passphrase/subversion/libsvn_client/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_client/externals.c
    subversion/branches/master-passphrase/subversion/libsvn_client/merge.c
    subversion/branches/master-passphrase/subversion/libsvn_client/mergeinfo.c
    subversion/branches/master-passphrase/subversion/libsvn_client/prop_commands.c
    subversion/branches/master-passphrase/subversion/libsvn_client/repos_diff.c
    subversion/branches/master-passphrase/subversion/libsvn_client/revisions.c
    subversion/branches/master-passphrase/subversion/libsvn_client/switch.c
    subversion/branches/master-passphrase/subversion/libsvn_client/update.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/compat.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/editor.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/path_driver.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/svndiff.c
    subversion/branches/master-passphrase/subversion/libsvn_delta/text_delta.c
    subversion/branches/master-passphrase/subversion/libsvn_diff/parse-diff.c
    subversion/branches/master-passphrase/subversion/libsvn_fs/fs-loader.c
    subversion/branches/master-passphrase/subversion/libsvn_fs/fs-loader.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_base/tree.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/caching.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/dag.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/dag.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/fs.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/structure
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/temp_serializer.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/tree.c
    subversion/branches/master-passphrase/subversion/libsvn_fs_fs/tree.h
    subversion/branches/master-passphrase/subversion/libsvn_fs_util/fs-util.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/compat.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/editor.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/ra_loader.c
    subversion/branches/master-passphrase/subversion/libsvn_ra/ra_loader.h
    subversion/branches/master-passphrase/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/commit.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/options.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/property.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/replay.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/sb_bucket.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/serf.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/update.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/util.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_serf/xml.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/client.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/protocol
    subversion/branches/master-passphrase/subversion/libsvn_ra_svn/ra_svn.h
    subversion/branches/master-passphrase/subversion/libsvn_repos/authz.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/commit.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/delta.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/log.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/replay.c
    subversion/branches/master-passphrase/subversion/libsvn_repos/reporter.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/cache-memcache.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/cache_config.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/cmdline.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/config_file.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/error.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/gpg_agent.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/io.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/log.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/named_atomic.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/path.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/skel.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/sqlite.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/ssl_client_cert_pw_providers.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/string.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/subst.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/sysinfo.c   (contents, props changed)
    subversion/branches/master-passphrase/subversion/libsvn_subr/sysinfo.h   (props changed)
    subversion/branches/master-passphrase/subversion/libsvn_subr/utf.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/version.c
    subversion/branches/master-passphrase/subversion/libsvn_subr/win32_crypto.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/adm_ops.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/conflicts.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/conflicts.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/context.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/copy.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/deprecated.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/entries.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/entries.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/externals.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/info.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/lock.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/lock.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/node.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/old-and-busted.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/props.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/status.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/tree_conflicts.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/update_editor.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/upgrade.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/util.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db_util.c
    subversion/branches/master-passphrase/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/master-passphrase/subversion/mod_dav_svn/deadprops.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/liveprops.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/reports/file-revs.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/reports/replay.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/reports/update.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/repos.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/util.c
    subversion/branches/master-passphrase/subversion/mod_dav_svn/version.c
    subversion/branches/master-passphrase/subversion/po/es.po
    subversion/branches/master-passphrase/subversion/po/pl.po
    subversion/branches/master-passphrase/subversion/po/pt_BR.po
    subversion/branches/master-passphrase/subversion/po/zh_TW.po
    subversion/branches/master-passphrase/subversion/svn/cl.h
    subversion/branches/master-passphrase/subversion/svn/conflict-callbacks.c
    subversion/branches/master-passphrase/subversion/svn/file-merge.c
    subversion/branches/master-passphrase/subversion/svn/log-cmd.c
    subversion/branches/master-passphrase/subversion/svn/main.c
    subversion/branches/master-passphrase/subversion/svn/merge-cmd.c
    subversion/branches/master-passphrase/subversion/svn/mergeinfo-cmd.c
    subversion/branches/master-passphrase/subversion/svn/move-cmd.c
    subversion/branches/master-passphrase/subversion/svn/notify.c
    subversion/branches/master-passphrase/subversion/svn/propedit-cmd.c
    subversion/branches/master-passphrase/subversion/svn/propget-cmd.c
    subversion/branches/master-passphrase/subversion/svn/proplist-cmd.c
    subversion/branches/master-passphrase/subversion/svn/props.c
    subversion/branches/master-passphrase/subversion/svn/resolve-cmd.c
    subversion/branches/master-passphrase/subversion/svn/switch-cmd.c
    subversion/branches/master-passphrase/subversion/svn/update-cmd.c
    subversion/branches/master-passphrase/subversion/svnadmin/main.c
    subversion/branches/master-passphrase/subversion/svndumpfilter/main.c
    subversion/branches/master-passphrase/subversion/svnlook/main.c
    subversion/branches/master-passphrase/subversion/svnrdump/load_editor.c
    subversion/branches/master-passphrase/subversion/svnrdump/svnrdump.c
    subversion/branches/master-passphrase/subversion/svnserve/main.c
    subversion/branches/master-passphrase/subversion/svnserve/serve.c
    subversion/branches/master-passphrase/subversion/svnserve/server.h
    subversion/branches/master-passphrase/subversion/tests/cmdline/autoprop_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/copy_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/DIR1.noo/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/DIR2.doo/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/DIR3.foo/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/DIR4.goo/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/DIR5.moo/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/DIR7/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/import_tests_data/import_tree/DIR6/DIR7/DIR8.noo/   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/patch_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/prop_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/resolve_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/schedule_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/special_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/stat_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svndumpfilter_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svnlook_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/svntest/main.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/tree_conflict_tests.txt   (props changed)
    subversion/branches/master-passphrase/subversion/tests/cmdline/update_tests.py
    subversion/branches/master-passphrase/subversion/tests/cmdline/wc_tests.py   (props changed)
    subversion/branches/master-passphrase/subversion/tests/libsvn_delta/vdelta_1.txt   (props changed)
    subversion/branches/master-passphrase/subversion/tests/libsvn_fs/fs-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/auth-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/checksum-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/compat-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_subr/named_atomic-test-proc.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/conflict-data-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/entries-compat.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/master-passphrase/subversion/tests/libsvn_wc/utils.c
    subversion/branches/master-passphrase/tools/buildbot/master/public_html/index.html   (props changed)
    subversion/branches/master-passphrase/tools/buildbot/master/public_html/robots.txt   (props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/config.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/dev/benchmarks/suite1/benchmark.py
    subversion/branches/master-passphrase/tools/dev/benchmarks/suite1/run.bat   (contents, props changed)
    subversion/branches/master-passphrase/tools/dev/svnraisetreeconflict/main.c
    subversion/branches/master-passphrase/tools/dist/backport.pl
    subversion/branches/master-passphrase/tools/dist/make-deps-tarball.sh   (props changed)
    subversion/branches/master-passphrase/tools/dist/nightly.sh
    subversion/branches/master-passphrase/tools/dist/release.py
    subversion/branches/master-passphrase/tools/server-side/fsfs-reorg.c
    subversion/branches/master-passphrase/tools/server-side/svnauthz-validate.c
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/README.txt   (props changed)
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/commit-hook.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/svnpubsub/client.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/svnpubsub/server.py
    subversion/branches/master-passphrase/tools/server-side/svnpubsub/svnwcsub.py

Propchange: subversion/branches/master-passphrase/
------------------------------------------------------------------------------
  Merged /subversion/branches/inheritable-props:r1297080-1395089
  Merged /subversion/branches/auto-props-sdc:r1384106-1401643
  Merged /subversion/trunk:r1390051-1403823
  Merged /subversion/branches/10Gb:r1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955

Modified: subversion/branches/master-passphrase/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/CHANGES?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/CHANGES (original)
+++ subversion/branches/master-passphrase/CHANGES Tue Oct 30 20:03:28 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,11 +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)
+    * '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:
     *
@@ -51,6 +55,45 @@ http://svn.apache.org/repos/asf/subversi
     * 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
 (15 Aug 2012, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.6

Modified: subversion/branches/master-passphrase/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/COMMITTERS?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/COMMITTERS [UTF-8] (original)
+++ subversion/branches/master-passphrase/COMMITTERS [UTF-8] Tue Oct 30 20:03:28 2012
@@ -55,7 +55,7 @@ Blanket commit access:
      jwhitlock   Jeremy Whitlock <jcscoobyrs@gmail.com>
        sbutler   Stephen Butler <sbutler@elego.de>
         dannas   Daniel Näslund <dannas@dannas.name>
-       stefan2   Stefan Fuhrmann <stefanfuhrmann@alice-dsl.de>
+       stefan2   Stefan Fuhrmann <stefan.fuhrmann@wandisco.com>
        jcorvel   Johan Corveleyn <jcorvel@gmail.com>
          trent   Trent Nelson <trent@snakebite.org>
 
@@ -82,6 +82,7 @@ Partial committers who have asked to be 
            kon   Kalle Olavi Niemitalo <kon@iki.fi>          (psvn.el)
       rassilon   Bill Tutt <bill@tutts.org> (Win32, COM, issue-1003-dev br.)
            pll   Paul lussier <p.lussier@comcast.net>        (releases)
+        rdonch   Роман Донченко <dpb@corrigendum.ru>         (Swig-Python b.)
 
 
 Commit access for specific areas:
@@ -94,7 +95,6 @@ Commit access for specific areas:
     joeswatosh   Joe Swatosh <joe.swatosh@gmail.com>         (Swig-Ruby b.)
     jrvernooij   Jelmer Vernooij <jelmer@samba.org>          (Python bindings)
           sage   Sage LaTorra <sagelt@gmail.com>             (Ctypes-Python b.)
-        rdonch   Роман Донченко <dpb@corrigendum.ru>         (Swig-Python b.)
           vmpn   Vladimir Berezniker <vmpn@hitechman.com>    (JavaHL bindings)
 
   Packages:

Modified: subversion/branches/master-passphrase/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/Makefile.in?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/Makefile.in (original)
+++ subversion/branches/master-passphrase/Makefile.in Tue Oct 30 20:03:28 2012
@@ -281,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
@@ -311,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@
@@ -791,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
 
@@ -813,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/master-passphrase/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/NOTICE?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/NOTICE (original)
+++ subversion/branches/master-passphrase/NOTICE Tue Oct 30 20:03:28 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/master-passphrase/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build.conf?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build.conf (original)
+++ subversion/branches/master-passphrase/build.conf Tue Oct 30 20:03:28 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
@@ -1180,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 fsfs-reorg
+       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
@@ -1257,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/master-passphrase/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/ac-macros/berkeley-db.m4?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/master-passphrase/build/ac-macros/berkeley-db.m4 Tue Oct 30 20:03:28 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/master-passphrase/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/ac-macros/serf.m4?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/ac-macros/serf.m4 (original)
+++ subversion/branches/master-passphrase/build/ac-macros/serf.m4 Tue Oct 30 20:03:28 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 ""
 ])

Propchange: subversion/branches/master-passphrase/build/hudson/README
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/master-passphrase/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/build/run_tests.py?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/build/run_tests.py (original)
+++ subversion/branches/master-passphrase/build/run_tests.py Tue Oct 30 20:03:28 2012
@@ -318,7 +318,7 @@ class TestHarness:
             % self.faillogfile)
 
     # Summary.
-    if xpassed or failed_list:
+    if failed or xpassed or failed_list:
       print("SUMMARY: Some tests failed.\n")
     else:
       print("SUMMARY: All tests successful.\n")

Modified: subversion/branches/master-passphrase/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/configure.ac?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/configure.ac (original)
+++ subversion/branches/master-passphrase/configure.ac Tue Oct 30 20:03:28 2012
@@ -1017,6 +1017,11 @@ AS_HELP_STRING([--enable-maintainer-mode
         CFLAGS="-Wno-system-headers $CFLAGS_KEEP"
         AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
 
+        dnl Put this flag behind -Wall:
+
+        CFLAGS="$CFLAGS_KEEP -Wno-format-nonliteral"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
+
         AC_LANG_POP([C])
         CFLAGS="$CFLAGS_KEEP"
       fi

Modified: subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fix-repo
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fix-repo?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fix-repo (original)
+++ subversion/branches/master-passphrase/contrib/server-side/fsfsfixer/fix-repo Tue Oct 30 20:03:28 2012
@@ -5,6 +5,7 @@ Usage: $0 REPO-DIR START-REV
 
 Backup your repository before running these scripts."
 
+THIS_DIR=`dirname "$0"`
 REPO_DIR="$1"
 START_REV="$2"
 
@@ -13,7 +14,7 @@ if [ ! -d "$REPO_DIR" ] || [ "$START_REV
   exit 1
 fi
 
-YOUNGEST="$(svnlook youngest "$REPO_DIR")"
+YOUNGEST=`svnlook youngest "$REPO_DIR"`
 
 if [ "$YOUNGEST" = "" ]; then
   echo "$0: error running 'svnlook youngest $REPO_DIR'"
@@ -25,6 +26,6 @@ echo "Verifying revisions $START_REV thr
 REV=$START_REV
 while [ $REV -le $YOUNGEST ]; do
   echo "=== r$REV"
-  ./fixer/fix-rev.py "$REPO_DIR" "$REV"
+  "$THIS_DIR"/fixer/fix-rev.py "$REPO_DIR" "$REV"
   REV=`expr $REV + 1`
 done

Propchange: subversion/branches/master-passphrase/notes/api-changes-1.7.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/api-errata/1.8/fs001.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/diff-data-flows.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/master-passphrase/notes/directory-index/dirindex.py
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/notes/directory-index/dirindex.py?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/notes/directory-index/dirindex.py (original)
+++ subversion/branches/master-passphrase/notes/directory-index/dirindex.py Tue Oct 30 20:03:28 2012
@@ -42,7 +42,6 @@ class SQLclass(object):
     def __init__(self):
         import cStringIO
         import pkgutil
-        import re
 
         comment_rx = re.compile(r"\s*--.*$")
         header_rx = re.compile(r"^---(?P<kind>STATEMENT|SCRIPT)"
@@ -215,7 +214,6 @@ class Txn(SQLobject):
             self.created = self._now()
         super(Txn, self)._put(cursor)
         if self.treeid is None:
-            SQL.TXN_UPDATE_INITIAL_TREEID(cursor, id = self.id)
             self.treeid = self.id
 
     @classmethod
@@ -253,49 +251,6 @@ class Txn(SQLobject):
         SQL.TXN_CLEANUP(cursor, id = self.id)
 
 
-class Branch(SQLobject):
-    """O/R mapping for the "branch" table."""
-
-    _columns = ("id", "treeid", "nodeid", "origin", "state")
-    _put_statement = SQL.BRANCH_INSERT
-    _get_statement = SQL.BRANCH_GET
-
-    # state
-    TRANSIENT = "T"
-    PERMANENT = "P"
-
-    def __init__(self, **kwargs):
-        super(Branch, self).__init__(**kwargs)
-        if self.state is None:
-            self.state = self.TRANSIENT
-
-    def _put(self, cursor):
-        super(Branch, self)._put(cursor)
-        if self.nodeid is None:
-            SQL.BRANCH_UPDATE_INITIAL_NODEID(cursor, id = self.id)
-            self.nodeid = self.id
-
-    @classmethod
-    def _update_treeid(cls, cursor, new_txn, old_txn):
-        SQL.BRANCH_UPDATE_TREEID(cursor,
-                                 new_treeid = new_txn.treeid,
-                                 old_treeid = old_txn.treeid)
-
-    @classmethod
-    def _history(cls, cursor, nodeid):
-        SQL.BRANCH_HISTORY(cursor, nodeid = nodeid)
-        for row in cursor:
-            yield cls._from_row(row)
-
-    @classmethod
-    def _commit(cls, cursor, txn):
-        SQL.BRANCH_COMMIT(cursor, treeid = txn.treeid)
-
-    @classmethod
-    def _cleanup(cls, cursor, txn):
-        SQL.BRANCH_CLEANUP(cursor, treeid = txn.treeid)
-
-
 class NodeRev(SQLobject):
     """O/R mapping for the noderev/string/nodeview table."""
 
@@ -330,8 +285,8 @@ class NodeRev(SQLobject):
             self.state = self.TRANSIENT
 
     def __str__(self):
-        return "%d %c %s%s" % (self.treeid, self.opcode, self.name,
-                               self._isdir and '/' or '')
+        return "%d(%d) %c %s%s" % (self.id, self.treeid, self.opcode,
+                                   self.name, self._isdir and '/' or '')
 
     # Opcode names
     __opnames = {ADD: "add",
@@ -384,6 +339,10 @@ class NodeRev(SQLobject):
                 assert self.dename is not None
                 self.denameid = self.__stringid(cursor, self.dename)
         super(NodeRev, self)._put(cursor)
+        if self.nodeid is None:
+            self.nodeid = self.id
+        if self.branch is None:
+            self.branch = self.id
 
     @classmethod
     def _update_treeid(cls, cursor, new_txn, old_txn):
@@ -472,10 +431,6 @@ class NodeRev(SQLobject):
         track.close(cls.__find(cursor, parent.branch, parts[-1], txn))
         return track
 
-    def _count_successors(self, cursor):
-        SQL.NODEREV_COUNT_SUCCESSORS(cursor, origin = self.id)
-        return int(cursor.fetchone()[0])
-
     def _listdir(self, cursor, txn):
         assert self._isdir
         if txn.state != txn.PERMANENT:
@@ -501,17 +456,13 @@ class NodeRev(SQLobject):
 
     def _branch(self, cursor, parent, txn, replaced=False):
         assert txn._uncommitted
-        branch = Branch(treeid = txn.treeid,
-                        nodeid = self.nodeid,
-                        origin = self.branch)
-        branch._put(cursor)
         if self._isdir:
             opcode = replaced and self.LAZY_BREPLACE or self.LAZY
         else:
             opcode = replaced and self.BREPLACE or self.BRANCH
         node = self._revise(opcode, txn)
         node.parent = parent.id
-        node.branch = branch.id
+        node.branch = None
         node._put(cursor)
         return node
 
@@ -519,7 +470,9 @@ class NodeRev(SQLobject):
         assert txn._uncommitted
         noderev = NodeRev._clone(self)
         noderev.treeid = txn.treeid
+        noderev.origin = self.id
         noderev.opcode = opcode
+        return noderev
 
     __readonly = frozenset(("name",))
     def __setitem__(self, key, value):
@@ -528,7 +481,10 @@ class NodeRev(SQLobject):
         if key == "dename":
             name = self.__normtext(value)
             value = self.__text(value)
-            super(NodeRev, self).__setitem__("name", name)
+            if name != self.name:
+                super(NodeRev, self).__setitem__("name", name)
+                super(NodeRev, self).__setitem__("nameid", None)
+            super(NodeRev, self).__setitem__("denameid", None)
         super(NodeRev, self).__setitem__(key, value)
 
     def __getitem__(self, key):
@@ -680,12 +636,10 @@ class Index(object):
     def commit_txn(self, txn, revision):
         txn._commit(self.cursor, revision)
         NodeRev._commit(self.cursor, txn)
-        Branch._commit(self.cursor, txn)
 
     def abort_txn(self, txn):
         txn._abort(self.cursor)
         NodeRev._cleanup(self.cursor, txn)
-        Branch._cleanup(self.cursor, txn)
         txn._cleanup(self.cursor)
 
     def listdir(self, txn, noderev):
@@ -743,11 +697,9 @@ class Index(object):
             newnode = origin._branch(self.cursor, parent.id, txn,
                                      replaced = (oldnode is not None))
         else:
-            branch = Branch(treeid = txn.treeid)
-            branch._put(self.cursor)
             newnode = NodeRev(treeid = txn.treeid,
-                              nodeid = branch.nodeid,
-                              branch = branch.id,
+                              nodeid = None,
+                              branch = None,
                               parent = parent.id,
                               kind = kind,
                               opcode = opcode)
@@ -777,6 +729,45 @@ class Tree(object):
         index.rollback()
 
 
+__greek_tree = {
+    'iota': 'file',
+    'A': {
+        'mu': 'file',
+        'B': {
+            'lambda': 'file',
+            'E': {
+                'alpha': 'file',
+                'beta': 'file'},
+            'F': 'dir'},
+        'C': 'dir',
+        'D': {
+            'G': {
+                'pi': 'file',
+                'rho': 'file',
+                'tau': 'file'},
+            'H': {
+                'chi': 'file',
+                'psi': 'file',
+                'omega': 'file'}
+            }
+        }
+    }
+def greektree(ix, tx):
+    def populate(track, items):
+        print 'Populating', track
+        for name, kind in items.iteritems():
+            if kind == 'file':
+                node = ix.add(tx, track, name, NodeRev.FILE)
+            else:
+                node = ix.add(tx, track, name, NodeRev.DIR)
+            print 'Added', node, 'node:', node.noderev
+            if isinstance(kind, dict):
+                populate(node, kind)
+
+    root = ix.lookup(tx)
+    populate(root, __greek_tree)
+
+
 def simpletest(database):
     ix = Index(database)
     ix.initialize()
@@ -789,37 +780,34 @@ def simpletest(database):
         print "root track:", root
         print "root noderev", root.noderev
 
-        print "Add A/foo"
+        print 'Create greek tree'
         tx = ix.new_txn(0)
         print "transaction:", tx
-        parent = ix.add(tx, root, "A", NodeRev.DIR)
-        print "A track:", parent
-        print "A noderev", parent.noderev
-
-        node = ix.add(tx, parent, "foo", NodeRev.FILE)
-        print "foo track:", node
-        print "foo noderev", node.noderev
+        greektree(ix, tx)
         ix.commit_txn(tx, 1)
         ix.commit()
 
+
+        def listdir(noderev, prefix):
+            for n in ix.listdir(tx, noderev):
+                print prefix, str(n)
+                if n._isdir:
+                    listdir(n, prefix + "  ")
+
         print "List contents"
         tx = ix.get_txn()
         print "transaction:", tx
         root = ix.lookup(tx)
         print str(root.noderev)
-        for n1 in ix.listdir(tx, root.noderev):
-            print " ", str(n1)
-            if n1._isdir:
-                for n2 in ix.listdir(tx, n1):
-                    print "   ", str(n2)
-
-        print "Lookup A"
-        track = ix.lookup(tx, None, "A")
-        print str(track.noderev)
-
-        print "Lookup A/foo"
-        track = ix.lookup(tx, None, "A/foo")
-        print str(track.noderev)
+        listdir(root.noderev, " ")
+
+        print "Lookup iota"
+        track = ix.lookup(tx, None, "iota")
+        print str(track), str(track.noderev)
+
+        print "Lookup A/D/H/psi"
+        track = ix.lookup(tx, None, "A/D/H/psi")
+        print str(track), str(track.noderev)
     finally:
         ix.close()
 

Modified: subversion/branches/master-passphrase/notes/directory-index/schema.sql
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/notes/directory-index/schema.sql?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/notes/directory-index/schema.sql (original)
+++ subversion/branches/master-passphrase/notes/directory-index/schema.sql Tue Oct 30 20:03:28 2012
@@ -22,7 +22,6 @@
 DROP VIEW IF EXISTS nodeview;
 DROP TABLE IF EXISTS noderev;
 DROP TABLE IF EXISTS string;
-DROP TABLE IF EXISTS branch;
 DROP TABLE IF EXISTS txn;
 
 
@@ -61,36 +60,10 @@ CREATE TABLE txn (
 
 CREATE INDEX txn_revision_idx ON txn(revision);
 
-
--- Branches -- unique forks in the nodes' history
-CREATE TABLE branch (
-  -- branch identifier
-  id        integer NOT NULL PRIMARY KEY,
-
-  -- the transaction in which the branch was created
-  treeid    integer NOT NULL REFERENCES txn(id),
-
-  -- the node to which this branch belongs; refers to the initial
-  -- branch of the node
-  nodeid    integer NULL REFERENCES branch(id),
-
-  -- the source branch from which this branch was forked
-  origin    integer NULL REFERENCES branch(id),
-
-  -- mark branches in uncommitted transactions so that they can be
-  -- ignored by branch traversals
-  -- T = transient (uncommitted), P = permanent (committed)
-  state     character(1) NOT NULL DEFAULT 'T',
-
-  -- sanity check: enumerated value validation
-  CONSTRAINT enumeration_validation CHECK (state IN ('T', 'P')),
-
-  -- sanity check: ye can't be yer own daddy
-  CONSTRAINT genetic_diversity CHECK (id <> origin)
-);
-
-CREATE INDEX branch_txn_idx ON branch(treeid);
-CREATE INDEX branch_node_idx ON branch(nodeid);
+CREATE TRIGGER txn_ensure_treeid AFTER INSERT ON txn
+BEGIN
+  UPDATE txn SET treeid = NEW.id WHERE treeid IS NULL AND id = NEW.id;
+END;
 
 
 -- File names -- lookup table of strings
@@ -108,18 +81,19 @@ CREATE TABLE noderev (
   -- the transaction in which the node was changed
   treeid    integer NOT NULL REFERENCES txn(id),
 
-  -- the node identifier; a new node will get the ID of its initial
-  -- branch
-  nodeid    integer NOT NULL REFERENCES branch(id),
+  -- the node identifier
+  -- a new node will get the ID of its initial noderev.id
+  nodeid    integer NULL REFERENCES noderev(id),
 
   -- this node revision's immediate predecessor
   origin    integer NULL REFERENCES noderev(id),
 
   -- the parent (directory) of this node revision -- tree graph
-  parent    integer NULL REFERENCES branch(id),
+  parent    integer NULL REFERENCES noderev(id),
 
   -- the branch that this node revision belongs to -- history graph
-  branch    integer NOT NULL REFERENCES branch(id),
+  -- a new branch will get the ID of its initial noderev.id
+  branch    integer NULL REFERENCES noderev(id),
 
   -- the indexable, NFC-normalized name of this noderev within its parent
   nameid    integer NOT NULL REFERENCES string(id),
@@ -171,8 +145,15 @@ CREATE TABLE noderev (
 CREATE UNIQUE INDEX noderev_tree_idx ON noderev(parent,nameid,treeid,opcode);
 CREATE INDEX noderev_txn_idx ON noderev(treeid);
 CREATE INDEX nodefev_node_idx ON noderev(nodeid);
+CREATE INDEX noderev_branch_idx ON noderev(branch);
 CREATE INDEX noderev_successor_idx ON noderev(origin);
 
+CREATE TRIGGER noderev_ensure_node_and_branch AFTER INSERT ON noderev
+BEGIN
+    UPDATE noderev SET nodeid = NEW.id WHERE nodeid IS NULL AND id = NEW.id;
+    UPDATE noderev SET branch = NEW.id WHERE branch IS NULL AND id = NEW.id;
+END;
+
 
 CREATE VIEW nodeview AS
   SELECT
@@ -188,7 +169,6 @@ CREATE VIEW nodeview AS
 
 INSERT INTO txn (id, treeid, revision, created, state)
   VALUES (0, 0, 0, 'EPOCH', 'P');
-INSERT INTO branch (id, treeid, nodeid, state) VALUES (0, 0, 0, 'P');
 INSERT INTO string (id, val) VALUES (0, '');
 INSERT INTO noderev (id, treeid, nodeid, branch,
                      nameid, denameid, kind, opcode, state)
@@ -199,9 +179,6 @@ INSERT INTO noderev (id, treeid, nodeid,
 INSERT INTO txn (treeid, revision, created, author)
   VALUES (:treeid, :revision, :created, :author);
 
----STATEMENT TXN_UPDATE_INITIAL_TREEID
-UPDATE txn SET treeid = :id WHERE id = :id;
-
 ---STATEMENT TXN_GET
 SELECT * FROM txn WHERE id = :id;
 
@@ -230,28 +207,6 @@ UPDATE txn SET state = 'D' WHERE id = :i
 ---STATEMENT TXN_CLEANUP
 DELETE FROM txn WHERE id = :id;
 
----STATEMENT BRANCH_INSERT
-INSERT INTO branch (nodeid, treeid, origin)
-  VALUES (:nodeid, :treeid, :origin);
-
----STATEMENT BRANCH_UPDATE_INITIAL_NODEID
-UPDATE branch SET nodeid = :id WHERE id = :id;
-
----STATEMENT BRANCH_UPDATE_TREEID
-UPDATE branch SET treeid = :new_treeid WHERE treeid = :old_treeid;
-
----STATEMENT BRANCH_GET
-SELECT * FROM branch WHERE id = :id;
-
----STATEMENT BRANCH_HISTORY
-SELECT * from branch WHERE nodeid = :nodeid ORDER BY id ASC;
-
----STATEMENT BRANCH_COMMIT
-UPDATE branch SET state = 'P' WHERE treeid = :treeid;
-
----STATEMENT BRANCH_CLEANUP
-DELETE FROM branch WHERE treeid = :treeid;
-
 ---STATEMENT STRING_INSERT
 INSERT INTO string (val) VALUES (:val);
 
@@ -273,9 +228,6 @@ UPDATE noderev SET opcode = :opcode WHER
 ---STATEMENT NODEVIEW_GET
 SELECT * FROM nodeview WHERE id = :id;
 
----STATEMENT NODEREV_COUNT_SUCCESSORS
-SELECT COUNT(id) FROM noderev WHERE origin = :origin;
-
 ---STATEMENT NODEREV_COMMIT
 UPDATE noderev SET state = 'P' WHERE treeid = :treeid;
 
@@ -309,7 +261,8 @@ ORDER BY treeid DESC LIMIT 1;
 ---STATEMENT NODEVIEW_LIST_DIRECTORY
 SELECT * FROM nodeview
   JOIN (SELECT nameid, MAX(treeid) AS treeid FROM noderev
-        WHERE treeid <= :treeid AND state = 'P') AS filter
+        WHERE treeid <= :treeid AND state = 'P'
+        GROUP BY nameid) AS filter
     ON nodeview.nameid = filter.nameid AND nodeview.treeid = filter.treeid
 WHERE parent = :parent AND opcode <> 'D'
 ORDER BY nodeview.name ASC;
@@ -317,7 +270,8 @@ ORDER BY nodeview.name ASC;
 ---STATEMENT NODEVIEW_LIST_TRANSIENT_DIRECTORY
 SELECT * FROM nodeview
   JOIN (SELECT nameid, MAX(treeid) AS treeid FROM noderev
-        WHERE treeid < :treeid AND state = 'P' OR treeid = :treeid) AS filter
+        WHERE treeid < :treeid AND state = 'P' OR treeid = :treeid
+        GROUP BY nameid) AS filter
     ON nodeview.nameid = filter.name AND nodeview.treeid = filter.treeid
 WHERE parent = :parent AND opcode <> 'D'
 ORDER BY nodeview.name ASC;

Modified: subversion/branches/master-passphrase/notes/fsfs
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/notes/fsfs?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/notes/fsfs (original)
+++ subversion/branches/master-passphrase/notes/fsfs Tue Oct 30 20:03:28 2012
@@ -234,6 +234,16 @@ repository.  The backed-up "current" fil
 new revision which wasn't copied, or which was only partially
 populated when it was copied.
 
+[ Update: as of 1.6, FSFS uses an optional SQLite DB, rep-cache.db, when
+rep-sharing is enabled.  SQLite provides no guarantee that copying live
+databases will result in copies that are uncorrupt, or that are corrupt but
+will raise an error when accessed.  'svnadmin hotcopy' avoids the problem by
+establishing an appropriate SQLite lock (see svn_sqlite__hotcopy()).  User
+code should either use an atomic filesystem snapshot (as with zfs/LVM),
+refrain from copying rep-cache.db, or stop all access to that file before
+copying it (for example, by disabling commits, by establishing a lock a la
+svn_sqlite__hotcopy(), or by using 'svnadmin freeze'). ]
+
 The "svnadmin hotcopy" command avoids this problem by copying the
 "current" file before copying the revision files.  But a backup using
 the hotcopy command isn't as efficient as a straight incremental

Propchange: subversion/branches/master-passphrase/notes/obliterate/design-audit.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/obliterate/design-authz.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/obliterate/design-repos.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/obliterate/design-wc.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/obliterate/plan-milestones.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/ra-serf-testing.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/master-passphrase/notes/wc_node_walkers.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/BlameCallback.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/BlameCallback.cpp Tue Oct 30 20:03:28 2012
@@ -61,11 +61,9 @@ BlameCallback::callback(void *baton,
                         apr_pool_t *pool)
 {
   if (baton)
-    return ((BlameCallback *)baton)->singleLine(start_revnum, end_revnum,
-                                                line_no, revision, rev_props,
-                                                merged_revision,
-                                                merged_rev_props, merged_path,
-                                                line, local_change, pool);
+    return static_cast<BlameCallback *>(baton)->singleLine(start_revnum,
+        end_revnum, line_no, revision, rev_props, merged_revision,
+        merged_rev_props, merged_path, line, local_change, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/ChangelistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/ChangelistCallback.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/ChangelistCallback.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/ChangelistCallback.cpp Tue Oct 30 20:03:28 2012
@@ -53,7 +53,8 @@ ChangelistCallback::callback(void *baton
                              apr_pool_t *pool)
 {
   if (baton)
-    ((ChangelistCallback *)baton)->doChangelist(path, changelist, pool);
+    static_cast<ChangelistCallback *>(baton)->doChangelist(path, changelist,
+            pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/ClientContext.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/ClientContext.cpp Tue Oct 30 20:03:28 2012
@@ -71,7 +71,8 @@ ClientContext::ClientContext(jobject jsv
 
     env->DeleteLocalRef(jctx);
 
-    SVN_JNI_ERR(svn_client_create_context(&m_context, pool.getPool()),
+    SVN_JNI_ERR(svn_client_create_context2(&m_context, NULL,
+                                           pool.getPool()),
                 );
 
     /* Clear the wc_ctx as we don't want to maintain this unconditionally
@@ -323,7 +324,7 @@ ClientContext::cancelOperation()
 svn_error_t *
 ClientContext::checkCancel(void *cancelBaton)
 {
-    ClientContext *that = (ClientContext *)cancelBaton;
+    ClientContext *that = static_cast<ClientContext *>(cancelBaton);
     if (that->m_cancelOperation)
         return svn_error_create(SVN_ERR_CANCELLED, NULL,
                                 _("Operation cancelled"));

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitCallback.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitCallback.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitCallback.cpp Tue Oct 30 20:03:28 2012
@@ -57,7 +57,7 @@ CommitCallback::callback(const svn_commi
                          apr_pool_t *pool)
 {
   if (baton)
-    return ((CommitCallback *)baton)->commitInfo(commit_info, pool);
+    return static_cast<CommitCallback *>(baton)->commitInfo(commit_info, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitMessage.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitMessage.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitMessage.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/CommitMessage.cpp Tue Oct 30 20:03:28 2012
@@ -50,9 +50,9 @@ CommitMessage::callback(const char **log
                         void *baton,
                         apr_pool_t *pool)
 {
-  if (baton && ((CommitMessage *)baton)->m_jcommitMessage)
-    return ((CommitMessage *)baton)->getCommitMessage(log_msg, tmp_file,
-                                                      commit_items, pool);
+  if (baton && static_cast<CommitMessage *>(baton)->m_jcommitMessage)
+    return static_cast<CommitMessage *>(baton)->getCommitMessage(
+            log_msg, tmp_file, commit_items, pool);
 
   *log_msg = NULL;
   *tmp_file = NULL;

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp Tue Oct 30 20:03:28 2012
@@ -46,7 +46,7 @@ DiffSummaryReceiver::summarize(const svn
                                apr_pool_t *pool)
 {
   if (baton)
-    return ((DiffSummaryReceiver *) baton)->onSummary(diff, pool);
+    return static_cast<DiffSummaryReceiver *>(baton)->onSummary(diff, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/InfoCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/InfoCallback.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/InfoCallback.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/InfoCallback.cpp Tue Oct 30 20:03:28 2012
@@ -52,7 +52,7 @@ InfoCallback::callback(void *baton,
                        apr_pool_t *pool)
 {
   if (baton)
-    return ((InfoCallback *)baton)->singleInfo(path, info, pool);
+    return static_cast<InfoCallback *>(baton)->singleInfo(path, info, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/InputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/InputStream.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/InputStream.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/InputStream.cpp Tue Oct 30 20:03:28 2012
@@ -70,7 +70,7 @@ svn_error_t *InputStream::read(void *bat
 {
   JNIEnv *env = JNIUtil::getEnv();
   // An object of our class is passed in as the baton.
-  InputStream *that = (InputStream*)baton;
+  InputStream *that = static_cast<InputStream *>(baton);
 
   // The method id will not change during the time this library is
   // loaded, so it can be cached.

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/ListCallback.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/ListCallback.cpp Tue Oct 30 20:03:28 2012
@@ -57,8 +57,8 @@ ListCallback::callback(void *baton,
                        apr_pool_t *pool)
 {
   if (baton)
-    return ((ListCallback *)baton)->doList(path, dirent, lock, abs_path,
-                                           pool);
+    return static_cast<ListCallback *>(baton)->doList(
+            path, dirent, lock, abs_path, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/LogMessageCallback.cpp Tue Oct 30 20:03:28 2012
@@ -57,7 +57,8 @@ LogMessageCallback::callback(void *baton
                              apr_pool_t *pool)
 {
   if (baton)
-    return ((LogMessageCallback *)baton)->singleMessage(log_entry, pool);
+    return static_cast<LogMessageCallback *>(baton)->singleMessage(
+            log_entry, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/OutputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/OutputStream.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/OutputStream.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/OutputStream.cpp Tue Oct 30 20:03:28 2012
@@ -76,7 +76,7 @@ svn_error_t *OutputStream::write(void *b
   JNIEnv *env = JNIUtil::getEnv();
 
   // An object of our class is passed in as the baton.
-  OutputStream *that = (OutputStream*)baton;
+  OutputStream *that = static_cast<OutputStream *>(baton);
 
   // The method id will not change during the time this library is
   // loaded, so it can be cached.

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/PatchCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/PatchCallback.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/PatchCallback.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/PatchCallback.cpp Tue Oct 30 20:03:28 2012
@@ -54,10 +54,9 @@ PatchCallback::callback(void *baton,
                         apr_pool_t *pool)
 {
   if (baton)
-    return ((PatchCallback *)baton)->singlePatch(filtered,
-                                                 canon_path_from_patchfile,
-                                                 patch_abspath, reject_abspath,
-                                                 pool);
+    return static_cast<PatchCallback *>(baton)->singlePatch(
+            filtered, canon_path_from_patchfile, patch_abspath, reject_abspath,
+            pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/master-passphrase/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/master-passphrase/subversion/bindings/javahl/native/Prompter.cpp?rev=1403849&r1=1403848&r2=1403849&view=diff
==============================================================================
--- subversion/branches/master-passphrase/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/master-passphrase/subversion/bindings/javahl/native/Prompter.cpp Tue Oct 30 20:03:28 2012
@@ -427,7 +427,7 @@ svn_error_t *Prompter::simple_prompt(svn
                                      svn_boolean_t may_save,
                                      apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_simple_t *ret =
     (svn_auth_cred_simple_t*)apr_pcalloc(pool, sizeof(*ret));
   if (!that->prompt(realm, username, may_save ? true : false))
@@ -460,7 +460,7 @@ svn_error_t *Prompter::username_prompt(s
                                        svn_boolean_t may_save,
                                        apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_username_t *ret =
     (svn_auth_cred_username_t*)apr_pcalloc(pool, sizeof(*ret));
   const char *user = that->askQuestion(realm, _("Username: "), true,
@@ -484,7 +484,7 @@ Prompter::ssl_server_trust_prompt(svn_au
                                   svn_boolean_t may_save,
                                   apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_ssl_server_trust_t *ret =
     (svn_auth_cred_ssl_server_trust_t*)apr_pcalloc(pool, sizeof(*ret));
 
@@ -550,7 +550,7 @@ Prompter::ssl_client_cert_prompt(svn_aut
                                  svn_boolean_t may_save,
                                  apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_ssl_client_cert_t *ret =
     (svn_auth_cred_ssl_client_cert_t*)apr_pcalloc(pool, sizeof(*ret));
   const char *cert_file =
@@ -572,7 +572,7 @@ Prompter::ssl_client_cert_pw_prompt(svn_
                                     svn_boolean_t may_save,
                                     apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_ssl_client_cert_pw_t *ret =
     (svn_auth_cred_ssl_client_cert_pw_t*)apr_pcalloc(pool, sizeof(*ret));
   const char *info = that->askQuestion(realm,
@@ -593,7 +593,7 @@ Prompter::plaintext_prompt(svn_boolean_t
                            void *baton,
                            apr_pool_t *pool)
 {
-  Prompter *that = (Prompter *) baton;
+  Prompter *that = static_cast<Prompter *>(baton);
 
   bool result = that->askYesNo(realmstring,
                                _("Store password unencrypted?"),
@@ -610,7 +610,7 @@ Prompter::plaintext_passphrase_prompt(sv
                                       void *baton,
                                       apr_pool_t *pool)
 {
-  Prompter *that = (Prompter *) baton;
+  Prompter *that = static_cast<Prompter *>(baton);
 
   bool result = that->askYesNo(realmstring,
                                _("Store passphrase unencrypted?"),



Mime
View raw message