From 41fbc8cbd2e559f3d9590747bef7d37c426e3f65 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 24 May 2014 17:41:50 +0100 Subject: 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. --- src/repository.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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"; - } + }*/ } } -- cgit v1.2.1