1 files changed, 16 insertions, 16 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnKitMergeClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnKitMergeClient.java
index e3635ff8827b..51cbc7c10409 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnKitMergeClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnKitMergeClient.java
@@ -4,11 +4,11 @@ import com.intellij.openapi.vcs.VcsException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.api.BaseSvnClient;
-import org.tmatesoft.svn.core.SVNDepth;
+import org.jetbrains.idea.svn.api.Depth;
+import org.jetbrains.idea.svn.api.ProgressTracker;
+import org.jetbrains.idea.svn.diff.DiffOptions;
 import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.wc.ISVNEventHandler;
 import org.tmatesoft.svn.core.wc.SVNDiffClient;
-import org.tmatesoft.svn.core.wc.SVNDiffOptions;
 import org.tmatesoft.svn.core.wc.SVNRevisionRange;
 import org.tmatesoft.svn.core.wc2.SvnTarget;
 
@@ -23,8 +23,8 @@ public class SvnKitMergeClient extends BaseSvnClient implements MergeClient {
   public void merge(@NotNull SvnTarget source,
                     @NotNull File destination,
                     boolean dryRun,
-                    @Nullable SVNDiffOptions diffOptions,
-                    @Nullable ISVNEventHandler handler) throws VcsException {
+                    @Nullable DiffOptions diffOptions,
+                    @Nullable ProgressTracker handler) throws VcsException {
     assertUrl(source);
 
     try {
@@ -39,17 +39,17 @@ public class SvnKitMergeClient extends BaseSvnClient implements MergeClient {
   public void merge(@NotNull SvnTarget source,
                     @NotNull SVNRevisionRange range,
                     @NotNull File destination,
-                    @Nullable SVNDepth depth,
+                    @Nullable Depth depth,
                     boolean dryRun,
                     boolean recordOnly,
                     boolean force,
-                    @Nullable SVNDiffOptions diffOptions,
-                    @Nullable ISVNEventHandler handler) throws VcsException {
+                    @Nullable DiffOptions diffOptions,
+                    @Nullable ProgressTracker handler) throws VcsException {
     assertUrl(source);
 
     try {
       createClient(diffOptions, handler).doMerge(source.getURL(), source.getPegRevision(), Collections.singletonList(range), destination,
-                                                 depth, true, force, dryRun, recordOnly);
+                                                 toDepth(depth), true, force, dryRun, recordOnly);
     }
     catch (SVNException e) {
       throw new VcsException(e);
@@ -60,19 +60,19 @@ public class SvnKitMergeClient extends BaseSvnClient implements MergeClient {
   public void merge(@NotNull SvnTarget source1,
                     @NotNull SvnTarget source2,
                     @NotNull File destination,
-                    @Nullable SVNDepth depth,
+                    @Nullable Depth depth,
                     boolean useAncestry,
                     boolean dryRun,
                     boolean recordOnly,
                     boolean force,
-                    @Nullable SVNDiffOptions diffOptions,
-                    @Nullable ISVNEventHandler handler) throws VcsException {
+                    @Nullable DiffOptions diffOptions,
+                    @Nullable ProgressTracker handler) throws VcsException {
     assertUrl(source1);
     assertUrl(source2);
 
     try {
       createClient(diffOptions, handler).doMerge(source1.getURL(), source1.getPegRevision(), source2.getURL(), source2.getPegRevision(),
-                                                 destination, depth, useAncestry, force, dryRun, recordOnly);
+                                                 destination, toDepth(depth), useAncestry, force, dryRun, recordOnly);
     }
     catch (SVNException e) {
       throw new VcsException(e);
@@ -80,11 +80,11 @@ public class SvnKitMergeClient extends BaseSvnClient implements MergeClient {
   }
 
   @NotNull
-  private SVNDiffClient createClient(@Nullable SVNDiffOptions diffOptions, @Nullable ISVNEventHandler handler) {
+  private SVNDiffClient createClient(@Nullable DiffOptions diffOptions, @Nullable ProgressTracker handler) {
     SVNDiffClient client = myVcs.getSvnKitManager().createDiffClient();
 
-    client.setMergeOptions(diffOptions);
-    client.setEventHandler(handler);
+    client.setMergeOptions(toDiffOptions(diffOptions));
+    client.setEventHandler(toEventHandler(handler));
 
     return client;
   }