LYXERR(Debug::LYXVC, line << "\n");
if (!line.empty())
status += line + "; ";
- if (prefixIs(line, "C ") || contains(line, "Commit failed")) {
+ if (prefixIs(line, "C ") || prefixIs(line, "CU ")
+ || contains(line, "Commit failed")) {
ifs.close();
return line;
}
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()));