aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorgny Nyblom <kde@nyblom.org>2010-09-09 10:02:21 +0200
committerTorgny Nyblom <kde@nyblom.org>2010-09-09 10:02:21 +0200
commitf172413532509bc6ece20ed0202751c25356050e (patch)
tree5f5175e6a87ec5380e165de191c2c7bd988f2cf8
parentb9ad61d5c610e11c59e9228c9886266ba6905ce8 (diff)
downloadsvn2git-f172413532509bc6ece20ed0202751c25356050e.tar
svn2git-f172413532509bc6ece20ed0202751c25356050e.tar.gz
svn2git-f172413532509bc6ece20ed0202751c25356050e.tar.bz2
svn2git-f172413532509bc6ece20ed0202751c25356050e.tar.xz
svn2git-f172413532509bc6ece20ed0202751c25356050e.zip
Better log messages
-rw-r--r--src/repository.cpp4
-rw-r--r--src/svn.cpp4
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);
}