On the 1.6.x-svn_fs_commit_txn branch, merge in r1053233 from trunk.

Additionally:

* subversion/include/svn_error.h,
* subversion/libsvn_subr/error.c,
* subversion/mod_dav_svn/deadprops.c,
* subversion/mod_dav_svn/util.c,
* subversion/tests/libsvn_subr/error-test.c:
  Revert these files since the revision only modified svn_error_purge_tracing()
  which doesn't exist in this branch, the remaining changes relating to
  svn_repos__post_commit_error_str() were kept.

Original log message:

Make semantics of svn_error_purge_tracing() and
svn_repos__post_commit_error_str() easier to work with.  Now, both do
not modify the input error chain and svn_error_purge_tracing() returns
a new chain instead of modifying the input chain.

* subversion/include/private/svn_repos_private.h
  (svn_repos__validate_prop):
    Document that this does not modify the input error.

* subversion/include/svn_error.h
  (svn_error_purge_tracing):
    Document that the input chain is not modified and should be the
    chain that is cleared, not the returned chain.

* subversion/libsvn_repos/commit.c
  (svn_repos__post_commit_error_str):
    No longer clear the input error chain.
  (clear):
    Clear the error after calling svn_repos__post_commit_error_str().

* subversion/libsvn_subr/error.c
  (svn_error_purge_tracing):
    Reimplement to match the documented behavior.

* subversion/mod_dav_svn/deadprops.c
  (save_value):
    Now that the error passed to svn_error_purge_tracing() should be
    cleared instead of the returned error, use another variable to
    hold the purged chain.

* subversion/mod_dav_svn/util.c
  (dav_svn__convert_err):
    Now that the error passed to svn_error_purge_tracing() should be
    cleared instead of the returned error, use another variable to
    hold the purged chain.

* subversion/mod_dav_svn/version.c
  (dav_svn__checkin),
  (merge):
    Clear the error after calling svn_repos__post_commit_error_str().

* subversion/tests/libsvn_subr/error-test.c
  (test_error_purge_tracing):
    Update to use the new line number that svn_error_purge_tracing()
    calls SVN_ERR_ASSERT(err).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-svn_fs_commit_txn@1053496 13f79535-47bb-0310-9956-ffa450edef68
3 files changed