From c7428e92dbcd865ed80ce49b6baf80ab84c4c4cd Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 25 Jul 2012 21:27:28 +0400
Subject: [PATCH] SVN: additional fix for encoding + shelf - when default
 encoding is not UTF-8

---
 .../openapi/vcs/changes/shelf/ShelveChangesManager.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
index 647a28e455b8..474980a5b5fd 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
@@ -666,7 +666,7 @@ public class ShelveChangesManager implements ProjectComponent, JDOMExternalizabl
 
   // todo problem: control usage
   public static List<TextFilePatch> loadPatches(Project project, final String patchPath, CommitContext commitContext) throws IOException, PatchSyntaxException {
-    char[] text = FileUtil.loadFileText(new File(patchPath));
+    char[] text = FileUtil.loadFileText(new File(patchPath), CharsetToolkit.UTF8);
     PatchReader reader = new PatchReader(new CharArrayCharSequence(text));
     final List<TextFilePatch> textFilePatches = reader.readAllPatches();
     final TransparentlyFailedValue<Map<String, Map<String, CharSequence>>, PatchSyntaxException> additionalInfo = reader.getAdditionalInfo(