svn commit: r1143736 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp

[rhuijben]

Author: rhuijben
Date: Thu Jul  7 09:52:13 2011
New Revision: 1143736

URL: http://svn.apache.org/viewvc?rev=1143736&view=rev
Log:
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().

Modified:
    subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1143736&r1=1143735&r2=1143736&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Jul  7 
09:52:13 2011
@@ -500,11 +500,11 @@ jlong SVNClient::doExport(const char *sr
     if (ctx == NULL)
         return -1;
 
-    SVN_JNI_ERR(svn_client_export4(&rev, sourcePath.c_str(),
+    SVN_JNI_ERR(svn_client_export5(&rev, sourcePath.c_str(),
                                    destinationPath.c_str(),
                                    pegRevision.revision(),
                                    revision.revision(), force,
-                                   ignoreExternals,
+                                   ignoreExternals, FALSE,
                                    depth,
                                    nativeEOL, ctx,
                                    requestPool.pool()),
@@ -613,12 +613,12 @@ void SVNClient::merge(const char *path1,
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_merge3(srcPath1.c_str(), revision1.revision(),
+    SVN_JNI_ERR(svn_client_merge4(srcPath1.c_str(), revision1.revision(),
                                   srcPath2.c_str(), revision2.revision(),
                                   intLocalPath.c_str(),
                                   depth,
                                   ignoreAncestry, force, recordOnly, dryRun,
-                                  NULL, ctx, requestPool.pool()), );
+                                  TRUE, NULL, ctx, requestPool.pool()), );
 }
 
 void SVNClient::merge(const char *path, Revision &pegRevision,
@@ -668,13 +668,13 @@ void SVNClient::merge(const char *path, 
             return;
     }
 
-    SVN_JNI_ERR(svn_client_merge_peg3(srcPath.c_str(),
+    SVN_JNI_ERR(svn_client_merge_peg4(srcPath.c_str(),
                                       ranges,
                                       pegRevision.revision(),
                                       intLocalPath.c_str(),
                                       depth,
                                       ignoreAncestry, force, recordOnly,
-                                      dryRun, NULL, ctx,
+                                      dryRun, TRUE, NULL, ctx,
                                       requestPool.pool()), );
 }