From f172413532509bc6ece20ed0202751c25356050e Mon Sep 17 00:00:00 2001 From: Torgny Nyblom Date: Thu, 9 Sep 2010 10:02:21 +0200 Subject: Better log messages --- src/repository.cpp | 4 ++-- src/svn.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/repository.cpp b/src/repository.cpp index b21e2a1..fc8da5e 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -536,7 +536,7 @@ Repository::Transaction *FastImportRepository::newTransaction(const QString &bra { startFastImport(); if (!branches.contains(branch)) { - qWarning() << branch << "is not a known branch in repository" << name << endl + qWarning() << "Transaction:" << branch << "is not a known branch in repository" << name << endl << "Going to create it automatically"; } @@ -830,7 +830,7 @@ void FastImportRepository::Transaction::commit() + (desc.isEmpty() ? "" : " # merge from") + desc + "\n\n"); printf(" %d modifications from SVN %s to %s/%s", - deletedFiles.count() + modifiedFiles.count(), svnprefix.data(), + deletedFiles.count() + modifiedFiles.count('\n'), svnprefix.data(), qPrintable(repository->name), branch.data()); while (repository->fastImport.bytesToWrite()) diff --git a/src/svn.cpp b/src/svn.cpp index bf1443c..dd3ce53 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -716,9 +716,9 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha // changes across directory re-organizations and wholesale branch // imports. // - if (path_from != NULL && prevrepository == repository) { + if (path_from != NULL && prevrepository == repository && prevbranch != branch) { if(ruledebug) - qDebug() << "copy from branch" << prevbranch << "rev" << rev_from; + qDebug() << "copy from branch" << prevbranch << "to branch" << branch << "@rev" << rev_from; txn->noteCopyFromBranch (prevbranch, rev_from); } -- cgit v1.2.1