aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTorgny Nyblom <kde@nyblom.org>2011-01-15 19:49:42 +0100
committerTorgny Nyblom <kde@nyblom.org>2011-01-15 19:49:42 +0100
commit812614b8ef3cb7ca84170ba8acb3616ee477a37a (patch)
treebe5c486e6cce51213fc492d2439e407c0924c839 /src
parentebac0993e896d18e0809fbb1167edf99b2677ac3 (diff)
downloadsvn2git-812614b8ef3cb7ca84170ba8acb3616ee477a37a.tar
svn2git-812614b8ef3cb7ca84170ba8acb3616ee477a37a.tar.gz
svn2git-812614b8ef3cb7ca84170ba8acb3616ee477a37a.tar.bz2
svn2git-812614b8ef3cb7ca84170ba8acb3616ee477a37a.tar.xz
svn2git-812614b8ef3cb7ca84170ba8acb3616ee477a37a.zip
Only print warning if it applies
Diffstat (limited to 'src')
-rw-r--r--src/repository.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repository.cpp b/src/repository.cpp
index 7baf995..4aa7695 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -651,7 +651,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 ") && !merges.isEmpty()) {
+ if(log.contains("This commit was manufactured by cvs2svn") && merges.count() > 1) {
qSort(merges);
repository->fastImport.write("merge :" + QByteArray::number(merges.last()) + "\n");
merges.pop_back();