From 7d8c163f5005093b9f21e62038f2ff50a3a02230 Mon Sep 17 00:00:00 2001 From: irengrig Date: Thu, 21 Oct 2010 20:24:32 +0400 Subject: [PATCH] VCS: do not throw change list changed falsely for added files in changelist --- .../com/intellij/openapi/vcs/changes/LocalChangeListImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java index 0c96f7792c79..a63ff756f3b4 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java @@ -219,7 +219,7 @@ public class LocalChangeListImpl extends LocalChangeList { final boolean isBinary2 = (b2 instanceof BinaryContentRevision); return rn1 != VcsRevisionNumber.NULL && rn2 != VcsRevisionNumber.NULL && rn1.compareTo(rn2) == 0 && isBinary1 == isBinary2; } - return false; + return b1 == null && b2 == null; } public synchronized boolean equals(final Object o) {