From 20c6b090295adecc8b3944b833d4582565d84cb8 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 14 Jul 2010 15:58:09 +0400
Subject: [PATCH] SVN: one-click merge: check for switched copies (cherry
 picked from commit aaf8e546f1deb62c39f7fddaaa6a412f150e236a)

---
 .../src/org/jetbrains/idea/svn/dialogs/QuickMerge.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
index 7fc43978c503..4e953a8877e8 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
@@ -37,6 +37,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import com.intellij.util.PairConsumer;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.idea.svn.NestedCopyType;
 import org.jetbrains.idea.svn.SvnBranchConfigurationManager;
 import org.jetbrains.idea.svn.SvnVcs;
 import org.jetbrains.idea.svn.actions.ChangeListsMergerFactory;
@@ -154,7 +155,8 @@ public class QuickMerge {
     boolean switchedFound = false;
     for (WCInfo wcInfo : infoList) {
       try {
-        if (FileUtil.isAncestor(new File(myWcInfo.getPath()), new File(wcInfo.getPath()), true)) {
+        if (FileUtil.isAncestor(new File(myWcInfo.getPath()), new File(wcInfo.getPath()), true)
+            && NestedCopyType.switched.equals(wcInfo.getType())) {
           switchedFound = true;
           break;
         }