svn commit: r353761 - user/uqs/git_conv/svn2git/src

[Ulrich Spoerlein]

Author: uqs
Date: Sat Oct 19 11:47:26 2019
New Revision: 353761
URL: https://svnweb.freebsd.org/changeset/base/353761

Log:
  Prevent svn2git from recording a merge commit for r306097
  
  This would pull in all history of stable into master, and we usually merge the
  other way.
  
  Reported by:	emaste

Modified:
  user/uqs/git_conv/svn2git/src/svn.cpp

Modified: user/uqs/git_conv/svn2git/src/svn.cpp
==============================================================================
--- user/uqs/git_conv/svn2git/src/svn.cpp	Sat Oct 19 08:22:51 2019	(r353760)
+++ user/uqs/git_conv/svn2git/src/svn.cpp	Sat Oct 19 11:47:26 2019	(r353761)
@@ -877,10 +877,13 @@ int SvnRevision::exportInternal(const char *key, const
     // NOTE(uqs): HACK ALERT! Only merge between head, projects, and user
     // branches for the FreeBSD repositories. Never merge into stable or
     // releng, as we only ever cherry-pick changes to those branches.
+    // Also, never merge from stable, like was done in SVN r306097, as it pulls
+    // in all history.
     // FIXME: Needs to move into the ruleset ...
-    if (path_from != NULL && prevrepository == repository && prevbranch != branch &&
-            (branch.startsWith("master") || branch.startsWith("head") ||
-             branch.startsWith("projects") || branch.startsWith("user"))) {
+    if (path_from != NULL && prevrepository == repository && prevbranch != branch
+            && (branch.startsWith("master") || branch.startsWith("head") ||
+                branch.startsWith("projects") || branch.startsWith("user"))
+            && !prevbranch.startsWith("stable")) {
         if(ruledebug)
             qDebug() << "copy from branch" << prevbranch << "to branch" << branch << "@rev" << rev_from;
         txn->noteCopyFromBranch (prevbranch, rev_from);