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;
   }