diff options
| author | Torgny Nyblom <kde@nyblom.org> | 2010-12-16 11:34:39 +0100 |
|---|---|---|
| committer | Torgny Nyblom <kde@nyblom.org> | 2010-12-21 10:42:44 +0100 |
| commit | d57295761cdea09bc93a73c0189c971da29b92a4 (patch) | |
| tree | 4eacb4c441eacc0d3755158bf16727ef99a0f098 /src | |
| parent | 1eacf0f983ef27e8795460b9dc5973f2fb063864 (diff) | |
| download | svn2git-d57295761cdea09bc93a73c0189c971da29b92a4.tar svn2git-d57295761cdea09bc93a73c0189c971da29b92a4.tar.gz svn2git-d57295761cdea09bc93a73c0189c971da29b92a4.tar.bz2 svn2git-d57295761cdea09bc93a73c0189c971da29b92a4.tar.xz svn2git-d57295761cdea09bc93a73c0189c971da29b92a4.zip | |
Make sure that there are merges recorded before trying to read the last one
Diffstat (limited to 'src')
| -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(); |