diff options
| author | Torgny Nyblom <kde@nyblom.org> | 2010-09-08 21:35:19 +0200 |
|---|---|---|
| committer | Torgny Nyblom <kde@nyblom.org> | 2010-09-08 21:35:19 +0200 |
| commit | f2fb603396b416e6516970f4ca5286a4f23c36ca (patch) | |
| tree | 180483ab4c2d0dd4729b1e440dbd99dee0e0d8d3 | |
| parent | cdba54a2cf2270f57b27c739f18c033a97155de1 (diff) | |
| download | svn2git-f2fb603396b416e6516970f4ca5286a4f23c36ca.tar svn2git-f2fb603396b416e6516970f4ca5286a4f23c36ca.tar.gz svn2git-f2fb603396b416e6516970f4ca5286a4f23c36ca.tar.bz2 svn2git-f2fb603396b416e6516970f4ca5286a4f23c36ca.tar.xz svn2git-f2fb603396b416e6516970f4ca5286a4f23c36ca.zip | |
Inter branch merging causes git log to break with fatal internal errors
| -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()); |