From 56239162fb090c956b9a2db4dcbb59940e79eb13 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 24 Dec 2013 17:10:51 +0400 Subject: [PATCH] [vcs] IDEA-95729 Don't ask about adding new files from patch to VCS If a file is ADDED in a patch or a shelf or revert from a VCS commits, there is no sense in asking if user wants the file to be added: of course he does. Anyway, keeping the option: maybe users will give some feedback for the reverse case. --- .../diff/impl/patch/formove/TriggerAdditionOrDeletion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/TriggerAdditionOrDeletion.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/TriggerAdditionOrDeletion.java index b74937583127..84b2af4afcba 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/TriggerAdditionOrDeletion.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/TriggerAdditionOrDeletion.java @@ -45,7 +45,7 @@ public class TriggerAdditionOrDeletion { public TriggerAdditionOrDeletion(final Project project, boolean silentAddDelete) { myProject = project; - mySilentAddDelete = silentAddDelete; + mySilentAddDelete = true; // TODO there is no sense in making add/remove non-silent anywhen; wait for users feedback, then remove myExisting = new HashSet(); myDeleted = new HashSet(); myVcsManager = ProjectLevelVcsManager.getInstance(myProject);