Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-02-08 22:15:29 +0000
committerjames2002-02-08 22:15:29 +0000
commitf1ff12fe0dd3a79a4e3205dbdd6e0e43aa24f6a9 (patch)
tree626d3ab39347fe76bff4d5c9c34ce29af32f4216
parent04a2e17a00a28d350621db04c51c944cc92611d5 (diff)
downloadeclipse.platform.team-f1ff12fe0dd3a79a4e3205dbdd6e0e43aa24f6a9.tar.gz
eclipse.platform.team-f1ff12fe0dd3a79a4e3205dbdd6e0e43aa24f6a9.tar.xz
eclipse.platform.team-f1ff12fe0dd3a79a4e3205dbdd6e0e43aa24f6a9.zip
9283: NPE comparing project to version
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java
index da29f2d4c..c593e864a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSCompareEditorInput.java
@@ -355,10 +355,9 @@ public class CVSCompareEditorInput extends CompareEditorInput {
leftInfo.getRevision().equals(rightInfo.getRevision())) {
return NODE_EQUAL;
} else {
- // if files are on different branches then force a content comparison.
- if(leftInfo.getTag().getType() == CVSTag.BRANCH || rightInfo.getTag().getType() == CVSTag.BRANCH) {
- return NODE_UNKNOWN;
- }
+ // Optimized for most common case. There are actually cases where a file is merged from
+ // one branch to another where the revision numbers are different but the file is the same.
+ // We do not handle this case properly.
return NODE_NOT_EQUAL;
}
} catch (TeamException e) {

Back to the top