Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan McGovern <alan.mcgovern@gmail.com>2011-11-29 18:28:56 +0400
committerAlan McGovern <alan.mcgovern@gmail.com>2011-11-29 18:30:31 +0400
commit797998014c9d7dd3449e46a4f2877d6c7e74e87e (patch)
tree0e147f60b08d6757f25a38c00cec2797c2ffbd7c
parent3edbda8dbfc3bb4a1870b57b2605b4676b8e865b (diff)
[Svn] Use the TextFile api to open the diff file
Potential fix for bug #1766, though without a testcase it's hard to tell.
-rw-r--r--main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
index f168a3c555..7ee1955251 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs
@@ -880,9 +880,7 @@ namespace MonoDevelop.VersionControl.Subversion.Unix
string npath1 = NormalizePath (path1, localpool);
string npath2 = NormalizePath (path2, localpool);
CheckError (svn.client_diff (options, npath1, ref revision1, npath2, ref revision2, (recursive ? 1 : 0), 0, 1, outfile, errfile, ctx, localpool));
- using (StreamReader sr = new StreamReader (fout)) {
- return sr.ReadToEnd ();
- }
+ return MonoDevelop.Projects.Text.TextFile.ReadFile (fout).Text;
} else {
throw new Exception ("Could not get diff information");
}