]> git.lyx.org Git - features.git/commitdiff
Whitespace and typo fix. (That meant: "After LyX presses OK, it will re-
authorRichard Heck <rgheck@comcast.net>
Sun, 10 Jan 2010 19:40:48 +0000 (19:40 +0000)
committerRichard Heck <rgheck@comcast.net>
Sun, 10 Jan 2010 19:40:48 +0000 (19:40 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32954 a592a061-630c-0410-9148-cb99ea01b6c8

src/VCBackend.cpp

index 5d8e33d4eaeb0951c70c6e357e22e80456729b6f..e06adb23e899db9118a5ae3336402122f3160759 100644 (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");