On the 1.7.x-issue4340-repos branch, merge r1461760 from trunk, resolving
some semantic conflicts.

* subversion/tests/libsvn_repos/repos-test.c
  (filename_with_control_chars): Account for the lack of the
   SVN_TEST_ASSERT_ERROR macro on the 1.7.x branch.
   Also, update a comment to use the current synopsis of issue #4340.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4340-repos@1480948 13f79535-47bb-0310-9956-ffa450edef68