From d57295761cdea09bc93a73c0189c971da29b92a4 Mon Sep 17 00:00:00 2001
From: Torgny Nyblom <kde@nyblom.org>
Date: Thu, 16 Dec 2010 11:34:39 +0100
Subject: Make sure that there are merges recorded before trying to read the
 last one

---
 src/repository.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/repository.cpp b/src/repository.cpp
index 88cd196..b362bdf 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -648,7 +648,7 @@ void Repository::Transaction::commit()
     QByteArray desc = "";
     int i = !!parentmark;	// if parentmark != 0, there's at least one parent
 
-    if(log.contains("This commit was manufactured by cvs2svn to create ")) {
+    if(log.contains("This commit was manufactured by cvs2svn to create ") && !merges.isEmpty()) {
         qSort(merges);
         repository->fastImport.write("merge :" + QByteArray::number(merges.last()) + "\n");
         merges.pop_back();
-- 
cgit v1.2.1