diff options
| -rw-r--r-- | src/repository.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/repository.cpp b/src/repository.cpp index d071ce6..dc184ef 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -681,10 +681,10 @@ void FastImportRepository::Transaction::setLog(const QByteArray &l) void FastImportRepository::Transaction::noteCopyFromBranch(const QString &branchFrom, int branchRevNum) { - //if(branch == branchFrom) { - // qWarning() << "Cannot merge inside a branch"; - // return; - //} + if(branch == branchFrom) { + qWarning() << "Cannot merge inside a branch"; + return; + } static QByteArray dummy; int mark = repository->markFrom(branchFrom, branchRevNum, dummy); Q_ASSERT(dummy.isEmpty()); |