mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Next possibility for svn conflict in log parsing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33021 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
aa2fac50eb
commit
1ec5b915af
@ -631,7 +631,8 @@ string SVN::scanLogFile(FileName const & f, string & status)
|
||||
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user