From 0c1895ae9e116b6d59cd541f06ec3d116ecff6fa Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Thu, 1 Jul 2010 08:24:52 +0530 Subject: Handle same branch copies using createBranch to allow reseating branch tip to an older revision. --- src/svn.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/svn.cpp b/src/svn.cpp index bb00214..a4bf4e6 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -615,19 +615,19 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha << qPrintable(prevrepository) << "branch" << qPrintable(prevbranch) << "path" << qPrintable(prevpath) << "rev" << rev_from << ")"; - } else if (prevbranch == branch) { - // same branch and same repository - qDebug() << qPrintable(current) << "rev" << revnum - << "is an SVN rename from" - << qPrintable(previous) << "rev" << rev_from; - return EXIT_SUCCESS; } else { - // same repository but not same branch - // this means this is a plain branch - qDebug() << qPrintable(repository) << ": branch" - << qPrintable(branch) << "is branching from" - << qPrintable(prevbranch); - + if (prevbranch == branch) { + // same branch and same repository + qDebug() << qPrintable(current) << "rev" << revnum + << "is an SVN rename from" + << qPrintable(previous) << "rev" << rev_from; + } else { + // same repository but not same branch + // this means this is a plain branch + qDebug() << qPrintable(repository) << ": branch" + << qPrintable(branch) << "is branching from" + << qPrintable(prevbranch); + } Repository *repo = repositories.value(repository, 0); if (!repo) { qCritical() << "Rule" << rule -- cgit v1.2.1