Skip to content

Commit c018741

Browse files
committed
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>
1 parent 51e59b5 commit c018741

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

src/svn.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -779,18 +779,6 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha
779779
transactions.insert(repository + branch, txn);
780780
}
781781

782-
//
783-
// If this path was copied from elsewhere, use it to infer _some_
784-
// merge points. This heuristic is fairly useful for tracking
785-
// changes across directory re-organizations and wholesale branch
786-
// imports.
787-
//
788-
if (path_from != NULL && prevrepository == repository && prevbranch != branch) {
789-
if(ruledebug)
790-
qDebug() << "copy from branch" << prevbranch << "to branch" << branch << "@rev" << rev_from;
791-
txn->noteCopyFromBranch (prevbranch, rev_from);
792-
}
793-
794782
if (change->change_kind == svn_fs_path_change_replace && path_from == NULL) {
795783
if(ruledebug)
796784
qDebug() << "replaced with empty path (" << branch << path << ")";

0 commit comments

Comments
 (0)