* subversion/tests/cmdline/merge_tests.py
  (conflicted_split_merge_with_resolve): Update the WC in this test before
    creating a branch, as a single-rev copy is less confusing to debug.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1459419 13f79535-47bb-0310-9956-ffa450edef68
Make the prototypes for svn_error__locate and svn_error__trace always
visible when compiling the definitions.

* subversion/include/svn_error.h
  (svn_error__locate): Wrap with SVN_ERR__TRACING instead of SVN_DEBUG.

* subversion/libsvn_subr/error.c: Ensure SVN_ERR__TRACING is defined.


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