1 files changed, 14 insertions, 14 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/CmdMergeClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/CmdMergeClient.java
index 63eb66d9b002..2f9d8ae5aac5 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/CmdMergeClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/CmdMergeClient.java
@@ -4,10 +4,10 @@ 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.jetbrains.idea.svn.api.Depth;
+import org.jetbrains.idea.svn.api.ProgressTracker;
 import org.jetbrains.idea.svn.commandLine.*;
-import org.tmatesoft.svn.core.SVNDepth;
-import org.tmatesoft.svn.core.wc.ISVNEventHandler;
-import org.tmatesoft.svn.core.wc.SVNDiffOptions;
+import org.jetbrains.idea.svn.diff.DiffOptions;
 import org.tmatesoft.svn.core.wc.SVNRevisionRange;
 import org.tmatesoft.svn.core.wc2.SvnTarget;
 
@@ -23,8 +23,8 @@ public class CmdMergeClient extends BaseSvnClient implements MergeClient {
   public void merge(@NotNull SvnTarget source,
                     @NotNull File destination,
                     boolean dryRun,
-                    @Nullable SVNDiffOptions diffOptions,
-                    @Nullable final ISVNEventHandler handler) throws VcsException {
+                    @Nullable DiffOptions diffOptions,
+                    @Nullable final ProgressTracker handler) throws VcsException {
     assertUrl(source);
 
     List<String> parameters = new ArrayList<String>();
@@ -38,12 +38,12 @@ public class CmdMergeClient 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);
 
     List<String> parameters = new ArrayList<String>();
@@ -60,13 +60,13 @@ public class CmdMergeClient 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);
 
@@ -82,12 +82,12 @@ public class CmdMergeClient extends BaseSvnClient implements MergeClient {
 
   private static void fillParameters(@NotNull List<String> parameters,
                                      @NotNull File destination,
-                                     @Nullable SVNDepth depth,
+                                     @Nullable Depth depth,
                                      boolean dryRun,
                                      boolean recordOnly,
                                      boolean force,
                                      boolean reintegrate,
-                                     @Nullable SVNDiffOptions diffOptions) {
+                                     @Nullable DiffOptions diffOptions) {
     CommandUtil.put(parameters, destination);
     CommandUtil.put(parameters, diffOptions);
     CommandUtil.put(parameters, dryRun, "--dry-run");
@@ -102,7 +102,7 @@ public class CmdMergeClient extends BaseSvnClient implements MergeClient {
     CommandUtil.put(parameters, reintegrate, "--reintegrate");
   }
 
-  private void run(File destination, ISVNEventHandler handler, List<String> parameters) throws VcsException {
+  private void run(File destination, ProgressTracker handler, List<String> parameters) throws VcsException {
     BaseUpdateCommandListener listener = new BaseUpdateCommandListener(CommandUtil.correctUpToExistingParent(destination), handler);
 
     execute(myVcs, SvnTarget.fromFile(destination), SvnCommandName.merge, parameters, listener);