From owner-svn-src-user@freebsd.org Fri Oct 18 22:53:41 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 5A2A915CC05 for ; Fri, 18 Oct 2019 22:53:41 +0000 (UTC) (envelope-from gordon@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 46w1Y11N7Cz47wB; Fri, 18 Oct 2019 22:53:41 +0000 (UTC) (envelope-from gordon@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 1253C1823C; Fri, 18 Oct 2019 22:53:41 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9IMreuY064688; Fri, 18 Oct 2019 22:53:40 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9IMre0b064687; Fri, 18 Oct 2019 22:53:40 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201910182253.x9IMre0b064687@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Fri, 18 Oct 2019 22:53:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r353744 - in user/cperciva/freebsd-update-build/scripts/12.1-RC2: . amd64 i386 X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in user/cperciva/freebsd-update-build/scripts/12.1-RC2: . amd64 i386 X-SVN-Commit-Revision: 353744 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: Fri, 18 Oct 2019 22:53:41 -0000 Author: gordon Date: Fri Oct 18 22:53:40 2019 New Revision: 353744 URL: https://svnweb.freebsd.org/changeset/base/353744 Log: Add 12.1-RC2. Added: user/cperciva/freebsd-update-build/scripts/12.1-RC2/ user/cperciva/freebsd-update-build/scripts/12.1-RC2/amd64/ user/cperciva/freebsd-update-build/scripts/12.1-RC2/amd64/build.conf (contents, props changed) user/cperciva/freebsd-update-build/scripts/12.1-RC2/i386/ user/cperciva/freebsd-update-build/scripts/12.1-RC2/i386/build.conf (contents, props changed) Added: user/cperciva/freebsd-update-build/scripts/12.1-RC2/amd64/build.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/scripts/12.1-RC2/amd64/build.conf Fri Oct 18 22:53:40 2019 (r353744) @@ -0,0 +1,10 @@ +export RELH=dacecb509cbfaca20b9d6802d74941138f21a146f0b4104b39ef10f5a0cf2cf43f65fc9b4da031af01da71153526dc96f6f7b67995bf1d9a612327e48609351f +export FTP=https://people.freebsd.org/~gjb/12.1-RC2 + +# Components of the world, source, and kernels +export WORLDPARTS="base base-dbg doc lib32 lib32-dbg" +export SOURCEPARTS="src" +export KERNELPARTS="kernel kernel-dbg" + +# EOL date +export EOL=1573948800 Added: user/cperciva/freebsd-update-build/scripts/12.1-RC2/i386/build.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/scripts/12.1-RC2/i386/build.conf Fri Oct 18 22:53:40 2019 (r353744) @@ -0,0 +1,10 @@ +export RELH=d9daea0e279e3a4a5371721893991f2303d50b63c04e571c585923fb188b82933b2d7267f4b15cda4f348db86b52e5668f0dc3b9afe5a5e5128d522cc5e55572 +export FTP=https://people.freebsd.org/~gjb/12.1-RC2 + +# Components of the world, source, and kernels +export WORLDPARTS="base base-dbg doc" +export SOURCEPARTS="src" +export KERNELPARTS="kernel kernel-dbg" + +# EOL date +export EOL=1573948800 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); From owner-svn-src-user@freebsd.org Sat Oct 19 12:03:41 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 B077C163407 for ; Sat, 19 Oct 2019 12:03:41 +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 46wM4Y4HQzz49l9; Sat, 19 Oct 2019 12:03:41 +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 62F142227C; Sat, 19 Oct 2019 12:03:41 +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 x9JC3fgP031593; Sat, 19 Oct 2019 12:03:41 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9JC3fp3031592; Sat, 19 Oct 2019 12:03:41 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201910191203.x9JC3fp3031592@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 12:03:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r353762 - user/uqs/git_conv X-SVN-Group: user X-SVN-Commit-Author: uqs X-SVN-Commit-Paths: user/uqs/git_conv X-SVN-Commit-Revision: 353762 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 12:03:41 -0000 Author: uqs Date: Sat Oct 19 12:03:40 2019 New Revision: 353762 URL: https://svnweb.freebsd.org/changeset/base/353762 Log: Fix pushing after refactoring in r352632 Modified: user/uqs/git_conv/git_conv Modified: user/uqs/git_conv/git_conv ============================================================================== --- user/uqs/git_conv/git_conv Sat Oct 19 11:47:26 2019 (r353761) +++ user/uqs/git_conv/git_conv Sat Oct 19 12:03:40 2019 (r353762) @@ -195,7 +195,7 @@ svn2git() echo "Pushing $target to $dest" for d in $dest; do - git push $d || { echo "Error in pushing to $dest" >&2; exit 1; } + { cd $target && git push $d; } || { echo "Error in pushing to $dest" >&2; exit 1; } done } From owner-svn-src-user@freebsd.org Sat Oct 19 12:10:32 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 D9FFC1637E9 for ; Sat, 19 Oct 2019 12:10:32 +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 46wMDS5QF4z4B2Q; Sat, 19 Oct 2019 12:10:32 +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 9EA8422282; Sat, 19 Oct 2019 12:10:32 +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 x9JCAWHp031976; Sat, 19 Oct 2019 12:10:32 GMT (envelope-from uqs@FreeBSD.org) Received: (from uqs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9JCAVpj031969; Sat, 19 Oct 2019 12:10:31 GMT (envelope-from uqs@FreeBSD.org) Message-Id: <201910191210.x9JCAVpj031969@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 12:10:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r353763 - in user/uqs/git_conv: base-head.git/.git doc-head.git/.git freebsd-base.git freebsd-doc.git freebsd-ports.git ports-head.git/.git X-SVN-Group: user X-SVN-Commit-Author: uqs X-SVN-Commit-Paths: in user/uqs/git_conv: base-head.git/.git doc-head.git/.git freebsd-base.git freebsd-doc.git freebsd-ports.git ports-head.git/.git X-SVN-Commit-Revision: 353763 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 12:10:32 -0000 Author: uqs Date: Sat Oct 19 12:10:31 2019 New Revision: 353763 URL: https://svnweb.freebsd.org/changeset/base/353763 Log: Update git configs to resolve the diffs against production. Modified: user/uqs/git_conv/base-head.git/.git/config user/uqs/git_conv/doc-head.git/.git/config user/uqs/git_conv/freebsd-base.git/config user/uqs/git_conv/freebsd-doc.git/config user/uqs/git_conv/freebsd-ports.git/config user/uqs/git_conv/ports-head.git/.git/config Modified: user/uqs/git_conv/base-head.git/.git/config ============================================================================== --- user/uqs/git_conv/base-head.git/.git/config Sat Oct 19 12:03:40 2019 (r353762) +++ user/uqs/git_conv/base-head.git/.git/config Sat Oct 19 12:10:31 2019 (r353763) @@ -3,10 +3,12 @@ filemode = true bare = false logallrefupdates = true + autocrlf = false + ignorecase = false [svn-remote "svn"] rewriteRoot = svn+ssh://svn.freebsd.org/base url = file:///home/svn/base - fetch = head:refs/remotes/trunk + fetch = head:refs/remotes/origin/trunk [push] default = matching [remote "github"] Modified: user/uqs/git_conv/doc-head.git/.git/config ============================================================================== --- user/uqs/git_conv/doc-head.git/.git/config Sat Oct 19 12:03:40 2019 (r353762) +++ user/uqs/git_conv/doc-head.git/.git/config Sat Oct 19 12:10:31 2019 (r353763) @@ -3,10 +3,12 @@ filemode = true bare = false logallrefupdates = true + autocrlf = false + ignorecase = false [svn-remote "svn"] rewriteRoot = svn+ssh://svn.freebsd.org/doc url = file:///home/svn/doc - fetch = head:refs/remotes/trunk + fetch = head:refs/remotes/origin/trunk [push] default = matching [remote "github"] Modified: user/uqs/git_conv/freebsd-base.git/config ============================================================================== --- user/uqs/git_conv/freebsd-base.git/config Sat Oct 19 12:03:40 2019 (r353762) +++ user/uqs/git_conv/freebsd-base.git/config Sat Oct 19 12:10:31 2019 (r353763) @@ -2,6 +2,8 @@ repositoryformatversion = 0 filemode = true bare = true + autocrlf = false + ignorecase = false [push] default = matching [remote "github"] @@ -13,9 +15,4 @@ push = +refs/heads/releng/*:refs/heads/releng/* push = +refs/heads/stable/*:refs/heads/stable/* push = +refs/heads/user/*:refs/heads/user/* - push = +refs/notes/*:refs/notes/* -[remote "bitbucket"] - url = ssh://git@bitbucket.org/freebsd/freebsd-base.git - push = +refs/heads/master:refs/heads/master - push = +refs/heads/stable/*:refs/heads/stable/* push = +refs/notes/*:refs/notes/* Modified: user/uqs/git_conv/freebsd-doc.git/config ============================================================================== --- user/uqs/git_conv/freebsd-doc.git/config Sat Oct 19 12:03:40 2019 (r353762) +++ user/uqs/git_conv/freebsd-doc.git/config Sat Oct 19 12:10:31 2019 (r353763) @@ -2,6 +2,8 @@ repositoryformatversion = 0 filemode = true bare = true + autocrlf = false + ignorecase = false [push] default = matching [remote "github"] Modified: user/uqs/git_conv/freebsd-ports.git/config ============================================================================== --- user/uqs/git_conv/freebsd-ports.git/config Sat Oct 19 12:03:40 2019 (r353762) +++ user/uqs/git_conv/freebsd-ports.git/config Sat Oct 19 12:10:31 2019 (r353763) @@ -2,6 +2,8 @@ repositoryformatversion = 0 filemode = true bare = true + autocrlf = false + ignorecase = false [push] default = matching [remote "github"] Modified: user/uqs/git_conv/ports-head.git/.git/config ============================================================================== --- user/uqs/git_conv/ports-head.git/.git/config Sat Oct 19 12:03:40 2019 (r353762) +++ user/uqs/git_conv/ports-head.git/.git/config Sat Oct 19 12:10:31 2019 (r353763) @@ -3,10 +3,12 @@ filemode = true bare = false logallrefupdates = true + autocrlf = false + ignorecase = false [svn-remote "svn"] rewriteRoot = svn+ssh://svn.freebsd.org/ports url = file:///home/svn/ports - fetch = head:refs/remotes/trunk + fetch = head:refs/remotes/origin/trunk [push] default = matching [remote "github"]