diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-05-24 17:41:50 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-05-24 17:41:50 +0100 |
| commit | 41fbc8cbd2e559f3d9590747bef7d37c426e3f65 (patch) | |
| tree | aca3d8e2d0b396140096c741176e0870f52f86e6 | |
| parent | 6f26904232aadfc08f3c65c10b99867d908aae23 (diff) | |
| download | svn2git-41fbc8cbd2e559f3d9590747bef7d37c426e3f65.tar svn2git-41fbc8cbd2e559f3d9590747bef7d37c426e3f65.tar.gz svn2git-41fbc8cbd2e559f3d9590747bef7d37c426e3f65.tar.bz2 svn2git-41fbc8cbd2e559f3d9590747bef7d37c426e3f65.tar.xz svn2git-41fbc8cbd2e559f3d9590747bef7d37c426e3f65.zip | |
Copying files as merge points fails badly.
In our case I svn cp'ed a file from mga3 updates to mga2. With this code in place, this
caused a merge of mga3 and mga2 which made the output of mga2 git log very misleading
(it had tags and commits from v195 of systemd even tho' we were only shipping v44 there).
I don't think we'll lose anything by simply not merging here.
| -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"; - } + }*/ } } |