From d585fdd30f35a06a3b7a0c15b0694754d138dd02 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Sat, 11 Feb 2012 15:21:45 +0100 Subject: [PATCH] additional checks --- .../com/intellij/openapi/diff/impl/dir/DirDiffElement.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElement.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElement.java index beb08b6a427b..c46fc1dd7ae6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElement.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffElement.java @@ -193,6 +193,11 @@ public class DirDiffElement { } public void setOperation(@NotNull DirDiffOperation operation) { + if (myType == DType.EQUAL || myType == DType.SEPARATOR) return; + if (myType == DType.TARGET && operation == COPY_TO) return; + if (myType == DType.SOURCE && operation == COPY_FROM) return; + if (myType == DType.CHANGED && operation == DELETE) return; + myOperation = operation; }