* CHANGES: It can be argued that making Julian happy is a developer-visible
   change, rather than an "other tools" improvement. So move this entry.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483608 13f79535-47bb-0310-9956-ffa450edef68
Revert the "just-for-symmetry" changes made in r1483532 and keep only
those used for log and merge info in tight loops.

* subversion/libsvn_client/add.c
  (svn_client__get_all_auto_props):  switch back to svn_hash_[g|s]ets

* subversion/libsvn_client/commit_util.c
  (svn_client__ensure_revprop_table): same

* subversion/libsvn_client/copy.c
  (repos_to_wc_copy_single): same

* subversion/libsvn_client/list.c
  (svn_client__ra_stat_compatible): same

* subversion/libsvn_client/log.c
  (pre_15_receiver): same

* subversion/libsvn_client/merge.c
  (prepare_merge_props_changed, merge_file_added, merge_dir_added,
   merge_dir_deleted): same

* subversion/libsvn_client/mergeinfo.c
  (svn_client__get_wc_or_repos_mergeinfo_catalogue): same

* subversion/libsvn_fs_base/tree.c
  (txn_body_get_mergeinfo_data_and_entries,
   txn_body_get_mergeinfo_for_path): same

* subversion/libsvn_fs_fs/fs_fs.c
  (write_revision_zero): same

* subversion/libsvn_fs_fs/tree.c
  (get_mergeinfo_for_path_internal): same

* subversion/libsvn_ra/deprecated.c
  (svn_ra_get_commit_editor2): same

* subversion/libsvn_ra_local/ra_plugin.c
  (svn_ra_local__get_commit_editor, svn_ra_local__get_commit_ev2): same

* subversion/libsvn_ra_svn/client.c
  (ra_svn_commit): same

* subversion/libsvn_repos/commit.c
  (svn_repos__get_commit_ev2): same

* subversion/libsvn_repos/delta.c
  (delta_proplists): same

* subversion/libsvn_repos/deprecated.c
  (svn_repos_get_commit_editor4): same

* subversion/libsvn_repos/dump.c
  (dump_node, write_revision_record): same

* subversion/libsvn_repos/fs-wrap.c
  (svn_repos_fs_begin_txn_for_commit2, svn_repos_fs_begin_txn_for_commit,
   svn_repos_fs_revision_proplist): same

* subversion/libsvn_repos/reporter.c
  (get_revision_info): same

* subversion/libsvn_wc/status.c
  (collect_ignore_patterns): same

* subversion/mod_dav_svn/activity.c
  (dav_svn__create_txn): same

* subversion/mod_dav_svn/lock.c
  (append_locks): same

* subversion/svndumpfilter/svndumpfilter.c
  (output_revision): same

* subversion/svnmucc/svnmucc.c
  (execute, sanitize_log_sources): same

* subversion/svnrdump/load_editor.c
  (new_node_record): same

* subversion/svnserve/serve.c
  (commit): same

* subversion/svnsync/svnsync.c
  (replay_rev_started): same


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483610 13f79535-47bb-0310-9956-ffa450edef68
* win-tests.py
  (Svnserve, Httpd): Popen.kill to stop daemon processes.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483756 13f79535-47bb-0310-9956-ffa450edef68
Fix FSFS repository corruption on power or network disk failure on Windows:
http://svn.haxx.se/dev/archive-2013-05/0245.shtml

This is revert of r1082451.

* subversion/libsvn_subr/io.c
  (svn_io_write_unique): Perform svn_io_file_flush_to_disk() on all 
   platforms.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483781 13f79535-47bb-0310-9956-ffa450edef68
Tweak 'svnadmin info' output.

* subversion/svnadmin/svnadmin.c
  (subcommand_info):
    Print the FS format number where all other FS info is printed.

New output:
    Path: r
    Repository Format: 5
    Compatible With Version: 1.8.0
    Repository Capabilities: mergeinfo
    Filesystem Type: fsfs
    Filesystem Format: 6
    FSFS Sharded: yes
    FSFS Shard Size: 1000
    FSFS Packed: yes
    Configuration File: r/db/fsfs.conf


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483847 13f79535-47bb-0310-9956-ffa450edef68
Tweak 'svnadmin info' output: print each capability in its own line.

Before:
    % svnadmin info r | grep Capabilit
    Repository Capabilities: mergeinfo,foo
After:
    % svnadmin info r | grep Capabilit
    Repository Capability: mergeinfo
    Repository Capability: foo

* subversion/svnadmin/svnadmin.c
  (subcommand_info): As above.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483856 13f79535-47bb-0310-9956-ffa450edef68
Tweak 'svnadmin info' output for packed FSFS filesystems.

* subversion/svnadmin/svnadmin.c
  (subcommand_info):
    Replace a tristate output field with two binary fields.  This adds
    information (there are four possible outputs, rather than three).  The
    old tristate output was misleading, since it could print "yes" and "no"
    like binary fields do.

New output:
    % svnadmin info 5 | me
    Filesystem Type: fsfs
    Filesystem Format: 6
    FSFS Sharded: yes
    FSFS Shard Size: 4
    FSFS Packed: yes
    FSFS Packable: no

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483879 13f79535-47bb-0310-9956-ffa450edef68
Fix 'svnadmin info' output on Windows.

* subversion/svnadmin/svnadmin.c
  (subcommand_info): Print paths in local style.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483881 13f79535-47bb-0310-9956-ffa450edef68
Adjust the hard-coded version that is expected for Subversion in
JavaHL's JNI loading code.

[in subversion/bindings/javahl]

* src/org/apache/subversion/javahl/NativeResources.java: Adjust version.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483917 13f79535-47bb-0310-9956-ffa450edef68
Minor correction to test for issue #4367 'merge to shallow WC, repeat merge
to infinite depth WC is broken'.

* subversion/tests/cmdline/merge_tests.py
  (merge_to_empty_target_merge_to_infinite_target): Adjust the expected
   output of the final merge to use the new "prev_status" for a path that
   is notified twice -- i.e. it's added on the first editor drive and 
   deleted on the second drive.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483927 13f79535-47bb-0310-9956-ffa450edef68
* Makefile.in
  (doc-javahl): Put output in builddir not srcdir.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483939 13f79535-47bb-0310-9956-ffa450edef68
Fix issue #4367 'merge to shallow WC, repeat merge to infinite depth WC is
broken'.

* subversion/libsvn_client/merge.c

  (merge_dir_opened,
   merge_dir_added): A merge may be broken into multiple editor drives.
   One drive may add a directory and then a later one might delete it.  So
   don't assume the copy from revision (which must always exist for a merge)
   on an added directory is dictated by the larger merge source, use the
   (possibly different) revision from the editor drive. 

* subversion/tests/cmdline/merge_tests.py

  (merge_to_empty_target_merge_to_infinite_target): Remove XFail decorator.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483947 13f79535-47bb-0310-9956-ffa450edef68
Tweak 'svnadmin info' for packed FSFS.

* subversion/svnadmin/svnadmin.c
  (subcommand_info):
    Print "FSFS Packed Shards: %d/%d" if packing is possible, and say nothing
    if it is not possible.  A future revision might want to print something
    for each SVN_FS_FS__MIN_*_FORMAT constant that fs_format is ≥ than.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483953 13f79535-47bb-0310-9956-ffa450edef68
'svnadmin info': Fix a future segfault.

* subversion/svnadmin/svnadmin.c
  (subcommand_info): Explicitly convert the array element to svn_sort__item_t.
    Using APR_ARRAY_IDX(_, _, const char *) would segfault once the array has
    two elements (because it would mis-compute the array stride).

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483955 13f79535-47bb-0310-9956-ffa450edef68
Followup to r1483953:

* subversion/svnadmin/svnadmin.c
  (subcommand_info): Fix off-by-one in the format number check.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483959 13f79535-47bb-0310-9956-ffa450edef68
* subversion/include/svn_types.h:
  (svn_tristate_t): Add documentation entries for the enum values.  This shuts
    up doxygen warnings about them being targets for links.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483964 13f79535-47bb-0310-9956-ffa450edef68
* subversion/include/svn_wc.h
  (svn_wc_read_kind2): Fix broken links to svn_node_none in documentation.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483965 13f79535-47bb-0310-9956-ffa450edef68
* subversion/include/svn_error.h:
  (SVN_ERROR_IN_CATEGORY): Linking to apr_status_t in the documentation which
    will never be in our documentation is bogus, remove it.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483968 13f79535-47bb-0310-9956-ffa450edef68
* subversion/include/svn_config.h
  (svn_config_read3, svn_config_parse): Remove reference to private constant
    in our public API documentation.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483972 13f79535-47bb-0310-9956-ffa450edef68
* subversion/include/svn_repos.h
  (svn_repos_revision_access_level_t): Add documentation to the enum values.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1483975 13f79535-47bb-0310-9956-ffa450edef68