diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextFilePatch.java b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextFilePatch.java
index d06e555d59b8..1a9520eab575 100644
--- a/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextFilePatch.java
+++ b/platform/vcs-api/vcs-api-core/src/com/intellij/openapi/diff/impl/patch/TextFilePatch.java
@@ -67,7 +67,8 @@ public class TextFilePatch extends FilePatch {
     return myHunks.size() == 1 && myHunks.get(0).isNewContent();
   }
 
-  public String getNewFileText() {
+  public String getSingleHunkPatchText() {
+    assert myHunks.size() == 1;
     return myHunks.get(0).getText();
   }
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/ApplyTextFilePatch.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/ApplyTextFilePatch.java
index b94a0d3b048d..e5feb52b25f3 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/ApplyTextFilePatch.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/ApplyTextFilePatch.java
@@ -80,7 +80,7 @@ public class ApplyTextFilePatch extends ApplyFilePatchBase<TextFilePatch> {
         //
       }
     }
-    document.setText(myPatch.getNewFileText());
+    document.setText(myPatch.getSingleHunkPatchText());
     FileDocumentManager.getInstance().saveDocument(document);
   }
 }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java
index 404c03730a56..8fc355868712 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java
@@ -53,7 +53,7 @@ public class TextFilePatchInProgress extends AbstractFilePatchInProgress<TextFil
       myConflicts = null;
       if (FilePatchStatus.ADDED.equals(myStatus)) {
         final FilePath newFilePath = VcsUtil.getFilePath(myIoCurrentBase, false);
-        final String content = myPatch.getNewFileText();
+        final String content = myPatch.getSingleHunkPatchText();
         myNewContentRevision = new SimpleContentRevision(content, newFilePath, myPatch.getAfterVersionId());
       }
       else {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
index 8b9c37d1aec4..8f07765c07da 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
@@ -220,7 +220,7 @@ public class ShelvedChange {
 
     private String loadContent(final TextFilePatch patch) throws ApplyPatchException {
       if (patch.isNewFile()) {
-        return patch.getNewFileText();
+        return patch.getSingleHunkPatchText();
       }
       if (patch.isDeletedFile()) {
         return null;