From owner-svn-src-user@FreeBSD.ORG Fri Dec 7 13:12:02 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A8B5E42E; Fri, 7 Dec 2012 13:12:02 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 71FBB8FC13; Fri, 7 Dec 2012 13:12:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB7DC2hS001863; Fri, 7 Dec 2012 13:12:02 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB7DC2nL001861; Fri, 7 Dec 2012 13:12:02 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201212071312.qB7DC2nL001861@svn.freebsd.org> From: Ulrich Spoerlein Date: Fri, 7 Dec 2012 13:12:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r243985 - user/uqs/git_conv/svn2git/src X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Dec 2012 13:12:02 -0000 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 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);