MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SVN: one-click merge: check for switched copies

Browse Source 
(cherry picked from commit aaf8e546f1deb62c39f7fddaaa6a412f150e236a)
This commit is contained in:
irengrig
2010-07-14 15:58:09 +04:00
parent 64da99feb9
commit 20c6b09029
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
+3 -1
View File
@@ -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;
}