From aee80cae7588fc9e6fa8f45dd149989ac0ad23a0 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Fri, 20 May 2016 18:47:41 +0300
Subject: [PATCH] [patch]:  remove unnecessary userData flag

---
 .../openapi/vcs/changes/patch/CreatePatchCommitExecutor.java    | 2 --
 .../idea/svn/treeConflict/ApplyPatchSaveToFileExecutor.java     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
index 61655b4f6dbe..a1510a79fa74 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
@@ -23,7 +23,6 @@ import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP;
 import com.intellij.openapi.diff.impl.patch.FilePatch;
 import com.intellij.openapi.diff.impl.patch.IdeaTextPatchBuilder;
 import com.intellij.openapi.progress.ProcessCanceledException;
@@ -182,7 +181,6 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr
         }, ModalityState.NON_MODAL, myProject);
         return;
       }
-      myCommitContext.putUserData(BaseRevisionTextPatchEP.ourPutBaseRevisionTextKey, false);
 
       int binaryCount = 0;
       for(Change change: changes) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/ApplyPatchSaveToFileExecutor.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/ApplyPatchSaveToFileExecutor.java
index ed693fb5a10e..91368ac3ec5d 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/ApplyPatchSaveToFileExecutor.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/ApplyPatchSaveToFileExecutor.java
@@ -17,7 +17,6 @@ package org.jetbrains.idea.svn.treeConflict;
 
 import com.intellij.CommonBundle;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP;
 import com.intellij.openapi.diff.impl.patch.FilePatch;
 import com.intellij.openapi.diff.impl.patch.PatchSyntaxException;
 import com.intellij.openapi.diff.impl.patch.TextFilePatch;
@@ -88,7 +87,6 @@ public class ApplyPatchSaveToFileExecutor implements ApplyPatchExecutor<TextFile
       final VirtualFile baseForPatch = myBaseForPatch == null ? baseDir : myBaseForPatch;
       try {
         final List<FilePatch> textPatches = patchGroupsToOneGroup(patchGroupsToApply, baseForPatch);
-        commitContext.putUserData(BaseRevisionTextPatchEP.ourPutBaseRevisionTextKey, false);
         PatchWriter.writePatches(myProject, save.getFile().getPath(), textPatches, commitContext, CharsetToolkit.UTF8_CHARSET);
       }
       catch (final IOException e) {