anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Whitespace and typo fix. (That meant: "After LyX presses OK, it will re-

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32954 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-01-10 19:40:48 +00:00
parent bafb725487
commit 5261a21e72
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/VCBackend.cpp
View File

@ -600,7 +600,7 @@ string SVN::checkIn(string const & msg)
frontend::Alert::error(_("Revision control error."),
_("Error when committing to repository.\n"
"You have to manually resolve the problem.\n"
"After pressing OK, LyX will reopen the document."));
"LyX will reopen the document after you press OK."));
else
fileLock(false, tmpf, log);
@ -628,8 +628,9 @@ string SVN::scanLogFile(FileName const & f, string & status)
while (ifs) {
getline(ifs, line);
lyxerr << line << "\n";
if (!line.empty()) status += line + "; ";
LYXERR(Debug::LYXVC, line << "\n");
if (!line.empty())
status += line + "; ";
if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
ifs.close();
return line;
@ -753,7 +754,7 @@ string SVN::repoUpdate()
// FileName(owner_->filePath()));
// res = "Revert log:\n" + tmpf.fileContents("UTF-8");
doVCCommand("svn update --accept mine-full " + quoteName(owner_->filePath())
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
res += "Update log:\n" + tmpf.fileContents("UTF-8");