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/integrate to branch: correctly process merge cancellation (if stopped in the middle, do not take next changelist)

Browse Source 
(cherry picked from commit 835ed1c8c9b3d8620ff04c3979c44c9b8c428cf3)
This commit is contained in:
irengrig
2010-07-14 15:42:51 +04:00
parent 575cb57b19
commit 2d82c3f0c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java
+2 -2
View File
@@ -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));
}
}