anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 05:40:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Next possibility for svn conflict in log parsing.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33021 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-01-14 01:03:42 +00:00
parent aa2fac50eb
commit 1ec5b915af
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/VCBackend.cpp
View File

@ -631,7 +631,8 @@ string SVN::scanLogFile(FileName const & f, string & status)
LYXERR(Debug::LYXVC, line << "\n"); LYXERR(Debug::LYXVC, line << "\n");
if (!line.empty()) if (!line.empty())
status += line + "; "; status += line + "; ";
if (prefixIs(line, "C ") || contains(line, "Commit failed")) { if (prefixIs(line, "C ") || prefixIs(line, "CU ")
|| contains(line, "Commit failed")) {
ifs.close(); ifs.close();
return line; return line;
} }