diff options
Diffstat (limited to 'src/repository.cpp')
| -rw-r--r-- | src/repository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |