From 2d82c3f0c8ca344f2171b1246646ca5f4e0e23f2 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 14 Jul 2010 15:42:51 +0400 Subject: [PATCH] SVN: one-click merge/integrate to branch: correctly process merge cancellation (if stopped in the middle, do not take next changelist) (cherry picked from commit 835ed1c8c9b3d8620ff04c3979c44c9b8c428cf3) --- .../src/org/jetbrains/idea/svn/history/FirstInBranch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java index 7496e97f473d..6a82be732bbb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java @@ -120,11 +120,11 @@ public class FirstInBranch implements Runnable { if ('A' == path.getType()) { if ((myBranchUrl.equals(localPath) || SVNPathUtil.isAncestor(localPath, myBranchUrl)) && - (myTrunkUrl.equals(copyPath)) || SVNPathUtil.isAncestor(copyPath, myTrunkUrl)) { + ((myTrunkUrl.equals(copyPath)) || SVNPathUtil.isAncestor(copyPath, myTrunkUrl))) { result.consume(new CopyData(path.getCopyRevision(), logEntry.getRevision(), true)); } else { if ((myBranchUrl.equals(copyPath) || SVNPathUtil.isAncestor(copyPath, myBranchUrl)) && - (myTrunkUrl.equals(localPath)) || SVNPathUtil.isAncestor(localPath, myTrunkUrl)) { + ((myTrunkUrl.equals(localPath)) || SVNPathUtil.isAncestor(localPath, myTrunkUrl))) { result.consume(new CopyData(path.getCopyRevision(), logEntry.getRevision(), false)); } }