diff options
Diffstat (limited to 'src/repository.cpp')
| -rw-r--r-- | src/repository.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/repository.cpp b/src/repository.cpp index d33e218..2fbe2a5 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -636,12 +636,12 @@ void Repository::Transaction::noteCopyFromBranch(const QString &branchFrom, int } else { qWarning() << "WARN: repository " + repository->name + " branch " + branch + " has some files copied from " + branchFrom + "@" + QByteArray::number(branchRevNum); - if (!merges.contains(mark)) { + /*if (!merges.contains(mark)) { merges.append(mark); qDebug() << "adding" << branchFrom + "@" + QByteArray::number(branchRevNum) << ":" << mark << "as a merge point"; } else { qDebug() << "merge point already recorded"; - } + }*/ } } |