IDEA-56214 Perforce: Integrate project with conflicts doesn't clear read-only status for files

platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java

@@ -218,6 +218,10 @@ public class MultipleFileMergeDialog extends DialogWrapper {
     super.dispose();
   }
 
+  protected boolean beforeResolve(Collection<VirtualFile> files) {
+    return true;
+  }
+
   @Override
   @NonNls
   protected String getDimensionServiceKey() {
@@ -227,6 +231,10 @@ public class MultipleFileMergeDialog extends DialogWrapper {
   private void acceptRevision(final boolean isCurrent) {
     FileDocumentManager.getInstance().saveAllDocuments();
     final Collection<VirtualFile> files = myTable.getSelection();
+    if (!beforeResolve(files)) {
+      return;
+    }
+    
     for (final VirtualFile file : files) {
       final Ref<Exception> ex = new Ref<Exception>();
       ApplicationManager.getApplication().runWriteAction(new Runnable() {
@@ -297,7 +305,12 @@ public class MultipleFileMergeDialog extends DialogWrapper {
 
   private void showMergeDialog() {
     DiffRequestFactory requestFactory = DiffRequestFactory.getInstance();
-    for (final VirtualFile file : myTable.getSelection()) {
+    Collection<VirtualFile> files = myTable.getSelection();
+    if (!beforeResolve(files)) {
+      return;
+    }
+    
+    for (final VirtualFile file : files) {
       final MergeData mergeData;
       try {
         mergeData = myProvider.loadRevisions(file);