From: Pavel Sanda <sanda@lyx.org>
Date: Thu, 14 Jan 2010 01:03:42 +0000 (+0000)
Subject: Next possibility for svn conflict in log parsing.
X-Git-Tag: 2.0.0~4376
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1ec5b915afca6dd88d7242deb724d09b11b60d41;p=features.git

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
---

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index e06adb23e8..623c4b7bbd 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -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;
 		}