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

[Ulrich Spoerlein]

Author: uqs
Date: Fri Dec  7 13:12:01 2012
New Revision: 243985
URL: http://svnweb.freebsd.org/changeset/base/243985

Log:
  Add FreeBSD specific hacks to avoid "git merges" to stable and releng branches,
  which can confuse later merges too much.
  
  Requested by: Ryan Stone <rysto32 at gmail.com>

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

Modified: user/uqs/git_conv/svn2git/src/Makefile
==============================================================================
--- user/uqs/git_conv/svn2git/src/Makefile	Fri Dec  7 13:10:03 2012	(r243984)
+++ user/uqs/git_conv/svn2git/src/Makefile	Fri Dec  7 13:12:01 2012	(r243985)
@@ -10,7 +10,7 @@
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DVER="\"b5c3d3aa55621c44db439e4a73884e0d0bf9612c\"" -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_SHARED
+DEFINES       = -DVER="\"e29719690762be6add7d550cab9180766746f4e0\"" -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -O2 -Wall -W $(DEFINES)
 CXXFLAGS      = -pipe -O2 -Wall -W $(DEFINES)
 INCPATH       = -I/usr/local/share/qt4/mkspecs/freebsd-g++ -I. -I/usr/local/include/qt4/QtCore -I/usr/local/include/qt4 -I. -I/usr/include/subversion-1 -I/usr/local/include/subversion-1 -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/local/include/apr-1 -I. -I/usr/local/include/qt4 -I/usr/local/include

Modified: user/uqs/git_conv/svn2git/src/svn.cpp
==============================================================================
--- user/uqs/git_conv/svn2git/src/svn.cpp	Fri Dec  7 13:10:03 2012	(r243984)
+++ user/uqs/git_conv/svn2git/src/svn.cpp	Fri Dec  7 13:12:01 2012	(r243985)
@@ -800,8 +800,13 @@ int SvnRevision::exportInternal(const ch
     // 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) {
+    // 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.
+    // 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(ruledebug)
             qDebug() << "copy from branch" << prevbranch << "to branch" << branch << "@rev" << rev_from;
         txn->noteCopyFromBranch (prevbranch, rev_from);