Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2003-12-11 15:43:30 +0000
committerAndre Weinand2003-12-11 15:43:30 +0000
commit300fd615fe2759cea18aa7f70dac286d126fea24 (patch)
treed3eebeecb14e8f3f5a0e1b36e14f3327711cbd83
parent47653fc9b3f3957c58235dc181c5df4649faed06 (diff)
downloadeclipse.platform.team-300fd615fe2759cea18aa7f70dac286d126fea24.tar.gz
eclipse.platform.team-300fd615fe2759cea18aa7f70dac286d126fea24.tar.xz
eclipse.platform.team-300fd615fe2759cea18aa7f70dac286d126fea24.zip
fixed #45239
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java3
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java3
2 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java
index 8002bb55f..a21e6a4cd 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java
@@ -55,7 +55,8 @@ public class MergeViewerContentProvider implements IMergeViewerContentProvider {
public boolean showAncestor(Object element) {
if (element instanceof ICompareInput)
- return (((ICompareInput)element).getKind() & Differencer.DIRECTION_MASK) == Differencer.CONFLICTING;
+ return true; // fix for #45239: Show ancestor for incoming and outgoing changes
+ //return (((ICompareInput)element).getKind() & Differencer.DIRECTION_MASK) == Differencer.CONFLICTING;
return false;
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java
index 8002bb55f..a21e6a4cd 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeViewerContentProvider.java
@@ -55,7 +55,8 @@ public class MergeViewerContentProvider implements IMergeViewerContentProvider {
public boolean showAncestor(Object element) {
if (element instanceof ICompareInput)
- return (((ICompareInput)element).getKind() & Differencer.DIRECTION_MASK) == Differencer.CONFLICTING;
+ return true; // fix for #45239: Show ancestor for incoming and outgoing changes
+ //return (((ICompareInput)element).getKind() & Differencer.DIRECTION_MASK) == Differencer.CONFLICTING;
return false;
}

Back to the top