From owner-freebsd-git@freebsd.org Thu Apr 22 08:45:22 2021 Return-Path: Delivered-To: freebsd-git@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 0A6285E5D04 for ; Thu, 22 Apr 2021 08:45:22 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: from mxt.nsu.ru (mxt.nsu.ru [84.237.50.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQrbN0xCjz3LHK for ; Thu, 22 Apr 2021 08:45:19 +0000 (UTC) (envelope-from danfe@regency.nsu.ru) Received: from mail.nsu.ru ([84.237.50.42] helo=zimbra.nsu.ru) by mxt.nsu.ru with esmtp (Exim 4.89) (envelope-from ) id 1lZUxW-0007us-QH for freebsd-git@freebsd.org; Thu, 22 Apr 2021 15:45:15 +0700 Received: from localhost (localhost [127.0.0.1]) by zimbra.nsu.ru (Postfix) with ESMTP id C2530AC0602 for ; Thu, 22 Apr 2021 15:45:14 +0700 (+07) Received: from zimbra.nsu.ru ([127.0.0.1]) by localhost (zimbra.nsu.ru [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id NAIEdHSkGi3v for ; Thu, 22 Apr 2021 15:45:14 +0700 (+07) Received: from localhost (localhost [127.0.0.1]) by zimbra.nsu.ru (Postfix) with ESMTP id 842DBAC0631 for ; Thu, 22 Apr 2021 15:45:14 +0700 (+07) X-Virus-Scanned: amavisd-new at zimbra.nsu.ru Received: from zimbra.nsu.ru ([127.0.0.1]) by localhost (zimbra.nsu.ru [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id s4WwquyWEQs9 for ; Thu, 22 Apr 2021 15:45:14 +0700 (+07) Received: from regency.nsu.ru (unknown [84.237.50.47]) by zimbra.nsu.ru (Postfix) with ESMTPS id 5B4B9AC0602 for ; Thu, 22 Apr 2021 15:45:14 +0700 (+07) Received: from regency.nsu.ru (localhost [127.0.0.1]) by regency.nsu.ru (8.14.2/8.14.2) with ESMTP id 13M8kJTd004758 for ; Thu, 22 Apr 2021 15:46:19 +0700 (+07) (envelope-from danfe@regency.nsu.ru) Received: (from danfe@localhost) by regency.nsu.ru (8.14.2/8.14.2/Submit) id 13M8kEvr004693 for freebsd-git@freebsd.org; Thu, 22 Apr 2021 15:46:14 +0700 (+07) (envelope-from danfe) Date: Thu, 22 Apr 2021 15:46:13 +0700 From: Alexey Dokuchaev To: freebsd-git@freebsd.org Subject: Read-only SVN mirror for ports: how large would it be? Message-ID: <20210422084613.GA921@regency.nsu.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.1i X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 163277 [Apr 22 2021] X-KLMS-AntiSpam-Version: 5.9.20.0 X-KLMS-AntiSpam-Envelope-From: danfe@regency.nsu.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dmarc=pass header.from=nsu.ru policy=quarantine; spf=pass smtp.mailfrom=regency.nsu.ru; dkim=none X-KLMS-AntiSpam-Info: LuaCore: 442 442 b985cb57763b61d2a20abb585d5d4cc10c315b09, {rep_avail}, {Tracking_from_domain_doesnt_match_to}, nsu.ru:7.1.1; regency.nsu.ru:7.1.1; 84.237.50.42:7.1.2; d41d8cd98f00b204e9800998ecf8427e.com:7.1.1; 127.0.0.199:7.1.2; zimbra.nsu.ru:7.1.1, {Tracking_smtp_domain_mismatch}, ApMailHostAddress: 84.237.50.42 X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2021/04/22 05:13:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, not scanned, license restriction X-Rspamd-Queue-Id: 4FQrbN0xCjz3LHK X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.20 / 15.00]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:mxt.nsu.ru]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[nsu.ru:+]; DMARC_POLICY_ALLOW(-0.50)[nsu.ru,quarantine]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[danfe@nsu.ru,danfe@regency.nsu.ru]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[84.237.50.40:from]; ASN(0.00)[asn:3335, ipnet:84.237.48.0/21, country:RU]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[danfe@nsu.ru,danfe@regency.nsu.ru]; DWL_DNSWL_NONE(0.00)[nsu.ru:dkim]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[nsu.ru:s=email]; FREEFALL_USER(0.00)[danfe]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[84.237.50.40:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[84.237.50.40:from]; RCVD_COUNT_SEVEN(0.00)[8]; MAILMAN_DEST(0.00)[freebsd-git] X-Mailman-Approved-At: Thu, 22 Apr 2021 10:18:21 +0000 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 08:45:22 -0000 Hi there, I'm thinking about creating local SVN read-only mirror for ports, to make it easier to keep uncommitted local changes. I'm currently rsync'ing Git clone to /usr/ports, but that makes local changes even harder to maintain. I'm a bit afraid that I might not have enough disk space. How big is the SVN repo after "git svn dcommit" to svn-remote and how long it might take, if we speak of local mirror and an average ~2018 laptop and 5400 rpm HDD? ./danfe From owner-freebsd-git@freebsd.org Thu Apr 22 10:34:50 2021 Return-Path: Delivered-To: freebsd-git@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 A26615EA2B8 for ; Thu, 22 Apr 2021 10:34:50 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQv1j394sz3hr4 for ; Thu, 22 Apr 2021 10:34:49 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 13MAYgGa072151; Thu, 22 Apr 2021 10:34:42 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 13MAYgW6072150; Thu, 22 Apr 2021 03:34:42 -0700 (PDT) (envelope-from david) Date: Thu, 22 Apr 2021 03:34:41 -0700 From: David Wolfskill To: Alexey Dokuchaev Cc: freebsd-git@freebsd.org Subject: Re: Read-only SVN mirror for ports: how large would it be? Message-ID: Reply-To: freebsd-git@freebsd.org References: <20210422084613.GA921@regency.nsu.ru> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="D81inkI06war4UfO" Content-Disposition: inline In-Reply-To: <20210422084613.GA921@regency.nsu.ru> X-Rspamd-Queue-Id: 4FQv1j394sz3hr4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-4.39 / 15.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[freebsd-git@freebsd.org]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170:c]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[catwhisker.org]; SPAMHAUS_ZRD(0.00)[107.204.234.170:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.204.234.170:from]; NEURAL_HAM_SHORT(-0.99)[-0.991]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_TLS_LAST(0.00)[]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 10:34:50 -0000 --D81inkI06war4UfO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 22, 2021 at 03:46:13PM +0700, Alexey Dokuchaev via freebsd-git = wrote: > Hi there, >=20 > I'm thinking about creating local SVN read-only mirror for ports, to make > it easier to keep uncommitted local changes. I'm currently rsync'ing Git > clone to /usr/ports, but that makes local changes even harder to maintain. >=20 > I'm a bit afraid that I might not have enough disk space. How big is the > SVN repo after "git svn dcommit" to svn-remote and how long it might take, > if we speak of local mirror and an average ~2018 laptop and 5400 rpm HDD? > .... This does not answer the question you asked, but it may at least approximate such an answer. I had not yet got around to reclaiming the space for my private local mirror of the ports svn repo, which I had been updating nightly; a qick check shows it to be: g1-55(12.2-S)[4] du -hs svn/freebsd//ports 4.5G svn/freebsd//ports Peace, david --=20 David H. Wolfskill david@catwhisker.org The same folks who champion the "rights" of corporations to influence elections by money (as an exercise of free speech) are now also decrying corporations' speaking out against voter suppression laws...? Right. See https://www.catwhisker.org/~david/publickey.gpg for my public key. --D81inkI06war4UfO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGSBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmCBUUFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnjNQf3eMqEGJl7qRxYeQNhJOdC+QFrC3WH3cfPB7MV5x1Vib3S8+45f6jbTqVW dD7F81Y3IqlUyAasE6oFO9eUIq/OcBIxXQZiCoEQbMnTIz09nKBwBUB+MsWq8jdQ bE0VTDsVcGAplXVBEVdlrd9gD1uahnTeuFyF9BnAIJM+AfofrZdKpsIctvI0prl4 IXgHP0QOCq7ltYE5guoSW95eR0Apet8/phmIPk+1txMnXpyK79sPu05K44l7Y+5b vLlNvJufQ5Zkj/WwGAE7XXQd7rad9QIZsD9l4cYU0jTXc4WhbhipU8yX7KK2ygoW g9MC+mUmDgTX2XtkjnPOfCd0vE0X =917T -----END PGP SIGNATURE----- --D81inkI06war4UfO-- From owner-freebsd-git@freebsd.org Thu Apr 22 12:29:45 2021 Return-Path: Delivered-To: freebsd-git@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 AB6E75F1383 for ; Thu, 22 Apr 2021 12:29:45 +0000 (UTC) (envelope-from liedtke@punkt.de) Received: from mail.punkt.de (mail.punkt.de [IPv6:2a00:b580:8000:11:1c6b:7032:35e9:5616]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQxZJ59qKz3rnl for ; Thu, 22 Apr 2021 12:29:44 +0000 (UTC) (envelope-from liedtke@punkt.de) Received: from [217.29.46.75] (kagate.punkt.de [217.29.33.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.punkt.de (Postfix) with ESMTPSA id 91A0D3885E for ; Thu, 22 Apr 2021 14:29:35 +0200 (CEST) Subject: Re: Read-only SVN mirror for ports: how large would it be? To: freebsd-git@freebsd.org References: <20210422084613.GA921@regency.nsu.ru> From: Lars Liedtke Organization: punkt.de GmbH Message-ID: <1de727e0-a4aa-5b13-b80c-b0d251c6774d@punkt.de> Date: Thu, 22 Apr 2021 14:29:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210422084613.GA921@regency.nsu.ru> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: de-DE X-Rspamd-Queue-Id: 4FQxZJ59qKz3rnl X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of liedtke@punkt.de designates 2a00:b580:8000:11:1c6b:7032:35e9:5616 as permitted sender) smtp.mailfrom=liedtke@punkt.de X-Spamd-Result: default: False [-2.30 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:b580:8000:11:1c6b:7032:35e9:5616:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:b580::/32]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; HAS_ORG_HEADER(0.00)[]; SPAMHAUS_ZRD(0.00)[2a00:b580:8000:11:1c6b:7032:35e9:5616:from:127.0.2.255]; ARC_NA(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_NA(0.00)[punkt.de]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16188, ipnet:2a00:b580::/32, country:DE]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 12:29:45 -0000 Hey, may I ask why you want to keep track of that in SVN? Because your git repository is all local so you could commit those changes you made locally into your repo, without interfering with the upstream repo (as long as you do not push). If you'd like to keep the changes seperate from things you might push, then you could track them in a different branch, into which you merge the commits adding to the "main" branch over time, or you rebase your branch on main. If this is for you, you should read about the difference bewteen merge and rebase in more detail to decide, which is best for you. Cheers Lars Am 22.04.21 um 10:46 schrieb Alexey Dokuchaev via freebsd-git: > Hi there, > > I'm thinking about creating local SVN read-only mirror for ports, to make > it easier to keep uncommitted local changes. I'm currently rsync'ing Git > clone to /usr/ports, but that makes local changes even harder to maintain. > > I'm a bit afraid that I might not have enough disk space. How big is the > SVN repo after "git svn dcommit" to svn-remote and how long it might take, > if we speak of local mirror and an average ~2018 laptop and 5400 rpm HDD? > > ./danfe > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" -- --- punkt.de GmbH Lars Liedtke .infrastructure Kaiserallee 13a 76133 Karlsruhe Tel. +49 721 9109 500 https://infrastructure.punkt.de info@punkt.de AG Mannheim 108285 Geschäftsführer: Jürgen Egeling, Daniel Lienert, Fabian Stein From owner-freebsd-git@freebsd.org Thu Apr 22 15:00:37 2021 Return-Path: Delivered-To: freebsd-git@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 0B9185F5941 for ; Thu, 22 Apr 2021 15:00:37 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FR0wN6p7Sz4Tcf for ; Thu, 22 Apr 2021 15:00:36 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id E951A5F58BB; Thu, 22 Apr 2021 15:00:36 +0000 (UTC) Delivered-To: git@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 E918C5F5940 for ; Thu, 22 Apr 2021 15:00:36 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from lb1-smtp-cloud8.xs4all.net (lb1-smtp-cloud8.xs4all.net [194.109.24.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.xs4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR0wN3MMjz4TgJ; Thu, 22 Apr 2021 15:00:36 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from cust-d4a83f22 ([IPv6:fc0c:c11d:cecc:f58a:eaa1:c0:9d8f:c143]) by smtp-cloud8.xs4all.net with ESMTPA id ZaoilGshQXsivZaojly7oX; Thu, 22 Apr 2021 17:00:33 +0200 From: Adriaan de Groot To: git@freebsd.org Cc: developers@freebsd.org Subject: One surprise in commit messages with git Date: Thu, 22 Apr 2021 17:00:31 +0200 Message-ID: <2257024.hWAQu6Pgo9@beastie.bionicmutton.org> Organization: FreeBSD MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2129244.Du3HOY4CEZ"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-CMAE-Envelope: MS4xfIL9GihwwliNA1Vx7+I5RBJpsBi5V3QDvQYfrS7BSFGEbA+yy1GcvEzTRabYk1qy2XaA1Nn7Y8+oy0rJk/eS7nySXTGlzQo9bkfsyiSnaN/aKc+DvfLS 8YtzyYzkUzJuHc9FQ8sz8eEkxcXLrTMgqdYQjtQ1tkLA7pxpqX35Vftgeci/w6pSlmBUnX80cIpBLm22F7bnGS1p3Wot6A5l6nyyYOIoM9wlbSIsmx5fM/40 3K6qHEtoMhvstsAFdw/o2bxIhBZpVJ6iSQVcNwbmc0gSpqufUopbGRmHOXbQQcSP X-Rspamd-Queue-Id: 4FR0wN3MMjz4TgJ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 15:00:37 -0000 --nextPart2129244.Du3HOY4CEZ Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Adriaan de Groot To: git@freebsd.org Cc: developers@freebsd.org Subject: One surprise in commit messages with git Date: Thu, 22 Apr 2021 17:00:31 +0200 Message-ID: <2257024.hWAQu6Pgo9@beastie.bionicmutton.org> Organization: FreeBSD There are still some surprises in the pipeline that processes commits. I triggered one today with f365336113. In my commit message, I was fixing something in an earlier commit, so I wrote "(bla-di-bla, fixes) ports 620d7678c8." The commit itself refers to a PR (with the usual PR: line), 255260. So Bugzilla automation takes over, and pastes the commit into a comment there. It looks to me like Bugzilla takes "ports [0-9]+" in the commit message as an SVN reference -- the message as-pasted as a comment in Bugzilla then surprisingly - links to svnweb (which still exists) - links to r620, which is 26 years old Overall harmless enough, but surprising for things that look-like-a-revision- number but are a really a prefix to a longer hash. [ade] --nextPart2129244.Du3HOY4CEZ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEhrjttu2OP5apuuy1z93JbxKxkVwFAmCBj48ACgkQz93JbxKx kVyPpAv/a4IJHnBca+FIki5f//Ak32f/Dz5puJZ9huWPXKWOAcCL+vX7yUoIl5Bu 0kNn9XixjVIPWlS+3EsqC5rcmxlEZ2oexKJX+UuwRM3kxPwnVFawoQmUlHahadwP tHgaucWVPq24QRiVr9BYoD15LvjUnxFZdS5BPDXuP9sOITMCy9pWQRZhPusb+GH4 GSSmaZs5Q6ZHnt81ygxs8BtakIBrcMTK12yx57lhHkIhgkpr0rtmXANFGp798ESR hJLHsns8mBDTUjuZpG45dEbWoL42clHj8O+87FLQQnQ0JrcQixcCSkcHL4oLnJfb pSM9QMJZQKfFUiybuVAFyBbHtGPndd+ZfsW9izRNJwNVEKDWeoCfWorS71/Wjkq2 slFCidOVbMW222T80eJJUBulam3uNVK64Vrfel4HmbBliLcfrLBxKv4xQxTh4/Ai Ib2qrIDqpt4ndiJ5L7/t/3i/TudhZRRPMrFLD2XazfzN1RjM579iKPJ/UDg1Gsnt 7XxxCjN7 =D7hj -----END PGP SIGNATURE----- --nextPart2129244.Du3HOY4CEZ-- From owner-freebsd-git@freebsd.org Thu Apr 22 18:35:05 2021 Return-Path: Delivered-To: freebsd-git@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 3C9C55FBB0F for ; Thu, 22 Apr 2021 18:35:05 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR5gr31CGz4gft for ; Thu, 22 Apr 2021 18:35:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf29.google.com with SMTP id l2so4636423qvb.7 for ; Thu, 22 Apr 2021 11:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=PdTKh0Ya9ugAGTk8s8mW83kQvodkktdVXeNDS1afWAk=; b=fnF4A3whA7/sIP6+GRb7Kg/38Dk7d26Kv+HLMJCdyOgMUtcw3yw7/6kO81j7v3oMSW sIUd+rxUkByrlKzr8bu3M0aZ+nkjm4oR8e8VZfkY0yPJ98kIubG8SeZA4cBoe8zvAQFM mRLCrafGOZ/IkAeis5tIUVs/FGGH5o1y3gWfVi/m9vKKtsdZqsHoBzYx+CLxnoB3hAcu l4crfdx7Q5sE8c86N4uWn+K+zTEvGE8wajnP5K84SZ4p4xq1GO3KylLy43nljFJC125k MajW/DHiKSWy2j3kQd74tl9jKsHFoULIMqvFu8dfzZVwHbItz7zg3T6UEPh8wIYdFisz s4AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=PdTKh0Ya9ugAGTk8s8mW83kQvodkktdVXeNDS1afWAk=; b=O2SA+9e1UJGTb7Gbvl5ehMQOz+z+CnPBBO/cs3dpkI+pXW+qvnQmv5v+hA8Lf/1Fgf KJ+KScsHNAptYPwKPJ8gbNEnCTnrSWB7htmNNYzmc9GjNdc0qBtR5fTOivHc2yY5VAqW vCW64DZfBUVPY3xhp/bHUQnOiPB23xu4p8u+swaShMu22tq2q8KvgdibFMGggPzgvEs3 MH5qyxhRUZ7//XDaiMaQ6BfMRxKLI4RwGyB0RQ5m1LiUrmKddC/+/O1ufsUx9hAyn9CW /xqlVjq2/kB87mRE+BZb7hotXjQLqNNi0/8RYWah8eOKPmXNVrz4Vl28+7geISgNnBqL u5+g== X-Gm-Message-State: AOAM530jfBl6u1eUto5+oF9MG+ZFxu5wZRGVF61pR47DoOJzH+a8C47z rkde3Nkd3El2AMwGCTMyFzGV04RuvEKOr77sozDvmW3E7Xkd1A== X-Google-Smtp-Source: ABdhPJwwHcL+k0PT200Fyh0i0UMb9csRoed2TrirzxZnGCawTA8zL+Ez3Y9uilHPmtZgwvYDargEKMiZDNUJGbbXIzo= X-Received: by 2002:a05:6214:1866:: with SMTP id eh6mr6421qvb.29.1619116503241; Thu, 22 Apr 2021 11:35:03 -0700 (PDT) MIME-Version: 1.0 From: Warner Losh Date: Thu, 22 Apr 2021 12:34:52 -0600 Message-ID: Subject: OpenZFS imports, status update To: Martin Matuska , freebsd-git X-Rspamd-Queue-Id: 4FR5gr31CGz4gft X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=fnF4A3wh; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f29) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(1.00)[0.996]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f29:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f29:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f29:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 18:35:05 -0000 Hey Martin, I just wanted to let you know we've been working towards enabling pushing vendor/openzfs/* branches. There's one big issue that needs to be corrected. Currently, we'll do one email per revision hash on such imports, so openzfs would generate ~10k emails, which would be undesirable. Li Wen is working on enabling one email per push for vendor/* which would eliminate this problem. We hope to be doing test pushes to the testing repo early next week, and if all goes well enabling this in production shortly after. IMHO, you've made a compelling case: the size is small, the coupling between the projects is tight and we get some extra benefit from having a finer-grained vendor branch that we import from. The plan to import directly from vendor/openzfs/zfs-2.1 would normally be concerning because it's not following the usual main -> stable/X workflow. In this case, though, since upstream follows that workflow we won't lose things that get pushed to stable/13 that aren't also relevant to main. There's at least some configuration needed to allow the merge commits to stable/13, but we're still working out the last details. So we'll be good to go soon (1-2 weeks until you can land commits, I think). Does that work for you? Warner From owner-freebsd-git@freebsd.org Thu Apr 22 20:27:52 2021 Return-Path: Delivered-To: freebsd-git@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 47D4A5FDBBA for ; Thu, 22 Apr 2021 20:27:52 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FR8B01VQdz4lTH for ; Thu, 22 Apr 2021 20:27:52 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id 334265FDBB9; Thu, 22 Apr 2021 20:27:52 +0000 (UTC) Delivered-To: git@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 330AD5FDA49 for ; Thu, 22 Apr 2021 20:27:52 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR8B00y9pz4lxF; Thu, 22 Apr 2021 20:27:52 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from onlyone.not-for.work (onlyone.not-for.work [148.251.9.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: lev/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id ECE426045; Thu, 22 Apr 2021 20:27:51 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from [192.168.134.16] (unknown [94.19.224.8]) (Authenticated sender: lev@serebryakov.spb.ru) by onlyone.not-for.work (Postfix) with ESMTPSA id A6C3A1E36; Thu, 22 Apr 2021 23:27:49 +0300 (MSK) Reply-To: lev@FreeBSD.org Subject: Re: One surprise in commit messages with git To: Chris Rees , Enji Cooper , Adriaan de Groot Cc: git@freebsd.org, developers@freebsd.org References: <2257024.hWAQu6Pgo9@beastie.bionicmutton.org> From: Lev Serebryakov Organization: FreeBSD Message-ID: <2fe7653d-78e8-2ca2-7508-ca6f27855bfa@FreeBSD.org> Date: Thu, 22 Apr 2021 23:27:49 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 20:27:52 -0000 On 22.04.2021 23:07, Chris Rees wrote: > I would suggest instead that the regex instead be "/ports \d\d\d\d\d+/"- this would almost eliminate false positives with git Maybe, "/\bports \d+\b/" ? -- // Lev Serebryakov From owner-freebsd-git@freebsd.org Fri Apr 23 00:51:06 2021 Return-Path: Delivered-To: freebsd-git@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 111EF623A63 for ; Fri, 23 Apr 2021 00:51:06 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [IPv6:2a01:4f8:191:9029::4]) by mx1.freebsd.org (Postfix) with ESMTP id 4FRG1j5JM5z3F2F for ; Fri, 23 Apr 2021 00:51:05 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 6AA3313A85A; Fri, 23 Apr 2021 02:50:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id k9l6tvDs8Ldz; Fri, 23 Apr 2021 02:50:58 +0200 (CEST) Received: from [10.0.7.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id 1DCD213A855; Fri, 23 Apr 2021 02:50:58 +0200 (CEST) To: Warner Losh , freebsd-git References: From: Martin Matuska Subject: Re: OpenZFS imports, status update Message-ID: Date: Fri, 23 Apr 2021 02:50:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-Rspamd-Queue-Id: 4FRG1j5JM5z3F2F X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE]; local_wl_from(0.00)[FreeBSD.org] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 00:51:06 -0000 Hi Warner, thank you very much for the update. If I understand this correctly, the way to go in the future is a 1:1=20 merge from openzfs/master to e.g. vendor/openzfs/master and from=20 openzfs/zfs-2.1-release to vendor/openzfs/zfs-2.1-release? And as a=20 second step a subtree merge from vendor/openzfs/* to main or stable/13? Martin On 22. 4. 2021 20:34, Warner Losh wrote: > Hey Martin, > > I just wanted to let you know we've been working towards enabling=20 > pushing vendor/openzfs/* branches. There's one big issue that needs to = > be corrected. Currently, we'll do one email per revision hash on such=20 > imports, so openzfs would generate ~10k emails, which would be=20 > undesirable. Li Wen is working on enabling one email per push for=20 > vendor/* which would eliminate this problem. We hope to be doing test=20 > pushes to the testing repo early=C2=A0next week, and if all goes well=20 > enabling this in production shortly after. > > IMHO, you've made a compelling case: the size is small, the coupling=20 > between the projects is tight and we get some extra benefit from=20 > having a finer-grained vendor branch that we import from. The plan to=20 > import directly from vendor/openzfs/zfs-2.1 would normally be=20 > concerning because it's not following the usual main -> stable/X=20 > workflow. In this case, though, since upstream follows that workflow=20 > we won't lose things that get pushed to stable/13 that aren't also=20 > relevant to main. There's at least some configuration needed to allow=20 > the merge commits to stable/13, but we're still working out the last=20 > details. > > So we'll be good to go soon (1-2 weeks until you can land commits, I=20 > think). Does that work for you? > > Warner > From owner-freebsd-git@freebsd.org Fri Apr 23 02:37:14 2021 Return-Path: Delivered-To: freebsd-git@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 ABF3D6259C6 for ; Fri, 23 Apr 2021 02:37:14 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FRJNB3FKpz3JRR for ; Fri, 23 Apr 2021 02:37:14 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 6CDB46259C5; Fri, 23 Apr 2021 02:37:14 +0000 (UTC) Delivered-To: git@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 6B6C1625A31 for ; Fri, 23 Apr 2021 02:37:14 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRJNB2507z3JG6; Fri, 23 Apr 2021 02:37:13 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pg1-x52f.google.com with SMTP id z16so34209760pga.1; Thu, 22 Apr 2021 19:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:message-id:date:mime-version:user-agent:reply-to:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=kVZoDbF19j2QpiZTKFKRU0QOxraByooNtg70a1/AGZE=; b=JTDUZv9ATWKQTWL9UHyaI2+Azp60JWy0520yX4ilAIUA1WiJRg8RoUOjYVj+NOsMfY Zucg92Oh0rFbJPLgrYYAnGKWRClsKTth/aTLU3sSE3DeXK+GTqEII0vL+J32xMAAUI9F Tp2hPPY7eukN4xMiY03XLgqgPzDjcCByzmrD/IpvtyiX5IxET9506DT5rx3+fqEeEQhh W0DTCLC3knDY7yE+iP1Tz3Z/3ZrQzRexQrUQFgegcztBYS7PJHHB1O4IY/XKhBzUWh+b /X07GEzLkE6iZFyOuUdV3nFm2nRvjoLuwe4OZPM9dsZlSU4F6F5JssKBBwsrNYCQ6DeN V2jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :reply-to:subject:content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=kVZoDbF19j2QpiZTKFKRU0QOxraByooNtg70a1/AGZE=; b=elycfeQDVSEqNl95ync+K/sHQVr5u9wFFS+cybiSy8IzlpKzSvhb8JsbKZ645rnK6j 6JebM0osVrl9GkfVDRGxZwUbQKVeYGIAJOIsXSx7ArtUpN060BC+0s4tS82lek73FQBp orB1idxiUrif0Qz5MXD4Ed5RRgkIk87XErBLQwXwKfCrarZ9dEH0k6EM1KqKlDeotcSO JyE8Uo6D3Ro4K7n8oSGtzIuKguLNx5N5jo+wowI/ULN0SdIFlr7gmD/OwOw1XcbjEAFV c3ImVmWWYeL5EQZaZJ5cO+enyl+ViurYdX5prf7qd8L5M37Eh7LnLjSh5XufW4W8W4dF QXHg== X-Gm-Message-State: AOAM533ihyjJvGVBFGj0azsCG0TTlwseyY2Dn9alx/RvCjrfZwiJ5V0L KGAm2vuZ7/0r2FAU7cdgBlivK/gvTbQZNqs1 X-Google-Smtp-Source: ABdhPJzp3iwVcW8XQ6FO2aPOVhtZeob+b1eWHJSXUKtdBrSolmUE0psEGAPqzG2n/nuxz1op2vAioA== X-Received: by 2002:a65:61a1:: with SMTP id i1mr1612604pgv.411.1619145432238; Thu, 22 Apr 2021 19:37:12 -0700 (PDT) Received: from [2403:5800:7500:3601:cce4:a9d1:411d:ba72] (2403-5800-7500-3601-cce4-a9d1-411d-ba72.ip6.aussiebb.net. [2403:5800:7500:3601:cce4:a9d1:411d:ba72]) by smtp.gmail.com with UTF8SMTPSA id mz20sm5936840pjb.55.2021.04.22.19.37.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Apr 2021 19:37:11 -0700 (PDT) Sender: Kubilay Kocak Message-ID: <3096b207-4468-07dd-877d-4e6d365c2e7a@FreeBSD.org> Date: Fri, 23 Apr 2021 12:37:06 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Thunderbird/90.0a1 Reply-To: koobs@FreeBSD.org Subject: Re: One surprise in commit messages with git Content-Language: en-US To: lev@FreeBSD.org, Chris Rees , Enji Cooper , Adriaan de Groot Cc: git@freebsd.org, developers@freebsd.org, Bugmeister References: <2257024.hWAQu6Pgo9@beastie.bionicmutton.org> <2fe7653d-78e8-2ca2-7508-ca6f27855bfa@FreeBSD.org> From: Kubilay Kocak In-Reply-To: <2fe7653d-78e8-2ca2-7508-ca6f27855bfa@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FRJNB2507z3JG6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 02:37:14 -0000 On 23/04/2021 6:27 am, Lev Serebryakov wrote: > On 22.04.2021 23:07, Chris Rees wrote: > >> I would suggest instead that the regex instead be "/ports >> \d\d\d\d\d+/"- this would almost eliminate false positives with >> git > > Maybe, "/\bports \d+\b/" ? > > We (bugmeister) already have this on our radar to address, and we'll come up with a scheme that suits both the historical case and most obvious current case. I believe the majority of historical refs are " r". Previous automated svn commit comments were full svn url's I replied to a post on freebsd-current (subject: linking to git revisions in bugzilla) on 12/Apr to this effect, with an 'in the meantime' recommendation, copied below: > We'll (bugmeister) be adding parsing support for it (along with a few > other related auto-linking things) > > I'd encourage people to use " " (repo = > src|doc|ports) where short hash is at least 8 chars in the meantime. > Once parsing is added all previous references will be linked. If anything needs to be tweaked post-fact (updating comments), we'll do that too. Kubilay Bugmeister From owner-freebsd-git@freebsd.org Fri Apr 23 02:37:35 2021 Return-Path: Delivered-To: freebsd-git@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 F12FF6259CF for ; Fri, 23 Apr 2021 02:37:35 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FRJNb6FS7z3Jgn for ; Fri, 23 Apr 2021 02:37:35 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id D668E6259CE; Fri, 23 Apr 2021 02:37:35 +0000 (UTC) Delivered-To: git@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 D6370625B0E for ; Fri, 23 Apr 2021 02:37:35 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRJNb5nr8z3J9V; Fri, 23 Apr 2021 02:37:35 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619145455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mvTzSjqbNDFY0qWSHiZgDgiUfnpV6fZOPQp2OGbdNjE=; b=KsrtK4L+uFUDY/BtfPMBe5AeK0V+eKfLOZPWpe/JjPiYiY/9MCYDjxaLS6OFRuO0QyHTsM EhNKzn/h4kjAhlJCXu2i49gOHXUS8yh4RFXUvzKze/9gseqI5ZTDsVw9IXH7vSYRNLxrti MYdI/Y8VMiqZwKXSJuvj70RUkn1huSJQ9qUr+k338dQlEg3KZo5+X/685oRJLr22bPhFTR qaQCvZdbZkz5qPBAW6ZL3XTCG0fAVRgrMgimrSNWpEy6+OS/VuFH0k1gNYHOCUD2eHYH/R X4yo5RpGsjt+euaMW5zXf8vsrnVwaE+jUEq8nNZBbeSFE8t2f/9sbdywNoZryg== Received: by freefall.freebsd.org (Postfix, from userid 1033) id B81AFA3C; Fri, 23 Apr 2021 02:37:35 +0000 (UTC) Date: Fri, 23 Apr 2021 02:37:35 +0000 From: Alexey Dokuchaev To: Chris Rees Cc: Enji Cooper , Adriaan de Groot , git@freebsd.org, developers@freebsd.org Subject: Re: One surprise in commit messages with git Message-ID: References: <2257024.hWAQu6Pgo9@beastie.bionicmutton.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619145455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mvTzSjqbNDFY0qWSHiZgDgiUfnpV6fZOPQp2OGbdNjE=; b=MnD0fhfMAkaHyngtZB2qWCdcoE7vJIZa33PGhARyspD1MLIlnXEhpjTEUo5feAXbY1I4rJ c64HUE0YjHcUsCx9cMaojf/ihGLuLFOIeVuFxvZSVzBDnSlp2OqcknAMaZF5EjZg9IDYHG 4iAmHDlrJSDyxjC8OvQ9rZAYdVLe2Uz1t6hITBowNrg9kh3epqsp2Iho7GbsdGLOTalCnY 36RWN4TdV4e+js9w/8yKX+9wYiDvuPknutii8/b1xt0RajE6E+EyosK8J7dJ7l2oK+0Iwk caMH8HeiB12XkasFlQ51/pPWscWXnpY+ibAZaRjlzFZ4C5PqbaFKBWy08IYKIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1619145455; a=rsa-sha256; cv=none; b=ehzseW/X/t9TEPQkNkb/LbahnwuSl71WLW6gMwtKzYfXhqnIsGXOaadEXIF1wUmNEye3YF IZbxB09Cwdd9Ev4Yd5WN4R9D5avRK55TRcWA892yvMgNWeuXvxcC4kk6lWFERfZ4Mq62UN nkYR9lJWDWBNmKKIzAd4u9srNzhpDp1P1C8md98Se9AX9n/gMOUKq3h37Jj/DQ79XqUzF8 Jeisb2KchXB6LqUhGn2Gxbnh+0lw3qy/q+31nJHu7STMc+CxiR46I3uGzTfjeq8JmtjSfj PcnjBiWCakFSM95jXUZjRxUwOml5DX9fTsngBLBVecFeIfMNVOTqUn/jCjKvHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 02:37:36 -0000 On Thu, Apr 22, 2021 at 09:07:38PM +0100, Chris Rees wrote: > ... > Unfortunately, it's not really that simple- the revision parsing > is done dynamically, so if you remove that regex from Bugzilla, > historical bugs with SVN references will no longer be linked. > Whether that's a big deal or not... It is, but isn't regexp for SVN revisions is r\d+, and `r' is not a valid hex character? I don't see how would the clash happen. ./danfe From owner-freebsd-git@freebsd.org Fri Apr 23 02:42:01 2021 Return-Path: Delivered-To: freebsd-git@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 3A057625E84 for ; Fri, 23 Apr 2021 02:42:01 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FRJTj0qsSz3Jv8 for ; Fri, 23 Apr 2021 02:42:01 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 1C8B9625E83; Fri, 23 Apr 2021 02:42:01 +0000 (UTC) Delivered-To: git@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 1C53D625E13 for ; Fri, 23 Apr 2021 02:42:01 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRJTj0Pt1z3Jy6; Fri, 23 Apr 2021 02:42:01 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619145721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0sVtmcCvzxwzVTQjufexJ6QoJdJNhOClTz5sj9SEqJE=; b=X9FGwGJsZ0yoFCWrn3poHSzFWMO4zt80SdQq4YaBgKJz5mAq7wFESgbf+QYczp5+GHtgpZ A1CRcRMt6ASlTB8PJyOl0I1SMYatvRf7AsWzDG8bGMyIyiykUbjj5V9yBgD4ADWV0iQ7x8 sGmkMCnNw/gbc7gisxfbeKhvQFJ3olpJ4a+wFBVKANeuRxd6LWIQM5VjleHAHT/1uz5ZVx Zqsm2KbRB941vrFfVE7qmkrwWA3fDV1fQuntSPSiVvZ3kUeUH4151NVO+Z7T5Dk4Dcu0EO n8BYxjin4WI0WUO8JLp/daWgyf9MJ1lWQ5gXZUq3cFSwVaaNNWjlcmaxxlNMSA== Received: by freefall.freebsd.org (Postfix, from userid 1033) id ECD8FB27; Fri, 23 Apr 2021 02:42:00 +0000 (UTC) Date: Fri, 23 Apr 2021 02:42:00 +0000 From: Alexey Dokuchaev To: Kubilay Kocak Cc: lev@freebsd.org, Chris Rees , Enji Cooper , Adriaan de Groot , git@freebsd.org, developers@freebsd.org, Bugmeister Subject: Re: One surprise in commit messages with git Message-ID: References: <2257024.hWAQu6Pgo9@beastie.bionicmutton.org> <2fe7653d-78e8-2ca2-7508-ca6f27855bfa@FreeBSD.org> <3096b207-4468-07dd-877d-4e6d365c2e7a@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3096b207-4468-07dd-877d-4e6d365c2e7a@FreeBSD.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619145721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0sVtmcCvzxwzVTQjufexJ6QoJdJNhOClTz5sj9SEqJE=; b=PDSJZdik8lUlzGcu8zIKOELnVCabAWg9uapuVUetf7kT4x5veIQU5VxDB1XLv70I8magJd PThuoH0a+CJBEnBbTN+dsOr+B8JScjVqf9c1fuQ/0Q/xQZbmAZ1ttvLCx+DQm/3QZbVUz9 ZSMg/btwzstc+iwqpniR7NTmqZtx2N5MbSqSPp6kDJwhoPkwVGwFExzQdAS4h9b7Gqo0OT tHJ14u9VJAg63ho9FM2NkLQMRVwCMuS20pEg3unS3DWgGVXSktwuMMpyfj03KDtiiI+oVL Mb8AZHNjyXVSxu9x5EZdnuP8mcNHG9UBVbOUndOwTUuB32mahWR1JG46K0drEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1619145721; a=rsa-sha256; cv=none; b=pyYnlDk37NBjlv9dffwOGd6So32mble+3mB80ayUGu0AjQNEMKyIOJa7khQiqcg75imn+w mxSLsVsA0ow93YPob8nRSHyWCnCi+SjVWxWJrjKI2Tcvx0iZYhxowMUvtQkWkj8391qNB3 jvdaGbZ/2buRbyFk53L0fNGB1IyMgBW+8PmqbwTqvjyGZVoL1PtCfEPcUaZE2yF7mGKV0I 4UUMxORPhUvoMwH5LaGy69TSgHErJOy3pZs8keOKbTieBz8gR8MUUq8KZ38qDiVfFTdGR2 twhcalksCAxTU3f4Mgox8K5Z2iLn4KQFjv79edhiCpe3qXZt/pFbtfup4JfYTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 02:42:01 -0000 On Fri, Apr 23, 2021 at 12:37:06PM +1000, Kubilay Kocak wrote: > ... > I believe the majority of historical refs are > " r". Right. For those lacking the `r' prefix, it should be possible to identify and fix them in the database in a semi-automated way. ./danfe From owner-freebsd-git@freebsd.org Fri Apr 23 20:24:50 2021 Return-Path: Delivered-To: freebsd-git@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 BEA3D5FE4A8 for ; Fri, 23 Apr 2021 20:24:50 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRm4254jBz3JRm; Fri, 23 Apr 2021 20:24:50 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: uqs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 55A4C219DC; Fri, 23 Apr 2021 20:24:50 +0000 (UTC) (envelope-from uqs@freebsd.org) Date: Fri, 23 Apr 2021 22:24:47 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Martin Matuska Cc: Warner Losh , freebsd-git Subject: Re: OpenZFS imports, status update Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 20:24:50 -0000 Wouldn't vendor/openzfs/master simply be an alias for openzfs/master and it would be the pristine upstream source repo? Or do we have local modifications in our vendor/openzfs/master, if so, ignore me. On Fri, 2021-04-23 at 02:50:57 +0200, Martin Matuska wrote: >Hi Warner, > >thank you very much for the update. > >If I understand this correctly, the way to go in the future is a 1:1 >merge from openzfs/master to e.g. vendor/openzfs/master and from >openzfs/zfs-2.1-release to vendor/openzfs/zfs-2.1-release? And as a >second step a subtree merge from vendor/openzfs/* to main or stable/13? > >Martin > >On 22. 4. 2021 20:34, Warner Losh wrote: >> Hey Martin, >> >> I just wanted to let you know we've been working towards enabling >> pushing vendor/openzfs/* branches. There's one big issue that needs to >> be corrected. Currently, we'll do one email per revision hash on such >> imports, so openzfs would generate ~10k emails, which would be >> undesirable. Li Wen is working on enabling one email per push for >> vendor/* which would eliminate this problem. We hope to be doing test >> pushes to the testing repo early next week, and if all goes well >> enabling this in production shortly after. >> >> IMHO, you've made a compelling case: the size is small, the coupling >> between the projects is tight and we get some extra benefit from >> having a finer-grained vendor branch that we import from. The plan to >> import directly from vendor/openzfs/zfs-2.1 would normally be >> concerning because it's not following the usual main -> stable/X >> workflow. In this case, though, since upstream follows that workflow >> we won't lose things that get pushed to stable/13 that aren't also >> relevant to main. There's at least some configuration needed to allow >> the merge commits to stable/13, but we're still working out the last >> details. >> >> So we'll be good to go soon (1-2 weeks until you can land commits, I >> think). Does that work for you? >> >> Warner >> > >_______________________________________________ >freebsd-git@freebsd.org mailing list >https://lists.freebsd.org/mailman/listinfo/freebsd-git >To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" From owner-freebsd-git@freebsd.org Fri Apr 23 21:26:34 2021 Return-Path: Delivered-To: freebsd-git@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 F17A45FFC23 for ; Fri, 23 Apr 2021 21:26:34 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRnRG2FqQz3MCy for ; Fri, 23 Apr 2021 21:26:33 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x72e.google.com with SMTP id d19so15347873qkk.12 for ; Fri, 23 Apr 2021 14:26:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:subject:message-id:mime-version :content-disposition; bh=loqVHInB8/G/aqPzn1c8w02KCmcU527+psxX+UEFtJ0=; b=NWHvoj1yo3DazZHIotAe9ZFAmUYDBYn/WhLcPxj6pEx7NoAfAbDDwukAAwCPhw9kgE lZlgSv95H+jn5UuomzsUcJKN7R+67+yHbq5Ymw42HqhEkwQubBqgJjmPB01j47opDMCm 77c0vBJQp0dW+7xwnVZGmOgDO/kD7FTZfcp5Gr/oh9/opDQDBND8FeS/g6LE5cwuMRZe 6ygKtznNXGUJZfTLinAJKoFTXmHpl1RjAMbIXIu/dD6UQ/exp3VKY6BwXWRsNfqx+8XS pNjLhVcGdSfN04IuBwmYVyF3JF2EnpaIEL1WgdNRLHUJrpQBZ23k0r5SRj8gVl2gA+pI clGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:subject:message-id :mime-version:content-disposition; bh=loqVHInB8/G/aqPzn1c8w02KCmcU527+psxX+UEFtJ0=; b=OE3B1Y9ouMMvXSEFEfb5WFPbynRHX6v1H1iR+qggTh18YhQKbXt6QvCfuOC8L/OwzH Qleag04IZbwcxvmWP+V6PTYrkdcJhus0YhRk4Id32HQiTu+MPftCITcwIq1JkhzFFle1 2IzEcDI/gQfjYU+NDvgaUp2fx1HXqGr6igF5PDgE7ljtCAmNEbOzjAX8kjabmwt9Q1Xb syX3Fy4etYsM/YwxYiI9j0FHoOpXqAgT1+JB8H8WVyMDdl8k9diYtdRg+wAaiEJaRYcu 3/hl+AKzE7wtYku8dJt5VNdUueCe228SvAld7mkp4Mbubf99sMnmJpPWVkdjFF2qwysa X2/A== X-Gm-Message-State: AOAM531J0ADl5p69999RIfZd1GHUR9I1BYmi5q0/uMnhtG/Xnlp4KaAm K0eNThJYhY6Hftewv32CBezLXQEUr+kgNw== X-Google-Smtp-Source: ABdhPJxM+9093SVqKx+v2nBmPFE+auzlaDDfrfylr/e7Hqp16rpRxfUJQDyuTdFEwxVCdeoevzPc/Q== X-Received: by 2002:ae9:f310:: with SMTP id p16mr6169013qkg.123.1619213192917; Fri, 23 Apr 2021 14:26:32 -0700 (PDT) Received: from nuc ([142.126.164.150]) by smtp.gmail.com with ESMTPSA id c15sm5481483qtg.31.2021.04.23.14.26.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 14:26:32 -0700 (PDT) Sender: Mark Johnston Date: Fri, 23 Apr 2021 17:26:33 -0400 From: Mark Johnston To: freebsd-git@freebsd.org Subject: vendor/illumos merges Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4FRnRG2FqQz3MCy X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=NWHvoj1y; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::72e as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-2.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72e:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72e:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72e:from]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2021 21:26:35 -0000 Hi, Now that FreeBSD uses OpenZFS as the upstream for ZFS, vendor/illumos is mostly unused. However, we still use illumos as an upstream for CTF tools and DTrace, though there haven't been any imports in a while. illumos has put a lot of work into their CTF toolchain, and I'd like to import that. There are a couple of snags that I'd appreciate some guidance on. First, I believe I should delete now-unused ZFS code from the vendor branch and merge the result to main. I did this locally and got an empty merge, which is what I'd expect. Is there any problem with this? Second, with Subversion we had both vendor/illumos and vendor-sys/illumos, and now we just have the former, seemingly with sys/* bits imported from vendor-sys. Some of the upstream commits touch both userspace and kernel bits, but the merge targets for these in FreeBSD are different: cddl/contrib/opensolaris vs. sys/cddl/contrib/opensolaris. How should I merge into main in this case? I don't really see any options other than to split each offending upstream commit into two parts, one for userspace and one for the kernel, and merge them separately. If it helps to look at the branch where I staged the upstream commits, I've pushed it to vendor/illumos2 in https://github.com/markjdb/freebsd . From owner-freebsd-git@freebsd.org Thu Apr 22 20:07:46 2021 Return-Path: Delivered-To: freebsd-git@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 750A55FD618 for ; Thu, 22 Apr 2021 20:07:46 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FR7kp1xH6z4l92 for ; Thu, 22 Apr 2021 20:07:46 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: by mailman.nyi.freebsd.org (Postfix) id 405005FD616; Thu, 22 Apr 2021 20:07:46 +0000 (UTC) Delivered-To: git@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 400D95FD16E for ; Thu, 22 Apr 2021 20:07:46 +0000 (UTC) (envelope-from crees@bayofrum.net) Received: from mail264c50.megamailservers.eu (mail1422c50.megamailservers.eu [91.136.14.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FR7kn5f8sz4l4M; Thu, 22 Apr 2021 20:07:44 +0000 (UTC) (envelope-from crees@bayofrum.net) X-Authenticated-User: crees@uwclub.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=megamailservers.eu; s=maildub; t=1619122062; bh=askazOzzQqpGPe5reGWo4aoXIdVSWdvmKLe0eoQ3Zok=; h=Date:In-Reply-To:References:Subject:To:CC:From:From; b=hyjWMvgyEF9oupX7FAQ1U8GmatS9Ia50WEmPHMLL1/1s6HCkqxHv0Z+SzkTj3Lrbr uw25ULVhDqm7HyXiRN5eTtZXU412NEysSRmvNk8hUc8MeW4aqk+d7RW+mjE8Bgsw1x tl70lr46O3QFTdH8SmVAewLQIFyVDdSGHiliI6pI= Feedback-ID: crees@bayofrum. Received: from pegasus.bayofrum.net (host-92-6-219-129.as13285.net [92.6.219.129]) (authenticated bits=0) by mail264c50.megamailservers.eu (8.14.9/8.13.1) with ESMTP id 13MK7eNV018939; Thu, 22 Apr 2021 20:07:41 +0000 X-Spam-Status: No X-bayofrum-MailScanner-From: crees@bayofrum.net X-bayofrum-MailScanner: Found to be clean X-bayofrum-MailScanner-ID: 35121518F.A22C0 X-bayofrum-MailScanner-Information: Please contact the ISP for more information Received: from Chriss-Galaxy-S9.bayofrum.net (Chriss-Galaxy-S9.bayofrum.net [192.168.1.148]) by pegasus.bayofrum.net (Postfix) with ESMTPSA id 35121518F; Thu, 22 Apr 2021 21:07:38 +0100 (BST) Date: Thu, 22 Apr 2021 21:07:38 +0100 User-Agent: K-9 Mail for Android In-Reply-To: References: <2257024.hWAQu6Pgo9@beastie.bionicmutton.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: One surprise in commit messages with git To: Enji Cooper , Adriaan de Groot CC: git@freebsd.org, developers@freebsd.org From: Chris Rees Message-ID: X-CTCH-RefID: str=0001.0A742F22.6081D78E.001C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-VOD: Unknown X-CTCH-Spam: Unknown X-CTCH-Score: 0.000 X-CTCH-Rules: X-CTCH-Flags: 0 X-CTCH-ScoreCust: 0.000 X-CSC: 0 X-CHA: v=2.3 cv=C+OXNjH+ c=1 sm=1 tr=0 a=QLs7qdLzT5i+06VJzUEftA==:117 a=QLs7qdLzT5i+06VJzUEftA==:17 a=IkcTkHD0fZMA:10 a=3YhXtTcJ-WEA:10 a=pGLkceISAAAA:8 a=6I5d2MoRAAAA:8 a=2bgUU40Z42YKlbvdtBYA:9 a=QEXdDO2ut3YA:10 a=IjZwj45LgO3ly-622nXo:22 X-Origin-Country: GB X-Rspamd-Queue-Id: 4FR7kn5f8sz4l4M X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Mailman-Approved-At: Sat, 24 Apr 2021 08:08:27 +0000 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 20:07:46 -0000 On 22 April 2021 20:29:42 BST, Enji Cooper wrote= : > >> On Apr 22, 2021, at 8:00 AM, Adriaan de Groot >wrote: >>=20 >> There are still some surprises in the pipeline that processes >commits=2E I >> triggered one today with f365336113=2E In my commit message, I was >fixing >> something in an earlier commit, so I wrote "(bla-di-bla, fixes) >ports >> 620d7678c8=2E" >>=20 >> The commit itself refers to a PR (with the usual PR: line), 255260=2E >So >> Bugzilla automation takes over, and pastes the commit into a comment >there=2E It >> looks to me like Bugzilla takes "ports [0-9]+" in the commit message >as an SVN >> reference -- the message as-pasted as a comment in Bugzilla then >surprisingly >> - links to svnweb (which still exists) >> - links to r620, which is 26 years old >>=20 >> Overall harmless enough, but surprising for things that >look-like-a-revision- >> number but are a really a prefix to a longer hash=2E > >Hi ade, > This probably deserves a Bugzilla bug so folks on the git@ end can >resolve the commit message parsing issue=2E >Cheers, Unfortunately, it's not really that simple- the revision parsing is done d= ynamically, so if you remove that regex from Bugzilla, historical bugs with= SVN references will no longer be linked=2E Whether that's a big deal or n= ot=2E=2E=2E I would suggest instead that the regex instead be "/ports \d\d\d\d\d+/"- t= his would almost eliminate false positives with git, and preserve older lin= ks, assuming that the first SVN commit is indeed after 99999=2E=2E=2E which= off the top of my head it definitely is! Chris From owner-freebsd-git@freebsd.org Sat Apr 24 10:44:42 2021 Return-Path: Delivered-To: freebsd-git@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 0FDC05FADBE for ; Sat, 24 Apr 2021 10:44:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FS7894jKfz4nPm; Sat, 24 Apr 2021 10:44:41 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: uqs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4586528841; Sat, 24 Apr 2021 10:44:41 +0000 (UTC) (envelope-from uqs@freebsd.org) Date: Sat, 24 Apr 2021 12:44:40 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Mark Johnston Cc: freebsd-git@freebsd.org Subject: Re: vendor/illumos merges Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 10:44:42 -0000 On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: >Hi, > >Now that FreeBSD uses OpenZFS as the upstream for ZFS, vendor/illumos is >mostly unused. However, we still use illumos as an upstream for CTF >tools and DTrace, though there haven't been any imports in a while. > >illumos has put a lot of work into their CTF toolchain, and I'd like to >import that. There are a couple of snags that I'd appreciate some >guidance on. > >First, I believe I should delete now-unused ZFS code from the vendor >branch and merge the result to main. I did this locally and got an >empty merge, which is what I'd expect. Is there any problem with this? Why would you record this empty merge? If you clean up vendor/foo, just do that but don't merge a no-op back into main (nothing changed, after all). >Second, with Subversion we had both vendor/illumos and >vendor-sys/illumos, and now we just have the former, seemingly with >sys/* bits imported from vendor-sys. Some of the upstream commits touch >both userspace and kernel bits, but the merge targets for these in >FreeBSD are different: cddl/contrib/opensolaris vs. >sys/cddl/contrib/opensolaris. How should I merge into main in this >case? I don't really see any options other than to split each offending >upstream commit into two parts, one for userspace and one for the >kernel, and merge them separately. > >If it helps to look at the branch where I staged the upstream commits, >I've pushed it to vendor/illumos2 in https://github.com/markjdb/freebsd >. Can you clarify why the merging of the two might be an issue? Note that unlike subversion, in git there's no "merge a certain subtree" handling, all that is recorded is a tree of some form and then a set of parents or ancestor commits. (git is a content tracker, not really a VCS :) I was under the impression that userland and kernel imports/merges need to happen at the same time anyway, so I assume you would import all the bits under vendor/foo in 1 commit and then merge them in 1 commit into main. Is that not how it goes? Cheers Uli From owner-freebsd-git@freebsd.org Sat Apr 24 15:00:48 2021 Return-Path: Delivered-To: freebsd-git@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 B4B776227E7 for ; Sat, 24 Apr 2021 15:00:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-20.consmr.mail.gq1.yahoo.com (sonic305-20.consmr.mail.gq1.yahoo.com [98.137.64.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSDqh2qqNz3GlJ for ; Sat, 24 Apr 2021 15:00:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1619276445; bh=ESJOMdefOsGMtxO/5dy4QsleGc+C0kcdcPMF0kP5Hyt=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=XyXdqWTSgYyXeRT2UQzlQmce4kV1w+0S/WGUeBGbgdWZwP6Z2wMALex37QxBs4+1y00acFxGvE0xjDnLAvIyTQ4LzogY7oq48u41LhBrp/zcg00uuuHE+862dXtr+Ei4P5d+9Nu5kzdDHegy9XQ4Hk1q8LD3UYaSSzXHwBAphrLY7wkQlXb5kM7rdBbrsTffQSDtFwz2d+ut3VneWKp8uUlGh3e+6v/Xc2o/L43d7Lgbrx9G8+3vukhOAetIrPRlOxuwiC3prTUzefrRVHiVHOSDxRb5w4MRsfSCT50E+NuiamgcrGLKYLikjSXd+6g+D2t8Xq+rR5udMfun+mkuyg== X-YMail-OSG: 7PSj96IVM1nbfJWI44upfKxj3pRVYOuWWuNMm5FcmTavN9YTk_QROheb5xKcH16 HaQWMaETjDSWvcB4fNG1erTRhVJu_jsSwVopCF_ups4g2JWOmDpiA6UQYoWZMhDTMkE2iI4j3mhg wBkBvGBJpXEvyW5GQurXIIGFB9MU6mfYG7ow41zXDPebyY8iNfMxI81IlsH04GnDQXzZrIPF2Hd4 p7U6kqTbyEBkz4HF1SP1LS7_LK9iL6AFQKxBMGvVc0V3tAoE1U_aPz5YlmjbR0KwX_uHecXej0xC Vd5IV6IkGGRzf9DErhzAF5qLj3t7YQvB1Vw07kOSSitQlMQGjEG_unLjKA.GKaw8kEW45y2opGnJ T8ucPoHkjequMJsIIqmxWe3SQDuVa8u7p60aPrXQ5Wjasmz_s8CZ2KM2A8jLBBrNwypw5MQsO4Xi vrPGr43.lrBcbDyNlYHB79qM.nihmpQ2uF7j9WNAYM9hARUY.ocIbrKyr460lBTz9gvQrlRwJahq xspQWEeFlB5Y.jrkwoTe4iJdIuRgJ0S6zxV5hKEDR9kmOa75xJEodt6z1r9guuwTJd0O40pZgEqf e2WZt9RsdvTAFgGFM4M_k0HEagypy_clDDVK6_Sad9KsjpRhqPyGfWuAh8x0FPFeAXWsqgEebw8u DCM7KdnGDISF1_IbtcYppYUPbb8gSM1cbougwAJslGy6dM0KGVWvKizVrzhYFSkBBQ1J13DIytOB dxD6Qs0ka4oX5S8o45GqcGWh02ONlcmZZDaLr91IUDSQaBkmp4bQaR6EbwQDRaKsmXev0uDAxMFv LwVEPoF7FzQqvMe7N7jOfQqU4m9nzA51ycPZE5ytS08Tpy5EJLxYxIn1x_ib1ZnwTcMCsRag0fvS J.vyonPRa3yoDM0YGTQZARol.mMWvbcBVSrm6tttA3xsbs5rTIRGQ4ExDMpperhNn8WrM20t3ui1 4PIwQ.DfCv8PXznEG9KthniMOyDFuQ3q8q4FWCMYi8aFODfRuiIwCXFM.VP8mFWN9hEDFCbHdygJ wRLLGvfiCCQQCaLn6_sTjjNtf_5e9sNuWbgs6dJo1m3cU9hKgbmbeJ.InqD7mPGxqeHdVRQvf661 HVrXL2cznyAixu_eLc02TMLZwelFIAe.71_AT0nrE2juPwwEqDmc6Cj2C9TL.nCK1mNnBTHo4PaO 7uhU4_vnOY6D0anLuCf.Kr4FNFsVcxjZITr74xvABfn6J6c8tiI9P8w.0D7J7GrBUuqq8wFaS5Ey WvJqpjt4RYo8AKmij6rTvSclDsr66vPL8XAD2YV.n8pqtjb6lC.C7pwViuxdZE_OqEl0temOhQ.I L82pJyQjweeMpX.OaMvkizpvO4iqFj9ilh48mveYpdRtqL2fkqp3ihdqVAgv16EKAeET7MNiIvz3 gQIbIymdjdGKUXEvBIpzrIeDbnfOZGw0Vtc_V47KrsQ2mU1esERUw8FW0SZr_iAZEDFnkEsgAe3Z ykXQWn1xrAKVcq0_x1VrKWELakBZhKvyE4IQiwnND_tGacL1DPhB0EGzDgidBcEiJNVmGcUt_EqX lF6KeOnt8h1P1B.dirDCcAo8H_X6pmVK4iG32S.0t6Wsv5_pTSfxCPDf2uWsJO5tNErMlEKZs2Re CPCJyx0WaskqOc6ENboCf_HkWa6QDvyb3WSutUs22zDpPP1niOGc16iiappTt.HI6pkktiqLlDr7 arIp_hXuBTH_Yuzu7_Wmh4Jq3onYE8aWF1OjiTizauFO08EeVq3r5VQoifcm6KK1xkeGgvaMrlK8 P1fknSzl_ZVishm.u1Bq4eGzz2hr17host1gcwTL36ABIb1cZdM45C6dXdgzQDYHpz3yh0mYRBWn AuwLWQsUW6WPINcDwnZQFPzUiljzp0acePE_AU.eiJ2_sZBFpxeVzqp_kSJM01HfeljXAMnf7_k_ mNxs4PtZVyEBkSJR2DYPIXAa4NyFquEfNI7SQrFFkSHc0jGmyfzD4ysZnFKdQ4RuL0z35W78sd6n XtEXEkcDOLFEZY7TQLxK6gI.IMxG0tftYzc5kpfsT133Kd24hN8lLs1p7UAqLiIskS950J6b992C wgeTmnunarRFENNNVABN2mggglG4Efex9LcF5mzKy55Cm3_Md8f172uDPFlPhDK.nr0b3HolwB_H rOBrBcykpynPayoHgAvp9jEXrwj.pMjlcr3qbBhqXizfi.5cKn5s5QlQd.zBrCeMwVCjYUQpS3OC yOe2yvJxW4GeXJW7.5yTRVNxWlLWdwG22LdjQLA9BrP78eEZ4nHFpD7mRihiDhqGAKl1fcE9MwDP gTIQqh8uUF1kP_EPeoZ0vp5DAsrz16QaR9svsJhHr2iEbP9nkAsBlBWz40JDKLH3emwWMVQCYtYb iFUcLBWmPehRRp91Uw83.bqYil6KhSGeRcdctevvImGstkPcqgY128pNRarnjG56GcQEQDT8slEt VBA5TYcgyjRj96j.XhMTa8kEPCtlyStyZZP6hOHq_RsEIeX0G58YIKrXCmgnYf67U1nluDTe2OUv f4N6MG9rG6P0b X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Sat, 24 Apr 2021 15:00:45 +0000 Received: by kubenode532.mail-prod1.omega.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 076f820390c7d7b42938ddd7fad9406c; Sat, 24 Apr 2021 15:00:40 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: vendor/illumos merges From: Mark Millard In-Reply-To: Date: Sat, 24 Apr 2021 08:00:37 -0700 Cc: Mark Johnston , freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: To: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FSDqh2qqNz3GlJ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 15:00:48 -0000 On 2021-Apr-24, at 03:44, Ulrich Sp=C3=B6rlein = wrote: > On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: >> Hi, >>=20 >> Now that FreeBSD uses OpenZFS as the upstream for ZFS, vendor/illumos = is >> mostly unused. However, we still use illumos as an upstream for CTF >> tools and DTrace, though there haven't been any imports in a while. >>=20 >> illumos has put a lot of work into their CTF toolchain, and I'd like = to >> import that. There are a couple of snags that I'd appreciate some >> guidance on. >>=20 >> First, I believe I should delete now-unused ZFS code from the vendor >> branch and merge the result to main. I did this locally and got an >> empty merge, which is what I'd expect. Is there any problem with = this? >=20 > Why would you record this empty merge? If you clean up vendor/foo, = just do that but don't merge a no-op back into main (nothing changed, = after all). >=20 >> Second, with Subversion we had both vendor/illumos and >> vendor-sys/illumos, and now we just have the former, seemingly with >> sys/* bits imported from vendor-sys. Some of the upstream commits = touch >> both userspace and kernel bits, but the merge targets for these in >> FreeBSD are different: cddl/contrib/opensolaris vs. >> sys/cddl/contrib/opensolaris. How should I merge into main in this >> case? I don't really see any options other than to split each = offending >> upstream commit into two parts, one for userspace and one for the >> kernel, and merge them separately. >>=20 >> If it helps to look at the branch where I staged the upstream = commits, >> I've pushed it to vendor/illumos2 in = https://github.com/markjdb/freebsd >> . >=20 > Can you clarify why the merging of the two might be an issue? Note = that unlike subversion, in git there's no "merge a certain subtree" = handling It might be an ambiguous terminology context for what is being referenced, but there is : # man git-subtree GIT-SUBTREE(1) = GIT-SUBTREE(1) NAME git-subtree - Merge subtrees together and split repository into subtrees SYNOPSIS git subtree add -P git subtree add -P git subtree pull -P git subtree push -P git subtree merge -P git subtree split -P [OPTIONS] [] . . . Its usage has tradeoffs from what I can tell reading about it as an alternative to submodules. There is also a not-predefined-in-git alternative: https://github.com/ingydotnet/git-subrepo#readme > , all that is recorded is a tree of some form and then a set of = parents or ancestor commits. (git is a content tracker, not really a VCS = :) >=20 > I was under the impression that userland and kernel imports/merges = need to happen at the same time anyway, so I assume you would import all = the bits under vendor/foo in 1 commit and then merge them in 1 commit = into main. Is that not how it goes? =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Sat Apr 24 15:09:00 2021 Return-Path: Delivered-To: freebsd-git@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 07803622F21 for ; Sat, 24 Apr 2021 15:09:00 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSF176Rlrz3G5f; Sat, 24 Apr 2021 15:08:59 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qt1-x82c.google.com with SMTP id f12so38516910qtf.2; Sat, 24 Apr 2021 08:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=PrnQ9wb5PoSUhb54HKvF9B/1foilTEiCHth51FP3lpU=; b=jBtgp6Mp9TzyaCyu6DOjeHGm9yalYQG5dbV8t248r1vPi1/tSorIi+Q0rEFt69EjvI SZ4X6bOB1zYt/jEEeIq3udF95qYqigk8dMl7Csf+jh8ZAUDW56HnWSCsYJ7Bicrfo1qD 5podH3VpOoVYYCW9WhB2ctj2LMnNn3YQ4/OsVAaAXZ+4m+Q/q8a+Kmzfn7wWm3RYQ8xU toS19lyeO5emtlthLwltWbq8pHZ5Tg2uGh+QchUHqpq3uGkresWOTJXGhNgyYxzGM+TJ eWOOUB5ZFyNC++B5bLXd53OWOkYn/8eH152U0Rnop5MdI2sSqbwQCPUy6G0y4vSql2aH BGag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to; bh=PrnQ9wb5PoSUhb54HKvF9B/1foilTEiCHth51FP3lpU=; b=fzBYf8/Vz1BxI8OkzgzqkTW2SeDwZ0wR4bxaUeEHe3EMhvZB/OjdUt2oV10UCaWOE3 r2847QfdFrA0u04OZsv2FTz130DdthVJn3VavEVmCPIdyL1khYpFRXKCIoVWC9GL0m+C pW9mZQcMthQa8ZzSf5iAX+NwySSop+0iJGkgnOmrXNiEjqiezU/xIaoArHrUe6vOTl1y aUCWCFblfeQMMMCBnOMVNDEXBJ/b4CHzxM26GDFvPnPiOCIXQuewBYUZ0XaUOylxZCNZ 2C1ftcbUl3z05ZD7yh72IhQupOQWuqWxETJqTMpPRdk15JMNVBE9R6T5dg51LT6NEorf otpg== X-Gm-Message-State: AOAM530Op+0QkcI3uzrmvb0pf8W85h8a/V3nsJVrn9EjQmOVsy+l1jk9 kYNE9cbabW/frpMsFwmBOAniIF54AYAoYw== X-Google-Smtp-Source: ABdhPJwDUkz5bMBWKSim9n6MvS534LW6/FIYkAeBFXSmENV0xinC2mAfa9M6F/XMaN+UotHKyh0FDw== X-Received: by 2002:a05:622a:205:: with SMTP id b5mr8387970qtx.186.1619276939066; Sat, 24 Apr 2021 08:08:59 -0700 (PDT) Received: from nuc ([142.126.164.150]) by smtp.gmail.com with ESMTPSA id h7sm6519306qka.39.2021.04.24.08.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 08:08:58 -0700 (PDT) Sender: Mark Johnston Date: Sat, 24 Apr 2021 11:08:58 -0400 From: Mark Johnston To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: freebsd-git@freebsd.org Subject: Re: vendor/illumos merges Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4FSF176Rlrz3G5f X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 15:09:00 -0000 On Sat, Apr 24, 2021 at 12:44:40PM +0200, Ulrich Spörlein wrote: > On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: > >Hi, > > > >Now that FreeBSD uses OpenZFS as the upstream for ZFS, vendor/illumos is > >mostly unused. However, we still use illumos as an upstream for CTF > >tools and DTrace, though there haven't been any imports in a while. > > > >illumos has put a lot of work into their CTF toolchain, and I'd like to > >import that. There are a couple of snags that I'd appreciate some > >guidance on. > > > >First, I believe I should delete now-unused ZFS code from the vendor > >branch and merge the result to main. I did this locally and got an > >empty merge, which is what I'd expect. Is there any problem with this? > > Why would you record this empty merge? If you clean up vendor/foo, just > do that but don't merge a no-op back into main (nothing changed, after > all). Ok, I guess there is no reason to merge that change separately. It will end up being merged with subsequent imports though. > >Second, with Subversion we had both vendor/illumos and > >vendor-sys/illumos, and now we just have the former, seemingly with > >sys/* bits imported from vendor-sys. Some of the upstream commits touch > >both userspace and kernel bits, but the merge targets for these in > >FreeBSD are different: cddl/contrib/opensolaris vs. > >sys/cddl/contrib/opensolaris. How should I merge into main in this > >case? I don't really see any options other than to split each offending > >upstream commit into two parts, one for userspace and one for the > >kernel, and merge them separately. > > > >If it helps to look at the branch where I staged the upstream commits, > >I've pushed it to vendor/illumos2 in https://github.com/markjdb/freebsd > >. > > Can you clarify why the merging of the two might be an issue? Note that > unlike subversion, in git there's no "merge a certain subtree" handling, > all that is recorded is a tree of some form and then a set of parents or > ancestor commits. (git is a content tracker, not really a VCS :) > > I was under the impression that userland and kernel imports/merges need > to happen at the same time anyway, so I assume you would import all the > bits under vendor/foo in 1 commit and then merge them in 1 commit into > main. Is that not how it goes? How can I do that with git subtree merge? Suppose an illumos commit modifies cmd/dtrace/foo.c (userspace) and uts/common/dtrace/foo.c (kernel). That maps to cddl/contrib/opensolaris/cmd/dtrace/foo.c and sys/cddl/contrib/opensolaris/uts/common/dtrace/foo.c in FreeBSD, respectively. So to do a subtree merge, I need to use distinct prefixes depending on whether I'm importing userspace or kernel changes. When they are mixed together, it's not clear to me how I can merge at all. I see that for OpenZFS we keep all code, including userspace code, under sys/contrib/openzfs, so it doesn't have this problem.