Use 1.7 versions of a few libsvn_client functions in javahl. (There should be no functional changes)
Use 1.7 versions of a few libsvn_client functions in javahl.
(There should be no functional changes)

* subversion/bindings/javahl/native/SVNClient.cpp
  (SVNClient::doExport): Use svn_client_export5().
  (SVNClient::merge): Use svn_client_merge4().
  (SVNClient::merge): Use svn_client_merge_peg4().


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1143736 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion