diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2010-07-01 08:24:52 +0530 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2010-07-01 08:24:52 +0530 |
| commit | 0c1895ae9e116b6d59cd541f06ec3d116ecff6fa (patch) | |
| tree | 9ad29270be29dc655e067b9da96e2465ecdfd624 | |
| parent | 5092b0eb41426803022338c9f9709b2119da93e9 (diff) | |
| download | svn2git-0c1895ae9e116b6d59cd541f06ec3d116ecff6fa.tar svn2git-0c1895ae9e116b6d59cd541f06ec3d116ecff6fa.tar.gz svn2git-0c1895ae9e116b6d59cd541f06ec3d116ecff6fa.tar.bz2 svn2git-0c1895ae9e116b6d59cd541f06ec3d116ecff6fa.tar.xz svn2git-0c1895ae9e116b6d59cd541f06ec3d116ecff6fa.zip | |
Handle same branch copies using createBranch to allow reseating
branch tip to an older revision.
| -rw-r--r-- | src/svn.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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 |