From owner-svn-src-user@freebsd.org Sat Oct 19 11:47:27 2019 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8087E161FD1 for ; Sat, 19 Oct 2019 11:47:27 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46wLjq2sjMz48TR; Sat, 19 Oct 2019 11:47:27 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4598E21EF3; Sat, 19 Oct 2019 11:47:27 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9JBlRTo020013; Sat, 19 Oct 2019 11:47:27 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9JBlR9j020012; Sat, 19 Oct 2019 11:47:27 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201910191147.x9JBlR9j020012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: uqs set sender to uqs@FreeBSD.org using -f From: Ulrich Spoerlein Date: Sat, 19 Oct 2019 11:47:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r353761 - user/uqs/git_conv/svn2git/src X-SVN-Group: user X-SVN-Commit-Author: uqs X-SVN-Commit-Paths: user/uqs/git_conv/svn2git/src X-SVN-Commit-Revision: 353761 X-SVN-Commit-Repository: base 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.29 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: Sat, 19 Oct 2019 11:47:27 -0000 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);