Sync up the branch with trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1495930 13f79535-47bb-0310-9956-ffa450edef68
Show the summary of corrupt revisions if keep-going is enabled.
--quiet behaves the same irrespective of the value of keep-going.

* subversion/include/svn_repos.h
  (svn_repos_notify_action_t): Add svn_repos_notify_failure_summary and
  svn_repos_notify_summary to show the summary of corruptions.

* subversion/libsvn_repos/dump.c
  (notify_verification_summary): New function to notify the summary title.
  (notify_verification_error_summary): New function to notify the actual
  summary of the corrupt revisions.
  (error_list): New struct with the revnum and the err to show in summary.
  (err_cleanup): Function to cleanup the pool.
  (populate_summary): New function to populate an array of error_lists
  with the respective revnum and err to notify in the summary.
  (svn_repos_verify_fs3): Show the summary of corruptions.

* subversion/svnadmin/svnadmin.c
  (repos_notify_handler): Handle notification of corruption summary
  title and the actual summary of corrupt revisions.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1497757 13f79535-47bb-0310-9956-ffa450edef68
Do not show summary header if there is no corruption. Also, show the full
error chain in summary.

* subversion/libsvn_repos/dump.c
  (svn_repos_verify_fs3): Show the summary header only if there are corruptions.

* subversion/svnadmin/svnadmin.c
  (repos_notify_handler): Show the full error chain in the error summary.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1498394 13f79535-47bb-0310-9956-ffa450edef68
Format the summary of corrupt revisions.

* subversion/libsvn_repos/dump.c
  (notify_verification_error_summary): Show the best error message instead of
  the entire error chain in the summary.

* subversion/svnadmin/svnadmin.c
  (repos_notify_handler): Do not print the entire error chain in the summary
  of corrupt revisions.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1499315 13f79535-47bb-0310-9956-ffa450edef68
Fix the test case to check for summary if keep-going is true.

* subversion/tests/cmdline/svnadmin_tests.py
  (verify_keep_going): Fix the test case's expected output to check for
  the summary if keep-going is true.

* subversion/svnadmin/svnadmin.c
  (repos_notify_handler): Formatting tweak.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1499741 13f79535-47bb-0310-9956-ffa450edef68
Merging r1495341 through r1501107 from trunk into keep-going branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1501136 13f79535-47bb-0310-9956-ffa450edef68
Fix issue #4301, 'svn mergeinfo' won't work on moved target.

* subversion/libsvn_client/merge.c
   (svn_client_get_merging_summary): Treat svn_opt_revision_base as a local
    target revision, rather than as a repository target revision. The target
    path might only exist in the working copy, e.g. in case it was locally
    copied or moved. When this happened 'svn mergeinfo' ran into a dubious
    error because it tried to query history of a non-existent repository path.
    So for the purposes of this function, deriving the in-repos location for
    svn_opt_revision_base from the working copy path is a better idea.

* subversion/svn/mergeinfo-cmd.c
  (mergeinfo_summary): Same change as for svn_client_get_merging_summary()
   since the same logic is duplicated here.

* subversion/tests/cmdline/mergeinfo_tests.py
  (mergeinfo_local_move, test_list): New regression test.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1545986 13f79535-47bb-0310-9956-ffa450edef68
[in subversion/bindings/javahl]
* tests/org/apache/subversion/javahl/SVNRemoteTests.java
  (SVNRemoteTests.testEditorSetDirProps): Add a prop with a binary value.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1545995 13f79535-47bb-0310-9956-ffa450edef68
Sync the verify-keep-going branch with trunk, resolving some trivial
conflicts in svnadmin_tests.py and svnadmin/svnadmin.c.

There are currently two failing tests on this branch:
  FAIL:  svnadmin_tests.py 31: svnadmin verify --keep-going test
  FAIL:  svnadmin_tests.py 32: detect invalid changed path list entries


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546002 13f79535-47bb-0310-9956-ffa450edef68
Add svn_fs_commit_txn2 regression test.

* subversion/include/svn_fs.h
  (svn_fs_commit_txn2): Document parameter.

* subversion/tests/libsvn_fs/fs-test.c
  (commit_timestamp): New test.
  (test_funcs): Add new test.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1546006 13f79535-47bb-0310-9956-ffa450edef68
Deprecate svn_fs_commit_txn in favour of svn_fs_commit_txn2.

* subversion/include/svn_fs.h
  (svn_fs_commit_txn): Deprecate.

* subversion/libsvn_repos/fs-wrap.c
  (svn_repos_fs_commit_txn): Call newer function.

* subversion/libsvn_fs/editor.c
  (svn_fs__editor_commit): Call newer function.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1546032 13f79535-47bb-0310-9956-ffa450edef68
On the verify-keep-going branch, tweak generation of the error summary.

This fixes a small layering violation, and also changes the output a bit.

* subversion/libsvn_repos/dump.c
  (notify_verification_error_summary): Don't populate notify->warning_str.
   The warning string is intended to be used for svn_repos_notify_warning,
   not for svn_repos_notify_failure_summary.
   Instead, we can rely on API users to obtain and display error messages
   based on notify->err. This was a small layering violation since API
   users might want to use a different string representation anyway.

* subversion/svnadmin/svnadmin.c
  (repos_notify_handler): Make 'svnadmin' generate an error message display
   based on the error chain saved in notify->err. Display all interesting
   (i.e. non-tracing) errors in the error chain saved for a revision.
   Also, pad the output so that error messages are aligned for revision
   numbers with up to 6 digits (TODO: padding could account for larger
   revision numbers, like 'svn blame' does).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546041 13f79535-47bb-0310-9956-ffa450edef68
On the verify-keep-going-branch, restore display of error codes in the
summary, which I accidentally removed in r1546041.

* subversion/svnadmin/svnadmin.c
  (repos_notify_handler): Display error codes in the summary.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546046 13f79535-47bb-0310-9956-ffa450edef68
On the verify-keep-going branch, adjust expected output to make tests pass.

* subversion/tests/cmdline/svnadmin_tests.py
  (verify_keep_going, verify_invalid_path_changes): Tweak expected stdout
   and stderr to make these tests accept the current behaviour.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546052 13f79535-47bb-0310-9956-ffa450edef68
On the verify-keep-going branch:

* subversion/libsvn_repos/dump.c
  (svn_repos_verify_fs3): Fix spacing.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546053 13f79535-47bb-0310-9956-ffa450edef68
On the verify-keep-going branch:

* subversion/libsvn_repos/dump.c
  (populate_summary): Rename scratch_pool parameter to result_pool.
   Data allocated in this pool is used by the caller.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546055 13f79535-47bb-0310-9956-ffa450edef68
On the verify-keep-going branch:

* subversion/libsvn_repos/dump.c
  (svn_repos_verify_fs3): Reduce scope of a local variable.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546056 13f79535-47bb-0310-9956-ffa450edef68
On the verify-keep-going branch, remove redundant code.

* subversion/libsvn_repos/dump.c
  (notify_verification_error, notify_verification_summary): These functions
   are only called if notify_func is not NULL, so they don't need to verify
   this argument.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546059 13f79535-47bb-0310-9956-ffa450edef68
On the verify-keep-going branch, a follow-up to r1546059.

* subversion/libsvn_repos/dump.c
  (notify_verification_error): Restore notify_func == NULL check. It is
   needed in this function.
  (notify_verification_error_summary): And remove it here, which is what
   I intended to do in r1546059.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/verify-keep-going@1546063 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_repos/fs-wrap.c
  (svn_repos_fs_commit_txn): Attempt to restore ephemeral transaction
   properties if the commit fails.


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