Follow-up to r1577079: fix compiler warning.

* subversion/libsvn_wc/wc_db.c
* subversion/libsvn_wc/wc_db.h
  (revert_list_read_copied_children, 
   svn_wc__db_revert_list_read_copied_children): Remove const qualifier on 
   returned APR array to allow caller modify this array.

* subversion/libsvn_wc/revert.c
  (revert_restore_handle_copied_dirs): Update caller.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577486 13f79535-47bb-0310-9956-ffa450edef68
Add an XFAIL regression test for a minor lock problem reported by a user.

* subversion/tests/cmdline/lock_tests.py
  (break_delete_add): New XFAIL test.
  (test_list): Add new test.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577685 13f79535-47bb-0310-9956-ffa450edef68
Add regression test for the issue in the 'Mergeinfo overwritten from successive
merges' thread on users and dev @s.a.o.

* subversion/tests/cmdline/commit_tests.py
  (commit_mergeinfo_ood): New function.
  (test_list): Add commit_mergeinfo_ood.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577739 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/commit_tests.py
  (commit_mergeinfo_ood): Mark with issue number.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577755 13f79535-47bb-0310-9956-ffa450edef68
Resolve a segfault when merging a directory delete using --force.

This regression was introduced in 1.8.0, with the implementation of proper
tree conflict calculations for directory deletes.

This code path for directory deletes during merge doesn't have much test
coverage as it was very easy to trigger working copy side effects before we
introduced the single-db storage in 1.7.

* subversion/libsvn_client/merge.c
  (merge_dir_deleted): When using force_delete, don't continue looking for
    changes using a baton that isn't filled in this mode. This resolves a
    segfault.

* subversion/tests/cmdline/merge_tests.py
  (merge_dir_delete_force): Add very minimalistic testcase for this issue.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577812 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/merge.c
  (merge_dir_deleted): Following up on r1577812, reduce scope of variable.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577813 13f79535-47bb-0310-9956-ffa450edef68
* subversion/svn/svn.c
  (svn_cl__cmd_table): Override the default help text for --force on merge,
    switch and update to document their actual behavior.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577828 13f79535-47bb-0310-9956-ffa450edef68
Follow-up to r1577828:

* tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
   Adjust expected output.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577833 13f79535-47bb-0310-9956-ffa450edef68
* subversion/svn/svn.c
  (svn_cl__cmd_table): Grammar and wording tweak for svn merge --force
   option help string.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577835 13f79535-47bb-0310-9956-ffa450edef68
Fix the wording in the fsfs.conf template for the f7-related changes.
No functional change.

* subversion/libsvn_fs_fs/fs_fs.c
  (write_config): Make stated defaults match the actual defaults and
                  tweak wording as well as indentation and punctuation.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1578112 13f79535-47bb-0310-9956-ffa450edef68
Model the FSFS pack lock similarly to our other file based locks in FSFS.
This gives us proper mutex functionality should multiple threads try to
pack the same repo at the same time.

* subversion/libsvn_fs_fs/fs.h
  (fs_fs_shared_data_t): Add a thread mutex alongside the file lock.

* subversion/libsvn_fs_fs/fs.c
  (fs_serialized_init): Initialize the new mutex.

* subversion/libsvn_fs_fs/fs_fs.h
  (svn_fs_fs__get_lock_on_filesystem): Privatize again.
  (svn_fs_fs__with_pack_lock): New lock handling function similar
                               to what we do for the other locks.

* subversion/libsvn_fs_fs/fs_fs.c
  (path_pack_lock): New utility function.
  (svn_fs_fs__get_lock_on_filesystem): Rename back to ...
  (get_lock_on_filesystem): ... this again.
  (with_some_lock_file): Update caller.
  (svn_fs_fs__with_pack_lock): Implement the new lock function.

* subversion/libsvn_fs_fs/pack.c
  (svn_fs_fs__pack): Use the new pack lock handling function.

Suggested by: ivan

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1578176 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_ra_serf/getlocks.c
  (getlocks_closed): Don't put non-locks without a token in the result hash,
    to match the behavior of the other ra layers (and ra neon).


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1578273 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_ra_serf/get_lock.c
  (svn_ra_serf__get_lock): Following up on r1578273, only return a lock
    instance when the node is really locked, as svn_ra_get_lock() documents.
    Introduce sub/scratch pool.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1578311 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_ra_serf/lock.c
  (svn_ra_serf__unlock): Following up on r1578311, remove the now invalid
    assumption that serf's get_lock will always return a lock instance,
    even when a node isn't locked.


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