Make the fake sequence for braces highly unlikely (addressing #6478).

[lyx.git] / src / VCBackend.cpp

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 5d8e33d4eaeb0951c70c6e357e22e80456729b6f..106581e105f9d4de4a899c9ccaec0ff1f3e3a60f 100644 (file)
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -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,9 +628,11 @@ string SVN::scanLogFile(FileName const & f, string & status)
 
        while (ifs) {
                getline(ifs, line);
-               lyxerr << line << "\n";
-               if (!line.empty()) status += line + "; ";
-               if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
+               LYXERR(Debug::LYXVC, line << "\n");
+               if (!line.empty()) 
+                       status += line + "; ";
+               if (prefixIs(line, "C ") || prefixIs(line, "CU ")
+                                        || contains(line, "Commit failed")) {
                        ifs.close();
                        return line;
                }
@@ -684,7 +686,7 @@ string SVN::checkOut()
                return N_("Error: Could not generate logfile.");
        }
 
-       doVCCommand("svn update " + quoteName(onlyFilename(owner_->absFileName()))
+       doVCCommand("svn update --non-interactive " + quoteName(onlyFilename(owner_->absFileName()))
                    + " > " + quoteName(tmpf.toFilesystemEncoding()),
                    FileName(owner_->filePath()));
 
@@ -753,7 +755,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");