diff options
author | Ulrich Spörlein <uqs@spoerlein.net> | 2012-09-19 21:59:35 +0200 |
---|---|---|
committer | Ulrich Spörlein <uqs@spoerlein.net> | 2012-09-19 22:02:52 +0200 |
commit | c0187417902b10698135727d911ab9018f4941eb (patch) | |
tree | a221ee95e875d34217bad7e18513e38f8f1ec047 | |
parent | 51e59b58c2deb94312a72291be0d76749010e015 (diff) | |
download | svn2git-c0187417902b10698135727d911ab9018f4941eb.tar svn2git-c0187417902b10698135727d911ab9018f4941eb.tar.gz svn2git-c0187417902b10698135727d911ab9018f4941eb.tar.bz2 svn2git-c0187417902b10698135727d911ab9018f4941eb.tar.xz svn2git-c0187417902b10698135727d911ab9018f4941eb.zip |
Remove the branch copy heuristic
The FreeBSD project has a different approach to branches than the
standard SVN or GIT models of how branches should work. An MFC from
head/ to stable/8 is a cherry-pick in git and should never result in a
merge commit.
Sadly, this means that "IFCs" from head/ to project/foo also no longer
are merge commits, though they really are ...
Reported by: Ryan Stone <rysto32@gmail.com>
-rw-r--r-- | src/svn.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/svn.cpp b/src/svn.cpp index 92c8abf..0c28cf2 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -779,18 +779,6 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha transactions.insert(repository + branch, txn); } - // - // If this path was copied from elsewhere, use it to infer _some_ - // merge points. This heuristic is fairly useful for tracking - // changes across directory re-organizations and wholesale branch - // imports. - // - if (path_from != NULL && prevrepository == repository && prevbranch != branch) { - if(ruledebug) - qDebug() << "copy from branch" << prevbranch << "to branch" << branch << "@rev" << rev_from; - txn->noteCopyFromBranch (prevbranch, rev_from); - } - if (change->change_kind == svn_fs_path_change_replace && path_from == NULL) { if(ruledebug) qDebug() << "replaced with empty path (" << branch << path << ")"; |