IDEA-80577 Perforce: Offline Mode: no changes detected warning will be shown when...

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
index 02b5bf548012751ae96a73262e81f5bbd5b22fe9..2e402f5e8cca28226b95bc3f1b2aa0fa28b92f02 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
@@ -100,17 +100,20 @@ public class RollbackAction extends AnAction implements DumbAware {
     FileDocumentManager.getInstance().saveAllDocuments();
 
     List<FilePath> missingFiles = e.getData(ChangesListView.MISSING_FILES_DATA_KEY);
+    boolean hasChanges = false;
     if (missingFiles != null && !missingFiles.isEmpty()) {
+      hasChanges = true;
       new RollbackDeletionAction().actionPerformed(e);
     }
 
     List<VirtualFile> modifiedWithoutEditing = getModifiedWithoutEditing(e);
     if (modifiedWithoutEditing != null && !modifiedWithoutEditing.isEmpty()) {
+      hasChanges = true;
       rollbackModifiedWithoutEditing(project, modifiedWithoutEditing);
     }
 
     Change[] changes = getChanges(project, e);
-    if (changes != null) {
+    if (changes != null && (changes.length > 0 || !hasChanges)) {
       RollbackChangesDialog.rollbackChanges(project, Arrays.asList(changes));
     }
   }