From owner-freebsd-git@freebsd.org Sun Dec 27 01:23:06 2020 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 81BAF4C88BA for ; Sun, 27 Dec 2020 01:23:06 +0000 (UTC) (envelope-from philip@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 4D3NGf3B6Hz3DbX for ; Sun, 27 Dec 2020 01:23:06 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 6D3594C89DF; Sun, 27 Dec 2020 01:23:06 +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 6CF8B4C87D5 for ; Sun, 27 Dec 2020 01:23:06 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3NGf2dHzz3DNM; Sun, 27 Dec 2020 01:23:06 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [46.235.227.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 332EC2D824; Sun, 27 Dec 2020 01:23:06 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [IPv6:2a01:4f9:2a:1715::1:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits)) (Client CN "rincewind.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4D3NGd1BLLz1d91; Sun, 27 Dec 2020 01:23:05 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4D3NGb6Cdpz62Zn; Sun, 27 Dec 2020 01:23:03 +0000 (UTC) From: "Philip Paeps" To: "Ulrich =?utf-8?q?Sp=C3=B6rlein?=" Cc: git@freebsd.org Subject: Re: git log --graph in the face of vendor imports Date: Sun, 27 Dec 2020 09:22:59 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5757) Message-ID: <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit 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: Sun, 27 Dec 2020 01:23:06 -0000 On 2020-12-26 18:22:57 (+0800), Ulrich Spörlein wrote: > On Sat, 2020-12-26 at 11:29:41 +0800, Philip Paeps wrote: >> I have this alias to make `git log --graph` meaningful: >> >> ``` >> [alias] >> llog = log --graph >> --pretty=format:'%C(yellow)%h%C(red)%d%Creset %s %C(blue)- %an, >> %ar%Creset' >> ``` >> >> I noticed that in our repository, the graph shifts farther to the >> right >> with each vendor import. Is this expected behaviour? > > Yes. Fun fact: the right combination of format flags makes git > segfault! Oh good. It's not just me for once. ;-) Though I haven't managed to make it segfault yet. I'm sure it's only a matter of time. I just wanted to make sure that the "drifting to the right" was expected. It looks odd. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Sun Dec 27 10:23:11 2020 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 C7FC44B63CA for ; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) (envelope-from uqs@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 4D3cFq5JX9z4RWg for ; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id B464F4B62EF; Sun, 27 Dec 2020 10:23:11 +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 B42D64B6536 for ; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3cFq3YQrz4RLy; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BRAN2Vn063378 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 27 Dec 2020 11:23:02 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 27 Dec 2020 11:23:02 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Philip Paeps Cc: git@freebsd.org Subject: Re: git log --graph in the face of vendor imports Message-ID: References: <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D3cFq3YQrz4RLy 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: Sun, 27 Dec 2020 10:23:11 -0000 On Sun, 2020-12-27 at 09:22:59 +0800, Philip Paeps wrote: >On 2020-12-26 18:22:57 (+0800), Ulrich Spörlein wrote: >> On Sat, 2020-12-26 at 11:29:41 +0800, Philip Paeps wrote: >>> I have this alias to make `git log --graph` meaningful: >>> >>> ``` >>> [alias] >>> llog = log --graph >>> --pretty=format:'%C(yellow)%h%C(red)%d%Creset %s %C(blue)- %an, >>> %ar%Creset' >>> ``` >>> >>> I noticed that in our repository, the graph shifts farther to the >>> right >>> with each vendor import. Is this expected behaviour? >> >> Yes. Fun fact: the right combination of format flags makes git >> segfault! > >Oh good. It's not just me for once. ;-) > >Though I haven't managed to make it segfault yet. I'm sure it's only a >matter of time. > >I just wanted to make sure that the "drifting to the right" was >expected. It looks odd. > >Philip log --graph is probably useless for the FreeBSD repo, as we don't have any other development branches other than main. Stable and co are just receiving cherry-picks and vendor branches don't see any "development" per se. Only merges between user/projects and main would be of interest, but they are littered with "IFC" merges and make everything a thousand times worse, so I'm not recording all those IFCs as merges. Cheers Uli From owner-freebsd-git@freebsd.org Sun Dec 27 11:14:18 2020 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 A3B314B7723 for ; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@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 4D3dNp46Pmz4TqL for ; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 8D1694B7721; Sun, 27 Dec 2020 11:14:18 +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 8CE014B7A16 for ; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3dNp3VLbz4TyH; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [IPv6:2a00:1098:82:3a::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 55BCA106A; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [95.216.22.234]) (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 "rincewind.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4D3dNm21kQz1dRJ; Sun, 27 Dec 2020 11:14:16 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4D3dNj6SQVz62rh; Sun, 27 Dec 2020 11:14:13 +0000 (UTC) From: "Philip Paeps" To: "Ulrich =?utf-8?q?Sp=C3=B6rlein?=" Cc: git@freebsd.org Subject: Re: git log --graph in the face of vendor imports Date: Sun, 27 Dec 2020 19:14:09 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5757) Message-ID: In-Reply-To: References: <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit 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: Sun, 27 Dec 2020 11:14:18 -0000 On 2020-12-27 18:23:02 (+0800), Ulrich Spörlein wrote: > On Sun, 2020-12-27 at 09:22:59 +0800, Philip Paeps wrote: >> On 2020-12-26 18:22:57 (+0800), Ulrich Spörlein wrote: >>> On Sat, 2020-12-26 at 11:29:41 +0800, Philip Paeps wrote: >>>> I have this alias to make `git log --graph` meaningful: >>>> >>>> ``` >>>> [alias] >>>> llog = log --graph >>>> --pretty=format:'%C(yellow)%h%C(red)%d%Creset %s %C(blue)- %an, >>>> %ar%Creset' >>>> ``` >>>> >>>> I noticed that in our repository, the graph shifts farther to the >>>> right >>>> with each vendor import. Is this expected behaviour? >>> >>> Yes. Fun fact: the right combination of format flags makes git >>> segfault! >> >> Oh good. It's not just me for once. ;-) >> >> Though I haven't managed to make it segfault yet. I'm sure it's only >> a >> matter of time. >> >> I just wanted to make sure that the "drifting to the right" was >> expected. It looks odd. >> >> Philip > > log --graph is probably useless for the FreeBSD repo, as we don't have > any other development branches other than main. Stable and co are just > receiving cherry-picks and vendor branches don't see any "development" > per se. I really use my 'llog' alias more as a shortcut for 'log --pretty=oneline' than out of genuine interest in the graph. :) > Only merges between user/projects and main would be of interest, but > they are littered with "IFC" merges and make everything a thousand > times worse, so I'm not recording all those IFCs as merges. That makes sense. There's a lot of crazy stuff in our history. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Sun Dec 27 17:16:34 2020 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 5BF1A4C0878 for ; Sun, 27 Dec 2020 17:16:34 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3nQp250fz4r4S for ; Sun, 27 Dec 2020 17:16:34 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 45C684C0877; Sun, 27 Dec 2020 17:16:34 +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 458A14C0876 for ; Sun, 27 Dec 2020 17:16:34 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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 (2048 bits) client-digest SHA256) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3nQn6BBqz4r7P; Sun, 27 Dec 2020 17:16:33 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.16.1/8.16.1) with ESMTPS id 0BRHGPcY001373 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 27 Dec 2020 09:16:25 -0800 (PST) (envelope-from glebius@freebsd.org) Received: (from glebius@localhost) by cell.glebi.us (8.16.1/8.16.1/Submit) id 0BRHGPrM001372; Sun, 27 Dec 2020 09:16:25 -0800 (PST) (envelope-from glebius@freebsd.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@freebsd.org using -f Date: Sun, 27 Dec 2020 09:16:25 -0800 From: Gleb Smirnoff To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org Subject: Re: Please review: suggested final merge commit on the legacy repo Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="VP4tQn3aA4IokocB" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4D3nQn6BBqz4r7P 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:27348, ipnet:162.251.186.0/24, country:US] 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: Sun, 27 Dec 2020 17:16:34 -0000 --VP4tQn3aA4IokocB Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Ulrich, On Sat, Dec 26, 2020 at 01:38:10PM +0100, Ulrich Spörlein wrote: U> Hi folks, U> please have a look at the suggested merge commit, that merges master and U> main, which should allow folks that have significant work on the old U> hashes to: U> U> git remote add freebsd-legacy https://github.com/freebsd/freebsd-legacy.git && git fetch freebsd-legacy U> U> git merge freebsd-legacy/master (this should work mostly conflict free U> git merge 3cc0c0d66a065554459bd2f9b4f80cc07426464a (this is the main at the state of what legacy master is) U> U> and then they have a shared ancestry (though twice the commits). U> U> For rebase based workflows, rebasing onto legacy master should similarly U> work mostly conflict free, then they should be able to rebase onto U> 3cc0c0d66a065554459bd2f9b4f80cc07426464a sans any conflicts and finally U> rebase onto freebsd/main with the usual set of newly introduced U> conflicts. U> U> The wiki still needs updates to the final hashes now, something I'll do U> at some point. U> U> Ideally, we can push this final commit to master before New Years and U> then we can start mirroring the new main/stable/releng into GH. master U> will be garbage collected at some future date. Here is suggested text. -- Gleb Smirnoff --VP4tQn3aA4IokocB Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="11f284b67940-commit.txt" commit 11f284b67940bcacb2f618858b901e9254ef5992 Merge: 9e4440ca5ba7 3cc0c0d66a06 Author: Gleb Smirnoff AuthorDate: Wed Dec 23 22:44:48 2020 -0800 Commit: Gleb Smirnoff CommitDate: Sun Dec 27 09:15:53 2020 -0800 !!! IMPORTANT ANNOUNCEMENT !!! This commit is the last commit to the legacy FreeBSD github mirror, that used to import data from official FreeBSD subversion and resided at https://github.com/freebsd/freebsd.git. The new FreeBSD github mirror imports data from official FreeBSD git. The history in the new git tree is different to the legacy one. Thus, if you were using the legacy tree to base your work on, you need to migrate. This commit merges the legacy tree and the new tree together. This will allow you to migrate without rebasing. Once you pulled in this commit and merged it to your tree, you need to switch to the new remote and from now on merge from it. The following example assumes your current remote for FreeBSD is named 'FreeBSD': % git remote rename FreeBSD legacy % git remote add FreeBSD anongit@git.freebsd.org:src.git % git fetch legacy/master % git rev-parse legacy/master # shall return this commit! % git merge legacy/master # the last merge from legacy % git remote delete legacy % git fetch FreeBSD/main % git merge FreeBSD/main # the way to merge from now on % git gc # you may want to run this once after the first merge Please consult with https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree for any changes for the above instructions in the future. --VP4tQn3aA4IokocB-- From owner-freebsd-git@freebsd.org Sun Dec 27 20:43:07 2020 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 2F2A14C602F for ; Sun, 27 Dec 2020 20:43:07 +0000 (UTC) (envelope-from uqs@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 4D3t170t65z3NKV for ; Sun, 27 Dec 2020 20:43:07 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 1DFA04C622B; Sun, 27 Dec 2020 20:43:07 +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 1DC114C6285 for ; Sun, 27 Dec 2020 20:43:07 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3t166LdFz3NBZ; Sun, 27 Dec 2020 20:43:06 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BRKh3Ca001116 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 27 Dec 2020 21:43:04 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 27 Dec 2020 21:43:03 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Gleb Smirnoff Cc: git@freebsd.org Subject: Re: Please review: suggested final merge commit on the legacy repo 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.1 (2020-11-14) X-Rspamd-Queue-Id: 4D3t166LdFz3NBZ 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: Sun, 27 Dec 2020 20:43:07 -0000 Thanks Gleb, I think the "centering" on the first line needs to go, it might confuse people's git log output. Furthermore, we're advocating for "freebsd" as the origin name, not "FreeBSD". Even more, we don't want folks to rename their remote, as we'll be re-using the GH remote, so they need to explictly add a legacy one, no? I did a test run of merge-based and rebase-based histories earlier today and jotted down my notes in https://github.com/freebsd/git_conv/wiki/Rebase---Merge-experiments , though there's nothing in there you don't already know. We should probably also make it clear that going forward, one should try to branch from a fresh main, and not schlepp around every commit twice :( I'll update the wiki page with the recommendation in a bit. I also wonder if we really should make this a merge commit, or a regular commit. From my notes above, it's actually rather easy to merge in legacy-master, then main-as-of-3cc0c0d66a06 and then main. The first step needs to be done anyway, the 2nd is guaranteed to be conflict free and the third step is just another regular merge-from-head. And people that merge in stable/X need to do this anyway. Also missing is a way for them to reach out for more help, the link to the wiki might give some folks ideas, but I think we can be more explicit here. I've inlined the short set of commands required that should work for main and stable (and have tested some of them, though I'm less sure about the various upstream magic that happens with git rebase, as one can elect to not provide half the refs) Please see the latest commit on https://github.com/uqs/freebsd Thanks Uli > >-- >Gleb Smirnoff >commit 11f284b67940bcacb2f618858b901e9254ef5992 >Merge: 9e4440ca5ba7 3cc0c0d66a06 >Author: Gleb Smirnoff >AuthorDate: Wed Dec 23 22:44:48 2020 -0800 >Commit: Gleb Smirnoff >CommitDate: Sun Dec 27 09:15:53 2020 -0800 > > !!! IMPORTANT ANNOUNCEMENT !!! > > This commit is the last commit to the legacy FreeBSD github mirror, that > used to import data from official FreeBSD subversion and resided at > https://github.com/freebsd/freebsd.git. > > The new FreeBSD github mirror imports data from official FreeBSD git. The > history in the new git tree is different to the legacy one. Thus, if you > were using the legacy tree to base your work on, you need to migrate. > > This commit merges the legacy tree and the new tree together. This will > allow you to migrate without rebasing. Once you pulled in this commit > and merged it to your tree, you need to switch to the new remote and > from now on merge from it. The following example assumes your current > remote for FreeBSD is named 'FreeBSD': > > % git remote rename FreeBSD legacy > % git remote add FreeBSD anongit@git.freebsd.org:src.git > % git fetch legacy/master > % git rev-parse legacy/master # shall return this commit! > % git merge legacy/master # the last merge from legacy > % git remote delete legacy > % git fetch FreeBSD/main > % git merge FreeBSD/main # the way to merge from now on > % git gc # you may want to run this once after the first merge > > Please consult with > > https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree > > for any changes for the above instructions in the future. > From owner-freebsd-git@freebsd.org Sun Dec 27 21:05:33 2020 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 A3E444C6E7D for ; Sun, 27 Dec 2020 21:05:33 +0000 (UTC) (envelope-from rene@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 4D3tW143HQz3R5p for ; Sun, 27 Dec 2020 21:05:33 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 8AFD34C7420; Sun, 27 Dec 2020 21:05:33 +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 8AC204C7501 for ; Sun, 27 Dec 2020 21:05:33 +0000 (UTC) (envelope-from rene@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 4D3tW13W1tz3R7l; Sun, 27 Dec 2020 21:05:33 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1609103133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mldxYyDb7t/2gPI9UlNsi+nqUVDx9lde5NT3BwATQRA=; b=SuefJ85pZOLZB/EQSmVJHwNl0MIHM94HgKlu9R9Gb+aFrM2ZtFCFADeIkwaBHTt3MzsMV0 cRHfYNbtyz2Q7/twwdme10WLk0GSK6ayYNa/i07g9gC9QG34s7+RwFICjAE9pA+MFLxoNz H0Iwm9ipc2BCUx6Q3D8xUgkvdPkbeH6xOPL5u0lQY7y3m+7wEV0iRgSnldc87apGkOsWWQ s/n+BEHCAPMn7MjHwBCZR1HpBLiB/0t52ZS/PidOl8ARfMw8sUa8pE8SgkhoqpMfNecbg2 d6NExmNvNnXoOyCkNh+3rENcpOUK1QA9yiOnEcogb7pm8J+OUMkkqPf0R1cbsg== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 713C04867; Sun, 27 Dec 2020 21:05:33 +0000 (UTC) Date: Sun, 27 Dec 2020 21:05:33 +0000 From: Rene Ladan To: portmgr@freebsd.org, git@freebsd.org Subject: preliminary version of rmport using git Message-ID: <20201227210533.GA31271@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1609103133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mldxYyDb7t/2gPI9UlNsi+nqUVDx9lde5NT3BwATQRA=; b=aSUrg3hy8jc/fNQaJYXK7WDsZyXf3t+gXuggbhEg189KwlfJVGBpcPDKqthetV2H7jmkJj 9z4INiNsfAtaD6nf1MxIuplW1sqvC0te5FkJm7NU0pd+6ZEQb/MTg9Fi41+cMEhF6bFjH4 FSjwqaYASPvuxvNSVgQl4vDjQwQ6mjWThCGAIUgaQF9oF4dhpmRmQ7v+ZbQ1AiOcBp9o0j ftR0dTOku3mxJZYUtBUBvvzRj/mkA5nAQWJKcl0L2Fi7iLWnAS2/l6U0O/HS1Bi08zVgk6 8bdjGdDxry2ioD8Fd7DTOMAILjTp18id/1bGf1zPifgLfyPm8SDM1HLi/YRrgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1609103133; a=rsa-sha256; cv=none; b=ETxhz2+9kZIqpaaQm7sf+Ee08cJOmzPpRziRCVCXNSjcGmemY9kyT0P3uT3lo9x1KgCofJ bDsLCTv/9FWD6KhyB2PbKsOPyoD5xVhd1jT4+AsmrZv829OZ1CYOBRM0q2WLWFV8VsKj/Q 2PPk3etlgMCkytWf7M61lq7kx3T0PQ32KcslnMkcpccXha3xPWnobMK0iv6bPP3e/ukEmx jSq1jVKM5OOaGG0abrSHZjhXH6MMQici0WdvUZqxF8uGP63sk0Di4JRbgqMKqwsEdOkpiJ 23YkJnKMa23wGmffG5gj0W+mioRYVVnu/qm01FilsEyua3xXSg2m+l0M9IJ5pA== 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: Sun, 27 Dec 2020 21:05:33 -0000 Hi, just a quick note to say that Tools/scripts/rmport is mostly converted to git. Some outstanding issues: - Replace the git merge with an equivalent of "git push freebsd working:main" ? The first method feels more familiar/natural to me whilst the second one is what [1] prescribes. - Test the changes on the dev repository. After that I plan to tackle the other big scripts (mfh and addport) and some smaller scripts (svn/git-wise) after that. The current diff is available at [2]. [1] https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md [2] https://people.freebsd.org/~rene/stuff/rmport.diff Regards, René From owner-freebsd-git@freebsd.org Mon Dec 28 12:05:15 2020 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 9E3A84B217E for ; Mon, 28 Dec 2020 12:05:15 +0000 (UTC) (envelope-from naddy@mips.inka.de) Received: from mail.inka.de (mail.inka.de [IPv6:2a04:c9c7:0:1073:217:a4ff:fe3b:e77c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4GT66gNSz3LMD; Mon, 28 Dec 2020 12:05:14 +0000 (UTC) (envelope-from naddy@mips.inka.de) Received: from mips.inka.de (naddy@[127.0.0.1]) by mail.inka.de with uucp (rmailwrap 0.5) id 1ktrGr-004iJz-NT; Mon, 28 Dec 2020 13:05:05 +0100 Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.16.1/8.16.1) with ESMTP id 0BSC0ZmE046465; Mon, 28 Dec 2020 13:00:35 +0100 (CET) (envelope-from naddy@lorvorc.mips.inka.de) Received: (from naddy@localhost) by lorvorc.mips.inka.de (8.16.1/8.16.1/Submit) id 0BSC0ZZE046464; Mon, 28 Dec 2020 13:00:35 +0100 (CET) (envelope-from naddy) Date: Mon, 28 Dec 2020 13:00:35 +0100 From: Christian Weisgerber To: Rene Ladan Cc: freebsd-git@freebsd.org Subject: Re: preliminary version of rmport using git Message-ID: References: <20201227210533.GA31271@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201227210533.GA31271@freefall.freebsd.org> X-Rspamd-Queue-Id: 4D4GT66gNSz3LMD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of naddy@mips.inka.de has no SPF policy when checking 2a04:c9c7:0:1073:217:a4ff:fe3b:e77c) smtp.mailfrom=naddy@mips.inka.de X-Spamd-Result: default: False [-2.10 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from]; FREEFALL_USER(0.00)[naddy]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[inka.de]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:202113, ipnet:2a04:c9c7::/32, country:DE]; RCVD_TLS_LAST(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: Mon, 28 Dec 2020 12:05:15 -0000 Rene Ladan: > just a quick note to say that Tools/scripts/rmport is mostly converted > to git. Some outstanding issues: > [2] https://people.freebsd.org/~rene/stuff/rmport.diff +elif [ -n "$(command -v got 2>/dev/null)" ]; then + GIT=got # XXX(rene) usable enough? Not like this, anyway. Got is NOT a drop-in replacement for git. Neither the command line syntax nor the work tree format are compatible. -- Christian "naddy" Weisgerber naddy@mips.inka.de From owner-freebsd-git@freebsd.org Mon Dec 28 13:46:49 2020 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 9A2804B58B6 for ; Mon, 28 Dec 2020 13:46:49 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) (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 4D4JkK3w9wz3jx8 for ; Mon, 28 Dec 2020 13:46:49 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-yb1-f178.google.com with SMTP id k4so9747606ybp.6 for ; Mon, 28 Dec 2020 05:46:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XUBgpv3SiVBubvt4c9T7IYoPNZZcU4KWMOr14wlyBQg=; b=WCotm0ldNXQomHIbuugDz7o498HO/IdmgKATDTFg8KOo74LaHTm97Njf+sVLhjfYSx JIvcpQPlLFKyfpps6Hx2060pcm/KKEZSlCbfT5W+pdITMV/gqOa+TbYbYctCeTnRqddt ISJk+Jhq+qzTscchRMA8X1Z5wg0+OtITgzYRjossWBTB8oR9KwLoaKGw6tGUvLLtW/9r bBlPY6cScWhM/je9VArbQPe9BQzN5Yf5J28IKcDGnHqbE1Pag39S5CDwwVwkPi59I7W9 Kd4FMswGOFbsH+wPYzbD2ONJUnw3Q4osVRQzu/HIJ2jZxiH84eS/I4wQtRB9wOVRqv3w O58Q== X-Gm-Message-State: AOAM532e7fim7+ywZsGfa/sYPDQK9iBAHs+pemtuFvDBigoIVFPihtYx YZ9g0wJJvO1Tap++x1PJ/gLPYH0Dz1BCK/o2JiLcqFppn9o3LA== X-Google-Smtp-Source: ABdhPJxAbKPrTVw0YPMY/laA7JNgHcks+avansGZIWfQLbp3oTwrBNR4k9nTM1EU3AE4Dbwpix6s6nxkR+k2qcSrwTg= X-Received: by 2002:a05:6902:728:: with SMTP id l8mr64411726ybt.399.1609163208653; Mon, 28 Dec 2020 05:46:48 -0800 (PST) MIME-Version: 1.0 References: <2EF9A8FC-0C6B-42B0-A0DC-32D882DE22F9.ref@yahoo.com> <2EF9A8FC-0C6B-42B0-A0DC-32D882DE22F9@yahoo.com> In-Reply-To: <2EF9A8FC-0C6B-42B0-A0DC-32D882DE22F9@yahoo.com> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Mon, 28 Dec 2020 14:46:37 +0100 Message-ID: Subject: Re: git log --graph in the face of vendor imports To: Mark Millard Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4D4JkK3w9wz3jx8 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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: Mon, 28 Dec 2020 13:46:49 -0000 On Sun, Dec 27, 2020 at 9:14 PM Mark Millard wrote: > Ulrich Sp=C3=B6rlein uqs at freebsd.org wrote on > Sat Dec 26 10:23:00 UTC 2020 : > > > Yes. Fun fact: the right combination of format flags makes git segfault= ! > > > > . . . > > > > [alias] > > glog =3D log --graph --pretty=3Dformat:'%Cred%h %C(green)%t %Creset > -%C(yellow)%d%Creset %s %Cgreen(%an, %cr, %ad)%Creset' --date=3Dshort > > gnlog =3D log --graph --pretty=3Dformat:'%Cred%h %C(green)%t %Creset > %C(red)%ad %Creset-%C(yellow)%d%Creset %s %n %N %-GG' --date=3Dshort > > > > > > % git gnlog > > > > > > % git glog > > > > error: git died of signal 11 > > > > I tried these via the below (copy/paste but for adding "git " as a prefix= ) > and got no crash: > > # git log --graph --pretty=3Dformat:'%Cred%h %C(green)%t %Creset > -%C(yellow)%d%Creset %s %Cgreen(%an, %cr, %ad)%Creset' --date=3Dshort > . . . > * 9002c02abc58 515fc124b039 - Initial import, 0.1 + pk 0.2.4-B1 (Rodney > W. Grimes, 28 years ago, 1993-06-12) > > > # qgit log --graph --pretty=3Dformat:'%Cred%h %C(green)%t %Creset %C(red)= %ad > %Creset-%C(yellow)%d%Creset %s %n %N %-GG' --date=3Dshort > . . . > * 9002c02abc58 515fc124b039 1993-06-12 - Initial import, 0.1 + pk > 0.2.4-B1 > svn path=3D/cvs2svn/branches/tcpdump/; revision=3D2 > > FYI: > > # pkg info git-lite > git-lite-2.29.2 > Name : git-lite > Version : 2.29.2 > Installed on : Sat Dec 12 10:54:47 2020 PST > Origin : devel/git > Architecture : FreeBSD:13:amd64 > Prefix : /usr/local > Categories : devel > Licenses : GPLv2 > Maintainer : garga@FreeBSD.org > WWW : https://git-scm.com/ > Comment : Distributed source code management tool (lite flavor) > Options : > CURL : on > HTMLDOCS : off > ICONV : on > NLS : on > PCRE : on > PCRE2 : off > SUBTREE : on > Shared Libs required: > libexpat.so.1 > libpcre.so.1 > libintl.so.8 > libcurl.so.4 > Annotations : > FreeBSD_version: 1300131 > flavor : lite > repo_type : binary > repository : custom > Flat size : 24.9MiB > Description : > Git is a free and open source distributed version control system designed > to > handle everything from small to very large projects with speed and > efficiency. > > This version provides the bare minimum git experience without any binding= s. > > WWW: https://git-scm.com/ > > # uname -apKU > FreeBSD FBSDFHUGE 13.0-CURRENT FreeBSD 13.0-CURRENT #5 r368820M: Sat Dec > 19 21:07:35 PST 2020 root@FBSDFHUGE:/usr/obj/amd64_clang/amd64.amd64/= usr/src/amd64.amd64/sys/GENERIC-NODBG > amd64 amd64 1300132 1300132 > > Btw, all of your emails always end up in Gmail spam, because you're sending from Yahoo.com and their Spam settings are incompatible with mailling lists that re-send using the same From: address. You should use a different email provider for mailing lists like this one. It might all depend on the terminal being used and the pager, etc. I played around a little but couldn't find a setting that made much of a difference. I've added devel/git to my WITH_DEBUG_PORTS and might play around with a debugger during the week, no promises though. Also, I'm still on, as I had to lock the git version, because newer versions are segfaulting when reading back the marks file from git-fast-import during incremental runs of the converter % git --version git version 2.24.0 Ctrl-f for 2.24 on https://github.com/freebsd/git_conv/blob/master/README.m= d to see some of the nonsense I had to deal with. Cheers Uli From owner-freebsd-git@freebsd.org Mon Dec 28 16:30:22 2020 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 C78AA4BA823 for ; Mon, 28 Dec 2020 16:30:22 +0000 (UTC) (envelope-from rene@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 4D4NM25Nnjz3wJP; Mon, 28 Dec 2020 16:30:22 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1609173022; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dg3q53VHSbS/Fj+aN7iWeP63xSXEE/OT4ZUwmGVNSx4=; b=l9N4sZOF+UJqbNgQA3r5oIBi3tMfzFjLoxA8rCnk/1t0ysgy1CTQnDX/GNweq9FIG5Cf9Y 2BcP45ukECzb1POj3xPxF25kfrFybeTw4/1T2yKtbhIj1iq2kTdzGl0OWmPYd88bk/tcjh QDiXe6jN3NAIEJJOL+Ii894mPW/UgkWzQyYYGO9X6W4LfL7WqiRqZEAKP/9jDKR+1RNgf/ 1FaZFzQuk0RxzLjSD77P+N3ANokH87EN+uRbn5D+/9+pSH53GS8GF8JXO6olmd6CqjNHSG fqkwGLI4vrhceSC4me3LfaAjeYkjaf2S5236poQjkyhziB2F2Eqk0PbFXUnZgA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id B2033156F1; Mon, 28 Dec 2020 16:30:22 +0000 (UTC) Date: Mon, 28 Dec 2020 16:30:22 +0000 From: Rene Ladan To: Christian Weisgerber Cc: freebsd-git@freebsd.org Subject: Re: preliminary version of rmport using git Message-ID: <20201228163022.GA25288@freefall.freebsd.org> References: <20201227210533.GA31271@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1609173022; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dg3q53VHSbS/Fj+aN7iWeP63xSXEE/OT4ZUwmGVNSx4=; b=JPvSWMFpTC69T7AGRblTMzJy5j72XOHKqkQp8JS8/7y1MazFke8TxBf2NwWpE42deYRkPo R7XiXo18m4fwK2bz8AZVjiOu7z9aGnOpdpQzKhKUz0ygusVP/yaydkQbU7WQQ2JgLUlnwa 6Gc+OteAmTDlL3tgiHvoRkcM/O5Qy915wFu1K6AX9zXbuvgOYRv4JpCIDW9gMC8K701AYo 2aMUBNa8WuNLd+SWRuLAWKvBeioaYNi3pgkus6QsyEPAVXxmUdROsntDXqmvYGXjhMELQs itSNZWwQ673mlZSluC5r68sA7L8h8rQFmsP+PIbe7KNzzzlOIXhaEkVIa7dIeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1609173022; a=rsa-sha256; cv=none; b=JvxRjnljfxkc8+L3K9yNkKPZmMG8yvdLleZYSOAx7AG4TORX/0sVaOsTdnGXmwYwpnoxeK 8otErx4kOrwBFIWVzbGJA/Fa+SDDTU5e2Hj1yxhbzxkiNSzcJiyFGyf/bQ7w+v4wD46XF1 V1Q/n/Or54PWs2H4LAR+8EZ/m26qPAG4LkY+D9y0fAfjIfmSgBqkiVBH19TfyPsBhs25hn dpq9yog43N9tqUusWXpEMUOljydDXmzuqCpAZujC/WuS7wdPUvQ4ljcKmKGRHHS1WgNFbE NfsGX45AKhVsKBD+mZssplo7dWqhPLeripMm1jUzNCnt6wPooKijNqb2mh3S8w== 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: Mon, 28 Dec 2020 16:30:22 -0000 On Mon, Dec 28, 2020 at 01:00:35PM +0100, Christian Weisgerber wrote: > Rene Ladan: > > > just a quick note to say that Tools/scripts/rmport is mostly converted > > to git. Some outstanding issues: > > > [2] https://people.freebsd.org/~rene/stuff/rmport.diff > > +elif [ -n "$(command -v got 2>/dev/null)" ]; then > + GIT=got # XXX(rene) usable enough? > > Not like this, anyway. Got is NOT a drop-in replacement for git. > Neither the command line syntax nor the work tree format are > compatible. > OK, I'll remove the option for got then, as I think most people will be using git and incompatible work tree formats makes them rather not interchangeable for this script. René From owner-freebsd-git@freebsd.org Mon Dec 28 17:39:47 2020 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 A5CF74BC416 for ; Mon, 28 Dec 2020 17:39:47 +0000 (UTC) (envelope-from rene@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 4D4Pv74L41z4Vl1; Mon, 28 Dec 2020 17:39:47 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1609177187; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uJ90xTbQWzMDfojgl/C/esp8njih5PcI7rzKV3n5GUM=; b=oCQcEsJq/eGOlU+rZvrT9zre7gYTm9Vlaa+UkyDPyKpCOcC4wkKt1bymf9Kmql0lI4e7DC k7BaYzMgLQ+LfodTqwwxnrIaXLzBS5VxzYdrRdVYyPb4vjvZBLs6LoLl7Z3xXJQj+HmCVk lFTevUXxjtZOHD3n/cUAgRlgbPlS7JDpdLia+GlY0mGTTs39EL/Rm4LUpP2NAEZMkCpRY/ GzJLT3cOJRf8T5ShlTr+XWz+Yt2v42PZl1jRWni6RNquudQhiUYo6ADGwDNm5YxxCOe+e1 /opaVFTevDI7uOkMXdsKZAhMgYR9KksDYtqPvu4e+R86EIHVeVETsDAHXAVRCg== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 7EF9E169E2; Mon, 28 Dec 2020 17:39:47 +0000 (UTC) Date: Mon, 28 Dec 2020 17:39:47 +0000 From: Rene Ladan To: Christian Weisgerber Cc: freebsd-git@freebsd.org Subject: Re: preliminary version of rmport using git Message-ID: <20201228173947.GA98930@freefall.freebsd.org> References: <20201227210533.GA31271@freefall.freebsd.org> <20201228163022.GA25288@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201228163022.GA25288@freefall.freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1609177187; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uJ90xTbQWzMDfojgl/C/esp8njih5PcI7rzKV3n5GUM=; b=EgFblj+nqgqJOXe1esVhPR3zyE4CejCi11Lt/J+5WrjP5i9hMTEdxppJSIkLJIu8ib2j3m xJCZBnEVv1ipJPgcaHXC0RLG/Tm6vQSIuelexdti8A1ACLOP3c0aO9kptbVMWSTX2sulUi XpaeB4e4CfRKDsNVRO502Xs21Th/elh0RWFB3TNMHC05i3YBY9ZxazxWJxZZU+et6kNx/A 5SxURPz3yRbnpy15BhVMyhhgZfM/KCOxOnmSLmgdXH9RbcSOkNRYZ26xot681bM4at3EdB 0kbm6lxp7bhHpOuR4N9fyDZs750gBEdHrZSkuFBCqIlCicB2GjIFlfTzk7iUWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1609177187; a=rsa-sha256; cv=none; b=dg1fCMk1MirFRqI9UPyzbELKDUAyjPJxEfRAR7Q+nz1NWjZ9y8DsM/DVNN8Q3/LLPuragk YNLlTq65Js2fwFpd3WzCGdz/wGISgCQl9tFgXX0j7zDuCO6QReV06kV/Aioq/qKhQG2CBn 5viSSPtRv9Rr2LVpF4wkAGhO55h8Us77aT9hoNLys4KmnuX9QlI2C1LlH9TOLFbsO5V1dH 2Bmvs3iv/4OAIjr/c6AaxnDws5LYJ5OUMUIGnXqm5alg7EmxgxBo2kai52k2QtnKAjC9AD ZL+M0oPi5ll9EaAmpv6dzOoWGPqwRdNeynEIMXtwVZ2CjsOTLdl4BIKWcJGtXA== 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: Mon, 28 Dec 2020 17:39:47 -0000 On Mon, Dec 28, 2020 at 04:30:22PM +0000, Rene Ladan wrote: > On Mon, Dec 28, 2020 at 01:00:35PM +0100, Christian Weisgerber wrote: > > Rene Ladan: > > > > > just a quick note to say that Tools/scripts/rmport is mostly converted > > > to git. Some outstanding issues: > > > > > [2] https://people.freebsd.org/~rene/stuff/rmport.diff > > > > +elif [ -n "$(command -v got 2>/dev/null)" ]; then > > + GIT=got # XXX(rene) usable enough? > > > > Not like this, anyway. Got is NOT a drop-in replacement for git. > > Neither the command line syntax nor the work tree format are > > compatible. > > > OK, I'll remove the option for got then, as I think most people will be > using git and incompatible work tree formats makes them rather not > interchangeable for this script. > Done, the patch moved to https://people.freebsd.org/~rene/patches/git-ports/togit.diff René From owner-freebsd-git@freebsd.org Mon Dec 28 18:38:16 2020 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 2943F4BD9D8 for ; Mon, 28 Dec 2020 18:38:16 +0000 (UTC) (envelope-from glebius@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 4D4RBc0MyKz4YYD for ; Mon, 28 Dec 2020 18:38:16 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id D8C3E4BD83C; Mon, 28 Dec 2020 18:38:15 +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 D22884BD9D7 for ; Mon, 28 Dec 2020 18:38:15 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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 (2048 bits) client-digest SHA256) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4RBb3ScNz4YQ5; Mon, 28 Dec 2020 18:38:15 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.16.1/8.16.1) with ESMTPS id 0BSIG772007859 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 28 Dec 2020 10:16:07 -0800 (PST) (envelope-from glebius@freebsd.org) Received: (from glebius@localhost) by cell.glebi.us (8.16.1/8.16.1/Submit) id 0BSIG7Dd007858; Mon, 28 Dec 2020 10:16:07 -0800 (PST) (envelope-from glebius@freebsd.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@freebsd.org using -f Date: Mon, 28 Dec 2020 10:16:07 -0800 From: Gleb Smirnoff To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org Subject: Re: Please review: suggested final merge commit on the legacy repo 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: 4D4RBb3ScNz4YQ5 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: Mon, 28 Dec 2020 18:38:16 -0000 Ulrich, your commit also looks good to me. On Sun, Dec 27, 2020 at 09:43:03PM +0100, Ulrich Spörlein wrote: U> Thanks Gleb, U> U> I think the "centering" on the first line needs to go, it might confuse U> people's git log output. U> U> Furthermore, we're advocating for "freebsd" as the origin name, not U> "FreeBSD". Even more, we don't want folks to rename their remote, as U> we'll be re-using the GH remote, so they need to explictly add a legacy U> one, no? U> U> I did a test run of merge-based and rebase-based histories earlier today U> and jotted down my notes in U> https://github.com/freebsd/git_conv/wiki/Rebase---Merge-experiments , U> though there's nothing in there you don't already know. U> U> We should probably also make it clear that going forward, one should try U> to branch from a fresh main, and not schlepp around every commit twice U> :( U> U> I'll update the wiki page with the recommendation in a bit. I also U> wonder if we really should make this a merge commit, or a regular U> commit. From my notes above, it's actually rather easy to merge in U> legacy-master, then main-as-of-3cc0c0d66a06 and then main. The first U> step needs to be done anyway, the 2nd is guaranteed to be conflict free U> and the third step is just another regular merge-from-head. And people U> that merge in stable/X need to do this anyway. U> U> Also missing is a way for them to reach out for more help, the link to U> the wiki might give some folks ideas, but I think we can be more U> explicit here. U> U> I've inlined the short set of commands required that should work for U> main and stable (and have tested some of them, though I'm less sure U> about the various upstream magic that happens with git rebase, as one U> can elect to not provide half the refs) U> U> Please see the latest commit on https://github.com/uqs/freebsd U> U> Thanks U> Uli U> U> > U> >-- U> >Gleb Smirnoff U> U> >commit 11f284b67940bcacb2f618858b901e9254ef5992 U> >Merge: 9e4440ca5ba7 3cc0c0d66a06 U> >Author: Gleb Smirnoff U> >AuthorDate: Wed Dec 23 22:44:48 2020 -0800 U> >Commit: Gleb Smirnoff U> >CommitDate: Sun Dec 27 09:15:53 2020 -0800 U> > U> > !!! IMPORTANT ANNOUNCEMENT !!! U> > U> > This commit is the last commit to the legacy FreeBSD github mirror, that U> > used to import data from official FreeBSD subversion and resided at U> > https://github.com/freebsd/freebsd.git. U> > U> > The new FreeBSD github mirror imports data from official FreeBSD git. The U> > history in the new git tree is different to the legacy one. Thus, if you U> > were using the legacy tree to base your work on, you need to migrate. U> > U> > This commit merges the legacy tree and the new tree together. This will U> > allow you to migrate without rebasing. Once you pulled in this commit U> > and merged it to your tree, you need to switch to the new remote and U> > from now on merge from it. The following example assumes your current U> > remote for FreeBSD is named 'FreeBSD': U> > U> > % git remote rename FreeBSD legacy U> > % git remote add FreeBSD anongit@git.freebsd.org:src.git U> > % git fetch legacy/master U> > % git rev-parse legacy/master # shall return this commit! U> > % git merge legacy/master # the last merge from legacy U> > % git remote delete legacy U> > % git fetch FreeBSD/main U> > % git merge FreeBSD/main # the way to merge from now on U> > % git gc # you may want to run this once after the first merge U> > U> > Please consult with U> > U> > https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree U> > U> > for any changes for the above instructions in the future. U> > U> -- Gleb Smirnoff From owner-freebsd-git@freebsd.org Wed Dec 30 07:15:03 2020 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 499BC4B96B9 for ; Wed, 30 Dec 2020 07:15:03 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5MxM1R5Xz4kZK for ; Wed, 30 Dec 2020 07:15:03 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 1EED11C12 for ; Wed, 30 Dec 2020 07:15:03 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f181.google.com with SMTP id v126so13261911qkd.11 for ; Tue, 29 Dec 2020 23:15:03 -0800 (PST) X-Gm-Message-State: AOAM530fspe0W1mL5yCIqsMBLGuapPJ8mzz7pjlVZiy4SjUvwRUqgN2l 62/houddqRSBl/aguDMshiT6dnNQgoERzs963S8= X-Google-Smtp-Source: ABdhPJxTIfl4fn/hHveuHk2HV+Yhep92ySNFwzqFdrJyChHdtiHXtBjYGEWDGOL3cSED1XGh+0Lrf3fF+0YECMEVvZw= X-Received: by 2002:a37:a342:: with SMTP id m63mr52873962qke.120.1609312502522; Tue, 29 Dec 2020 23:15:02 -0800 (PST) MIME-Version: 1.0 From: Kyle Evans Date: Wed, 30 Dec 2020 01:14:51 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: FreeBSD Git Repository Bundles To: freebsd-git Content-Type: text/plain; charset="UTF-8" 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: Wed, 30 Dec 2020 07:15:03 -0000 Hello! Just an FYI- I spent a little bit of time tonight hacking up a system much like what Linux does[0], generating bundles of our repos for folks on unstable connections and whatnot. I'm currently publishing these bundles to freefall until I get yelled at or until it's replaced by some official service, you can find them at [1]. All repos are scheduled to update at 03:30 UTC on Mondays, and all branches are included. Good instructions on example use can also be found at [0]. Thanks, Kyle Evans [0] https://www.kernel.org/cloning-linux-from-a-bundle.html [1] https://people.freebsd.org/~kevans/bundles/ From owner-freebsd-git@freebsd.org Wed Dec 30 09:59:23 2020 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 8E6E74BD62F for ; Wed, 30 Dec 2020 09:59:23 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5RZz3YTCz4sL1; Wed, 30 Dec 2020 09:59:23 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 6830E22F3; Wed, 30 Dec 2020 09:59:23 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f178.google.com with SMTP id y128so14461027ybf.10; Wed, 30 Dec 2020 01:59:23 -0800 (PST) X-Gm-Message-State: AOAM533MRxxHb7qMg490EA7sW8c6ZsAhlX1GiVsdm+MpxfTxwS8x6W+R 4veLSr1piIH/hPXMs/tbeIedpvs0wTuzg3NzR74= X-Google-Smtp-Source: ABdhPJyNpF/xazqlLlPDBpVvxDgGdCGfudZH/vdLUm09+RqmEoTMoSMH4dwB34WYKfs8psEimy4CsmSXtRLXuNEcX1w= X-Received: by 2002:a25:3206:: with SMTP id y6mr74822882yby.127.1609322362862; Wed, 30 Dec 2020 01:59:22 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Li-Wen Hsu Date: Wed, 30 Dec 2020 17:59:12 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: FreeBSD Git Repository Bundles To: Kyle Evans Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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: Wed, 30 Dec 2020 09:59:23 -0000 On Wed, Dec 30, 2020 at 15:15 Kyle Evans wrote: > I'm currently publishing these bundles to freefall until I get yelled > at or until it's replaced by some official service, I also received suggestions of providing bundles. But after discussing with the people have this idea, we found that it=E2=80=99s more useful when the = bundles are distributed through CDN and this is not our current case. If people with limited internet connection find bundles are useful for them, please let me know, I am happy to provide bundles through our mirror servers and seeking other better way to serve the bundle files. FWIW, the git.FreeBSD.org backend servers got several adjustments and performance improvement is expected. Please also report any issue of using them. Best, Li-Wen From owner-freebsd-git@freebsd.org Wed Dec 30 12:54:09 2020 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 B38634C2C8F for ; Wed, 30 Dec 2020 12:54:09 +0000 (UTC) (envelope-from ml+freebsd@vishwin.info) Received: from varun.vishwin.info (varun.vishwin.info [46.101.93.59]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "varun.vishwin.info", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5WSd2DWWz3MSf; Wed, 30 Dec 2020 12:54:09 +0000 (UTC) (envelope-from ml+freebsd@vishwin.info) Received: from varun.vishwin.info ( [fd35:9eae:7575::2]) by varun.vishwin.info (OpenSMTPD) with ESMTP id d6589aed; Wed, 30 Dec 2020 07:53:59 -0500 (EST) Received: from [IPv6:2601:98a:601:5140:56ee:75ff:fe50:69b5] ( [2601:98a:601:5140:56ee:75ff:fe50:69b5]) by varun.vishwin.info (OpenSMTPD) with ESMTPSA id 793f4e0f (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Wed, 30 Dec 2020 07:53:59 -0500 (EST) To: freebsd-git References: From: Charlie Li Organization: FreeBSD mailing lists Subject: Re: FreeBSD Git Repository Bundles Message-ID: Date: Wed, 30 Dec 2020 07:53:58 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="qZJWUm9bQsfew5hqnwDMXDujcLI73aI1M" X-Rspamd-Queue-Id: 4D5WSd2DWWz3MSf X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[freebsd] 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: Wed, 30 Dec 2020 12:54:09 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --qZJWUm9bQsfew5hqnwDMXDujcLI73aI1M Content-Type: multipart/mixed; boundary="qQmEIFJLMSbZJg6hETYhcF8l2zS73PBhu"; protected-headers="v1" From: Charlie Li To: freebsd-git Cc: Kyle Evans , Li-Wen Hsu Message-ID: Subject: Re: FreeBSD Git Repository Bundles References: In-Reply-To: --qQmEIFJLMSbZJg6hETYhcF8l2zS73PBhu Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable Li-Wen Hsu wrote: > On Wed, Dec 30, 2020 at 15:15 Kyle Evans wrote: >=20 >> I'm currently publishing these bundles to freefall until I get yelled >> at or until it's replaced by some official service, >=20 >=20 > I also received suggestions of providing bundles. But after discussing = with > the people have this idea, we found that it=E2=80=99s more useful when = the bundles > are distributed through CDN and this is not our current case. >=20 > If people with limited internet connection find bundles are useful for > them, please let me know, I am happy to provide bundles through our mir= ror > servers and seeking other better way to serve the bundle files. >=20 Mozilla have been providing bundles for their Mercurial repositories almost since the beginning of their distributed source control journey. Their bundles are distributed through CDNs. In fact the first clone will default to downloading the bundle, then updating to the latest changeset in the default branch. Don't remember what git does in this department. Regardless, bundles are extremely useful, even when internet connections are stable. --=20 Charlie Li =E2=80=A6nope, still don't have an exit line. (This email address is for mailing list use; replace local-part with vishwin for off-list communication if possible) --qQmEIFJLMSbZJg6hETYhcF8l2zS73PBhu-- --qZJWUm9bQsfew5hqnwDMXDujcLI73aI1M Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEE/3/Cqr5a+41PbEb+jnB43vIDq2wFAl/seGYFAwAAAAAACgkQjnB43vIDq2wM Fg/+OSEjmotxpebehN1wUtV2eYQDCPXskb4hQ71ISWeHq+EXsPXYGxWv9N9xfGsEy1Rb2e/GeTvd kqkYHchejh5KqJp2HzZaB8kRvaZWMpNUgluU6I7URCn+LTW/aFPqTYa85o5QU4elzMucVhZZjRLb DXsNkALgs8yVdPtqd7hYjVHQMvvObuTwYqg1RTNsyBNDZaHPXEKK4K+2nQg4y8R1KOJj1AY8s+UV JxVlZu+tCu4ATkpKo2aU1aUSWL8eSxcDb13Lm5sLEZTD4Hk2I6yxl9SZ3np0CN3l2jY3dyt8+G2K EHUooc8xfTbCsiT27NAAwHCiwsmVsc2Az+TMHtKQdDzoV9a0N2Z1/bSklVGWpb6byrKXxBfWjJt9 DMgeWUYsEbifK45q1shYRCJC78V+tgY+b6lhxeuvoKBPb+dPD7OUn1VADxfIEdABXbUlMhBje4K/ p1YmhaeKSdo29lLfp+b4gLzisPXuZdR+CPv1bIsx63z2lMkHw/ThJaXDs0vvKymDlumWHxxBBFMM gs0asd/BN8JQsbBHy8GfszR1WFlBaFHsLsnbr5xXq50XilhKX6NDuoF0TpVw8XWxmqbwdt6M7EwT QXURBVWuC7os9+WAflHevAmjqBItveajFCIFdXvTdjAsusk+jTMuut0cgh7w6qiqK45ipAQIlf8H tfU= =7ZB4 -----END PGP SIGNATURE----- --qZJWUm9bQsfew5hqnwDMXDujcLI73aI1M-- From owner-freebsd-git@freebsd.org Wed Dec 30 16:41:57 2020 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 181934C8904 for ; Wed, 30 Dec 2020 16:41:57 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (static-24-113-41-81.wavecable.com [24.113.41.81]) (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 "ultimatedns.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5cWS68Wnz3sRg; Wed, 30 Dec 2020 16:41:56 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 0BUGgVld006728; Wed, 30 Dec 2020 08:42:37 -0800 (PST) (envelope-from bsd-lists@bsdforge.com) MIME-Version: 1.0 Date: Wed, 30 Dec 2020 08:42:31 -0800 From: Chris To: Kyle Evans Cc: freebsd-git Subject: Re: FreeBSD Git Repository Bundles In-Reply-To: References: User-Agent: UDNSMS/17.0 Message-ID: <62d00eff81d5595acfe7a8bafd8b97e8@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D5cWS68Wnz3sRg 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: Wed, 30 Dec 2020 16:41:57 -0000 On 2020-12-29 23:14, Kyle Evans wrote: > Hello! > > Just an FYI- I spent a little bit of time tonight hacking up a system > much like what Linux does[0], generating bundles of our repos for > folks on unstable connections and whatnot. > > I'm currently publishing these bundles to freefall until I get yelled > at or until it's replaced by some official service, you can find them > at [1]. > > All repos are scheduled to update at 03:30 UTC on Mondays, and all > branches are included. Good instructions on example use can also be > found at [0]. We've been providing a cpan mirror for years now (rsync && https). I'm happy to accommodate FreeBSD in any way I can. I already host a bunch of the source for ports I maintain. So I mirrored your bundles on the same host. Speaking of ports, I also went one further, and added a distinfo style file for each of the bundles https://BSDforge.com/bundles/ 265955836 Dec 29 23:01 doc.bundle 140 Dec 30 08:15 doc.bundle.sha256 1586758704 Dec 29 23:01 ports.bundle 145 Dec 30 08:16 ports.bundle.sha256 1282394200 Dec 29 22:51 src.bundle 141 Dec 30 08:17 src.bundle.sha256 # less ./src.bundle.sha256 TIMESTAMP = 1609345023 SHA256 (src.bundle) = fcab5c72ffd86c6f0e843d8fe0a406ad062a444a0ed1824e93c0500b32971a62 SIZE (src.bundle) = 1282394200 problems? please report them to the email address this message arrives from. :-) Thanks, Chris > > Thanks, > > Kyle Evans > > [0] https://www.kernel.org/cloning-linux-from-a-bundle.html > [1] https://people.freebsd.org/~kevans/bundles/ > _______________________________________________ > 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 Wed Dec 30 23:10:33 2020 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 5385F4D295D for ; Wed, 30 Dec 2020 23:10:33 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (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 "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5n7s19mQz4qs4; Wed, 30 Dec 2020 23:10:32 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from odin.corp.delphij.net (unknown [IPv6:2601:646:8601:f4a:44d5:ebd:b7ed:acf4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id 6511E2612B; Wed, 30 Dec 2020 15:10:26 -0800 (PST) Reply-To: d@delphij.net To: Li-Wen Hsu , Kyle Evans Cc: freebsd-git References: From: Xin Li Subject: Re: FreeBSD Git Repository Bundles Message-ID: <7dc59c86-8ace-8ec9-acc4-f254d9dd22e7@delphij.net> Date: Wed, 30 Dec 2020 15:10:24 -0800 User-Agent: Thunderbird MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="HOckjGISM9OiMTgemIW8fOT6s05xG7138" X-Rspamd-Queue-Id: 4D5n7s19mQz4qs4 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: Wed, 30 Dec 2020 23:10:33 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --HOckjGISM9OiMTgemIW8fOT6s05xG7138 Content-Type: multipart/mixed; boundary="PiAFteoY9jaFuoXAnm5nVtRsss2JI9kk3"; protected-headers="v1" From: Xin Li Reply-To: d@delphij.net To: Li-Wen Hsu , Kyle Evans Cc: freebsd-git Message-ID: <7dc59c86-8ace-8ec9-acc4-f254d9dd22e7@delphij.net> Subject: Re: FreeBSD Git Repository Bundles References: In-Reply-To: --PiAFteoY9jaFuoXAnm5nVtRsss2JI9kk3 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 12/30/20 01:59, Li-Wen Hsu wrote: > On Wed, Dec 30, 2020 at 15:15 Kyle Evans wrote: >=20 >> I'm currently publishing these bundles to freefall until I get yelled >> at or until it's replaced by some official service, >=20 >=20 > I also received suggestions of providing bundles. But after discussing = with > the people have this idea, we found that it=E2=80=99s more useful when = the bundles > are distributed through CDN and this is not our current case. >=20 > If people with limited internet connection find bundles are useful for > them, please let me know, I am happy to provide bundles through our mir= ror > servers and seeking other better way to serve the bundle files. Yes, please. I initially only considered the performance benefits (it's cheaper for the git server when using clone bundles are used in terms of CPU), but the ability to resume downloads is also very useful for users whose Internet connectivity is not reliable. Cheers, --PiAFteoY9jaFuoXAnm5nVtRsss2JI9kk3-- --HOckjGISM9OiMTgemIW8fOT6s05xG7138 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEceNg5NEMZIki80nQQHl/fJX0g08FAl/tCOAFAwAAAAAACgkQQHl/fJX0g08o Lw/5AQjDu8wi6Wa1h1E1CIOSx4KGGK5j9Gk3NaKZh0WTtFPv1DWN9Zj2Wh82rM91MteVOX+WGlcf Gox+xg7Em1yH+bWzOhQjzArG9Lv/AzXQqvE2KlPjxsfOe6F/Bb8cHh2EyincdeU0MTwFGfD2IGw2 C5+iySvjFYIVh6nJsCAAph+099VFzKp7Ysn3/kazNhE826Fsjhr7+VuqTE5AZaSNOfD1/uD+DoKC NHRSx1wDE7BbbjySVw+yRCWKSc5b4hKxKKTQCq/3CZrPWKSY5WXaeqd4QFhcBvM7bnRjdGqrJ91m So4/4VQo3lceZGI8rUSWerzMf5w5vgxtl+9JQk20o+fxfNjGSGOxI8Wxh8UhcQo0qDzjPkSM+o24 dwwTbVcxO+JODP3XU5gwTEGyHtbfUC2dBVGQyHtb2e7H3QXx60iNzdaF422QdVo7SEeF7Owekm63 IophVTgevwjto4+6Nsi3tcGS2u9/F4HAiPohfKpViSM0EF2WGONk3MA/7LeQfgjvesmzeIcoXH7Q lAEjxtAuPZrigAxbFu2Z+GIwTI6UDLjH7VpPN8dEj5AkHnXemz1Lhb7qb/P8QezT4zHHZs5dXdqt oexlAPwhzdgpLGnWZAFMo8H7AqK/zk/iflUxu7B58zJGxIVZt7lBcjiCJKtIWHuhEIfESnLA3ELX TFg= =tJ3U -----END PGP SIGNATURE----- --HOckjGISM9OiMTgemIW8fOT6s05xG7138-- From owner-freebsd-git@freebsd.org Thu Dec 31 04:29:22 2020 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 A89F14DC003 for ; Thu, 31 Dec 2020 04:29:22 +0000 (UTC) (envelope-from kevans@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5wCk2g2Yz3jmS for ; Thu, 31 Dec 2020 04:29:22 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 0EDB7B79C for ; Thu, 31 Dec 2020 04:29:21 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f171.google.com with SMTP id p14so15651155qke.6 for ; Wed, 30 Dec 2020 20:29:21 -0800 (PST) X-Gm-Message-State: AOAM5339Y2SmoWjLx1OS4qUQeTyN586QmfGmhmVi1Yhuu3r/nQTzXxyb riPIOzzRMmGonlmKc6pQEmn4jfy3qmAYNEXI59k= X-Google-Smtp-Source: ABdhPJwiPFPTDxLQS/hZHGaHUP76RHrRAMM/dapeY0ezv2t4czRiAK85t/8w1WnsBYZMQcnBo5/HAkvdWPhT1Fb3fSQ= X-Received: by 2002:a37:b442:: with SMTP id d63mr28061656qkf.430.1609388960457; Wed, 30 Dec 2020 20:29:20 -0800 (PST) MIME-Version: 1.0 References: <62d00eff81d5595acfe7a8bafd8b97e8@bsdforge.com> In-Reply-To: <62d00eff81d5595acfe7a8bafd8b97e8@bsdforge.com> From: Kyle Evans Date: Wed, 30 Dec 2020 22:29:09 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: FreeBSD Git Repository Bundles To: Chris Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" 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, 31 Dec 2020 04:29:22 -0000 On Wed, Dec 30, 2020 at 10:41 AM Chris wrote: > > On 2020-12-29 23:14, Kyle Evans wrote: > > Hello! > > > > Just an FYI- I spent a little bit of time tonight hacking up a system > > much like what Linux does[0], generating bundles of our repos for > > folks on unstable connections and whatnot. > > > > I'm currently publishing these bundles to freefall until I get yelled > > at or until it's replaced by some official service, you can find them > > at [1]. > > > > All repos are scheduled to update at 03:30 UTC on Mondays, and all > > branches are included. Good instructions on example use can also be > > found at [0]. > We've been providing a cpan mirror for years now (rsync && https). > I'm happy to accommodate FreeBSD in any way I can. I already host a > bunch of the source for ports I maintain. So I mirrored your bundles > on the same host. Speaking of ports, I also went one further, and > added a distinfo style file for each of the bundles > > https://BSDforge.com/bundles/ > > 265955836 Dec 29 23:01 doc.bundle > 140 Dec 30 08:15 doc.bundle.sha256 > 1586758704 Dec 29 23:01 ports.bundle > 145 Dec 30 08:16 ports.bundle.sha256 > 1282394200 Dec 29 22:51 src.bundle > 141 Dec 30 08:17 src.bundle.sha256 > > # less ./src.bundle.sha256 > > TIMESTAMP = 1609345023 > SHA256 (src.bundle) = > fcab5c72ffd86c6f0e843d8fe0a406ad062a444a0ed1824e93c0500b32971a62 > SIZE (src.bundle) = 1282394200 > > problems? please report them to the email address this message arrives from. > :-) > Oh, cool, thanks! I went ahead and partially incorporated this -- the original is now populated with less-complete sha256/sha512 checksums to match the established convention for re@ snapshots at least. I like the idea of also reporting the timestamp/size, but I didn't quite have time/energy to hack that in tonight (it's a quick-and-dirty lua script). From owner-freebsd-git@freebsd.org Thu Dec 31 18:10:25 2020 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 9292A4CA011 for ; Thu, 31 Dec 2020 18:10:25 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D6GR53hL2z3NMC for ; Thu, 31 Dec 2020 18:10:25 +0000 (UTC) (envelope-from mr@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7E17E4CA010; Thu, 31 Dec 2020 18:10:25 +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 7DD614C9F9E for ; Thu, 31 Dec 2020 18:10:25 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from app.eeeit.de (app.eeeit.de [188.68.43.176]) (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 4D6GR45P5Tz3N1F for ; Thu, 31 Dec 2020 18:10:24 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from localhost (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mike@reifenberger.com) by app.eeeit.de (Postfix) with ESMTPSA id 9C96C3B0AB for ; Thu, 31 Dec 2020 19:10:16 +0100 (CET) Received: from ipbcc0fd0a.dynamic.kabel-deutschland.de (ipbcc0fd0a.dynamic.kabel-deutschland.de [188.192.253.10]) by app.eeeit.de (Horde Framework) with HTTPS; Thu, 31 Dec 2020 18:10:16 +0000 Date: Thu, 31 Dec 2020 18:10:16 +0000 Message-ID: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> From: MR To: git@freebsd.org Subject: MFC changes for stable/11 error User-Agent: Horde Application Framework 5 Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes MIME-Version: 1.0 Content-Disposition: inline X-Rspamd-Queue-Id: 4D6GR45P5Tz3N1F X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:197540, ipnet:188.68.32.0/20, 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: Thu, 31 Dec 2020 18:10:25 -0000 Hi, as it seems, for me, git is not as intuitive as svn. I want to MFC the latest changes from stable/12 to stable/11 for usr.bin/systat. I do: # git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/src.git freebsd-11 # cd freebsd-11 # git checkout stable/11 Now looking for the last commit: # git log usr.bin/systat/ ... commit e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb Author: Kyle Evans Date: Thu Apr 9 20:38:36 2020 +0000 ... # git checkout stable/12 What is newer in stable/12: # git log usr.bin/systat/ ... commit 7a446028cedb13a0d2004cf6f584291a976392da Author: Michael Reifenberger Date: Sat Sep 5 17:02:48 2020 +0000 ... commit 65d1fd13ac2182f7ca0c223bb723fba6d780740f Author: Michael Reifenberger Date: Sun Jun 7 16:42:03 2020 +0000 ... commit a70af2507f720c2d7f56f51a18d358123b4770a5 Author: Kyle Evans Date: Mon Apr 27 16:11:59 2020 +0000 ... commit 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 Author: Kyle Evans Date: Thu Apr 9 20:35:35 2020 +0000 ... OK. So it should miss: 1.) a70af2507f720c2d7f56f51a18d358123b4770a5 2.) 65d1fd13ac2182f7ca0c223bb723fba6d780740f 3.) 7a446028cedb13a0d2004cf6f584291a976392da Right? Now we try as suggested in: https://github.com/bsdimp/freebsd-git-docs/blob/main/MFC.md # git checkout -b tmp-branch stable/11 Switched to a new branch 'tmp-branch' # git cherry-pick -x a70af2507f720c2d7f56f51a18d358123b4770a5 Auto-merging usr.bin/systat/zarc.c CONFLICT (content): Merge conflict in usr.bin/systat/zarc.c Auto-merging usr.bin/systat/vmstat.c CONFLICT (content): Merge conflict in usr.bin/systat/vmstat.c Auto-merging usr.bin/systat/systat.h Auto-merging usr.bin/systat/swap.c Auto-merging usr.bin/systat/iostat.c Auto-merging usr.bin/systat/devs.c warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 11054 and retry the command. error: could not apply a70af2507f72... MFC r340361, r345804: catch up on systat in head/ hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' hint: and commit the result with 'git commit' ?!? Why? How to proceed? Thanks in advance! greetings --- Michael -- greetings --- mike mr@freebsd.org From owner-freebsd-git@freebsd.org Thu Dec 31 18:35:27 2020 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 2EB1E4CAB73 for ; Thu, 31 Dec 2020 18:35:27 +0000 (UTC) (envelope-from carpeddiem@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 4D6Gzy1qfSz3QLY for ; Thu, 31 Dec 2020 18:35:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id C238F4CAE47; Thu, 31 Dec 2020 18:35:23 +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 BC85A4CAE45 for ; Thu, 31 Dec 2020 18:35:23 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) (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 4D6Gzt6GYCz3QFM; Thu, 31 Dec 2020 18:35:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f51.google.com with SMTP id r9so17754870ioo.7; Thu, 31 Dec 2020 10:35:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6Kb3xZExQMbueCQUBniUEtp64GBodcS9qAdAagERF/g=; b=L1tbVmXpZInYP/4KRKTDVdxn2lAAXxa2EbRGtC46LakWoGMwYAhxtBwgUPgOP2yNr/ HD3A4WapT1ptY9H1b/hA2b5lIpfhoBRNy+ZIzmo32VAG80nEml4pUs4vVyq4Hjjq7gXa cJ1OpxdzHIeR7jfmSqeswD0yrUVhAofvwhgjv83HWjdxNZuvswXrj7DfPvSX3M30f8+6 d+VO1KC9RcBei55Tnm/kuA0vKVw2vQdIv2Mjqrfgnt/pHGnyM4yiBD0GvVWN0FwEYW1O DigtM5Ci+XBvojfbkGnRmt++kE9OTrNdO+Igjp1ZVubuSdnSVMAjDJ1R3qWbIgH61gWT ZVmg== X-Gm-Message-State: AOAM531e7wSyET4TuTGHudsGHQw7hOBLYCzFdLYzEpjS8HO3J8Jqqfv/ BjV8KH8wP3gVq3npk+qoakMuRpLX6JWmtn9JMg/jfjOtpB7SUQ== X-Google-Smtp-Source: ABdhPJw0IrcNUiMk+wWYHv7EDs0CjpWznJSGq8Dk4WbGI10+jIs2/aFFYp8vGY6Xn6S2EhwG7FObGNyc68643um7/V8= X-Received: by 2002:a5e:c012:: with SMTP id u18mr47683659iol.15.1609439719312; Thu, 31 Dec 2020 10:35:19 -0800 (PST) MIME-Version: 1.0 References: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> In-Reply-To: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> From: Ed Maste Date: Thu, 31 Dec 2020 13:35:06 -0500 Message-ID: Subject: Re: MFC changes for stable/11 error To: MR Cc: git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D6Gzt6GYCz3QFM 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: Thu, 31 Dec 2020 18:35:27 -0000 On Thu, 31 Dec 2020 at 13:10, MR wrote: > > error: could not apply a70af2507f72... MFC r340361, r345804: catch up > on systat in head/ > hint: after resolving the conflicts, mark the corrected paths > hint: with 'git add ' or 'git rm ' > hint: and commit the result with 'git commit' This is presumably just because there are additional changes that were merged to stable/12 and not stable/11. kevans' "MFC -fno-common fixes" commit is: stable/11 e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb stable/12 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 as you mentioned this is the most recent usr.bin/systat commit in stable/11, while there are three additional changes in stable/12 in usr.bin/systat after that one. But if we compare usr.bin/systat at those two hashes we see: $ git diff --stat e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 usr.bin/systat usr.bin/systat/Makefile | 2 +- usr.bin/systat/Makefile.depend | 1 - usr.bin/systat/cmds.c | 4 +++- ... 25 files changed, 234 insertions(+), 152 deletions(-) So the failure from `git cherry-pick -x` is just a patch conflict, the same as would occur trying to merge those three commits in SVN. $ git cherry-pick -x a70af2507f720c2d7f56f51a18d358123b4770a5 ... error: could not apply a70af2507f72... MFC r340361, r345804: catch up on systat in head/ hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' hint: and commit the result with 'git commit' As with svn you can edit the conflicting files and then commit the result - or, cherry-pick the other changes that are missing from stable/11 if appropriate. It seems two files conflicted: usr.bin/systat/vmstat.c usr.bin/systat/zarc.c the conflict in the former can be resolved automatically; for zarc.c you can check what's merged to stable/12: % git log ..freebsd/stable/12 usr.bin/systat/zarc.c Looking through the commits it seems at least 45e9405ea4b05926b22a743237cbfe918206db50 was not merged and is responsible for at least one of the conflicts. From owner-freebsd-git@freebsd.org Thu Dec 31 22:14:35 2020 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 D1D0D4D1839 for ; Thu, 31 Dec 2020 22:14:35 +0000 (UTC) (envelope-from jhb@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 4D6Mrq5LWRz3wDN for ; Thu, 31 Dec 2020 22:14:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id B77674D1838; Thu, 31 Dec 2020 22:14: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 B743B4D1A13 for ; Thu, 31 Dec 2020 22:14:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6Mrq4j6Mz3wPg; Thu, 31 Dec 2020 22:14:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:6d91:ae61:b3ec:ca03]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 46D9A23C8D; Thu, 31 Dec 2020 22:14:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: Thoughts on git commit mail To: Li-Wen Hsu Cc: git@freebsd.org References: From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <2bff94da-deb9-2410-b580-441eb31c8d40@FreeBSD.org> Date: Thu, 31 Dec 2020 14:14:33 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit 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, 31 Dec 2020 22:14:35 -0000 On 12/16/20 2:23 AM, Li-Wen Hsu wrote: > On Wed, Dec 16, 2020 at 7:59 AM John Baldwin wrote: >> Putting 1-3 together for the commit in question would give the >> header below which I think is a bit more compact and similar to >> svn formatting in that all the metadata is in a single block >> without additional whitespace. >> >> commit d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 >> Author: Glen Barber >> Date: 2020-12-13 21:31:39 +0000 >> Branch: main >> URL: https://cgit.FreeBSD.org/doc/commit/?id=d79b57d3cf7151e45216c0f8501cdb2eb7a3bd86 > > This sounds good to me, the reason I have both Author and Committer > fields because I was thinking if we have pull request / merge > workflow, there will be more commits and pushes with different > author/committer/pusher, and the date of these three will be > different, the From and Date fields in mail header can only cover the > pusher. So seeing some cherry-picks now via MFCs, I do have one thought. Here is a MFC by rlibby of a commit I made in head: commit 939430f23771bb2bdd85337a58f5ba0757f60782 Author: John Baldwin AuthorDate: 2020-08-31 21:55:25 +0000 Commit: Ryan Libby CommitDate: 2020-12-31 19:56:33 +0000 I still find this a bit verbose, but I do find that the CommitDate is the Date I actually care about rather than the AuthorDate. Neither one is a "push date", but CommitDate is much closer to that. I think I am still fine with keeping the Author as the name and relying on the e-mail >From to serve as the 'Commit' (probably should be "Committer") field, so something like: commit 939430f23771bb2bdd85337a58f5ba0757f60782 Author: John Baldwin Date: 2020-12-31 19:56:33 +0000 Branch: stable/12 URL: https://cgit.FreeBSD.org/src/commit/?id=939430f23771bb2bdd85337a58f5ba0757f60782 The mix of fields for name and date is a bit odd though. Perhaps another alternative might be to elide the Author fields if the Author == Committer? That would keep a lean format when when the individuals are the same. For that suggestion, I think you would always show the two Commit fields ("Committer" and "CommitDate") and only show "Author" and "AuthorDate" if Author != Committer? This would still be verbose for the change I'm referencing here, but would collapse the detail a bit for the (current) common case of people committing or merging their own changes. -- John Baldwin From owner-freebsd-git@freebsd.org Fri Jan 1 00:03: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 A35634D5900 for ; Fri, 1 Jan 2021 00:03:52 +0000 (UTC) (envelope-from carpeddiem@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 4D6QGw3BQ8z4Z7T for ; Fri, 1 Jan 2021 00:03:52 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 6D3D64D5883; Fri, 1 Jan 2021 00:03: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 6CF9A4D57D4 for ; Fri, 1 Jan 2021 00:03:52 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (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 4D6QGw2ddjz4ZTR; Fri, 1 Jan 2021 00:03:52 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f42.google.com with SMTP id o6so18195132iob.10; Thu, 31 Dec 2020 16:03:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fNz49oSEcI/fZApDp4vVNb1dxdmQshNWX7dmS9ffdnk=; b=KS8iy2GjfyOOtMfcLP9rYPNQN47YJiePTHu9bt/CaEGMgMYilyhX1em78lhcyINXs9 A5wFSSYNlkNvNyMsqKZ0jZm8LFkGhOSEbIfUdd2aA+wE1gX72SZt6HdybmE8hu9KRb1P qdxdjfNd+eAVbDZ/g7ZktpXhpnwWBJsVxZhO2Bm3Q3Vr7HzmlbrUCK7HmJVOBE5owXV9 MgmlbsdMZJdO3yRu1oZ6PHXRJLh1y7/vmVgWiM4leEI1pIyILG46/wDmR3D8/OyYHJXk bFQhfUyWQHPAK21kQfrW9mpn4a7TsVQYgEmMetvEe3M/qV8d+P+PYKjd9d/Rx8jmMrMC Oi6Q== X-Gm-Message-State: AOAM530aoi6DgGVHLjPau3PEU2U6QDVFQU3tPJyFmvEGMEpx68ISuKiJ v6I7B9fmFRpN8TCROcLKvGOkDlCjCJhBpjTJBNe7daKFLDPU6A== X-Google-Smtp-Source: ABdhPJyYijpMaRP0fVllOoVANFdWa2BTT+2ntE+E459S5SoLYFzeh01ZeWoZWfs1UGMrCZKyBI+PHfmTR3J33/T89wY= X-Received: by 2002:a6b:b5d2:: with SMTP id e201mr47584857iof.111.1609459429911; Thu, 31 Dec 2020 16:03:49 -0800 (PST) MIME-Version: 1.0 References: <2bff94da-deb9-2410-b580-441eb31c8d40@FreeBSD.org> In-Reply-To: <2bff94da-deb9-2410-b580-441eb31c8d40@FreeBSD.org> From: Ed Maste Date: Thu, 31 Dec 2020 19:03:37 -0500 Message-ID: Subject: Re: Thoughts on git commit mail To: John Baldwin Cc: Li-Wen Hsu , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D6QGw2ddjz4ZTR 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: Fri, 01 Jan 2021 00:03:52 -0000 On Thu, 31 Dec 2020 at 17:14, John Baldwin wrote: > > The mix of fields for name and date is a bit odd though. Perhaps another > alternative might be to elide the Author fields if the Author == Committer? > That would keep a lean format when when the individuals are the same. > For that suggestion, I think you would always show the two Commit fields > ("Committer" and "CommitDate") and only show "Author" and "AuthorDate" > if Author != Committer? I discussed this a bit with John on IRC, but for the benefit of the list: We expect Author == Committer will be common, and the commit date is probably the more interesting date. In addition, committer will always be someone@FreeBSD.org, so what about if we take John's suggestion for Date, and use the author name, appending (via /committer/) if it's not the author? Thus, for the example above: Author: John Baldwin (via rlibby) Date: 2020-12-31 19:56:33 +0000 This is nice and concise while conveying all useful information, IMO. This would work identically for MFCs of commits made by other committers, as well as committing changes submitted by 3rd parties. From owner-freebsd-git@freebsd.org Fri Jan 1 11:58:56 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 749154C660B for ; Fri, 1 Jan 2021 11:58:56 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D6k802ryBz4lKG for ; Fri, 1 Jan 2021 11:58:56 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 61E954C5ABF; Fri, 1 Jan 2021 11:58:56 +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 61B004C641D for ; Fri, 1 Jan 2021 11:58:56 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6k80174Tz4lM4; Fri, 1 Jan 2021 11:58:55 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 101Bws9x036638 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 1 Jan 2021 12:58:54 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Fri, 1 Jan 2021 12:58:54 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Ed Maste Cc: John Baldwin , git@freebsd.org Subject: Re: Thoughts on git commit mail Message-ID: References: <2bff94da-deb9-2410-b580-441eb31c8d40@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D6k80174Tz4lM4 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: Fri, 01 Jan 2021 11:58:56 -0000 On Thu, 2020-12-31 at 19:03:37 -0500, Ed Maste wrote: >On Thu, 31 Dec 2020 at 17:14, John Baldwin wrote: >> >> The mix of fields for name and date is a bit odd though. Perhaps another >> alternative might be to elide the Author fields if the Author == Committer? >> That would keep a lean format when when the individuals are the same. >> For that suggestion, I think you would always show the two Commit fields >> ("Committer" and "CommitDate") and only show "Author" and "AuthorDate" >> if Author != Committer? > >I discussed this a bit with John on IRC, but for the benefit of the list: > >We expect Author == Committer will be common, and the commit date is >probably the more interesting date. In addition, committer will always >be someone@FreeBSD.org, so what about if we take John's suggestion for >Date, and use the author name, appending (via /committer/) if it's not >the author? > >Thus, for the example above: > >Author: John Baldwin (via rlibby) >Date: 2020-12-31 19:56:33 +0000 > >This is nice and concise while conveying all useful information, IMO. >This would work identically for MFCs of commits made by other >committers, as well as committing changes submitted by 3rd parties. I have no strong preference either way (because I use git log if I want to find out about things, something that now everyone has downloaded and is fast, as compared to SVN, so maybe behaviors need to change a little.) Should we drop Committer and CommitDate from the logs entirely, because 99% of the time it's just what is in the commit email From: and Date: headers anyway? The thing is, folks that take their information from commit emails see the Date of the push and usually who pushed it (Committer) in their email client. The really nice information on these MFCs is, how old their actual author date is, as that shows you how laggy we are with MFC'ing. And for commits to head, it's super interesting to see the potential 3rd party Authors we'll see in the future, and, again, the committer and the push date is shown in the email headers, so it's kinda redundant. I would be biased against a more dynamic format that only sometimes shows information and sometimes doesn't, as that can be confusing. Cheers Uli From owner-freebsd-git@freebsd.org Fri Jan 1 17:26:30 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 150D44CE8B5 for ; Fri, 1 Jan 2021 17:26:30 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D6sPy06Dhz3Mnt for ; Fri, 1 Jan 2021 17:26:30 +0000 (UTC) (envelope-from mr@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 01D104CEC1C; Fri, 1 Jan 2021 17:26:30 +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 019C84CEC1A for ; Fri, 1 Jan 2021 17:26:30 +0000 (UTC) (envelope-from mr@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6sPx6gjzz3N1n; Fri, 1 Jan 2021 17:26:29 +0000 (UTC) (envelope-from mr@freebsd.org) Received: from mypower.rm-i.net (ipbcc0fd0a.dynamic.kabel-deutschland.de [188.192.253.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: mr) by smtp.freebsd.org (Postfix) with ESMTPSA id 7C44F2CC94; Fri, 1 Jan 2021 17:26:29 +0000 (UTC) (envelope-from mr@freebsd.org) Date: Fri, 01 Jan 2021 18:26:30 +0100 User-Agent: K-9 Mail for Android In-Reply-To: References: <20201231181016.Horde.jHkwMJEQBBj6VT6Fxv8slk1@app.eeeit.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: MFC changes for stable/11 error To: Ed Maste ,MR CC: git@freebsd.org From: Michael Message-ID: <40A9FFE2-171F-4382-A296-BCDB6A8ED41B@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, 01 Jan 2021 17:26:30 -0000 Hi, Am 31=2E Dezember 2020 19:35:06 MEZ schrieb Ed Maste : >On Thu, 31 Dec 2020 at 13:10, MR wrote: >> >> error: could not apply a70af2507f72=2E=2E=2E MFC r340361, r345804: catc= h up >> on systat in head/ >> hint: after resolving the conflicts, mark the corrected paths >> hint: with 'git add ' or 'git rm ' >> hint: and commit the result with 'git commit' > >This is presumably just because there are additional changes that were >merged to stable/12 and not stable/11=2E > >kevans' "MFC -fno-common fixes" commit is: > >stable/11 e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb >stable/12 9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 > >as you mentioned this is the most recent usr=2Ebin/systat commit in >stable/11, while there are three additional changes in stable/12 in >usr=2Ebin/systat after that one=2E But if we compare usr=2Ebin/systat at >those two hashes we see: > >$ git diff --stat e9ba4c1e146d1ebf889b73a78878807c8bc3f0cb >9a042535a9eb5ea8dd1b3e0d80483d02f1cba951 usr=2Ebin/systat > usr=2Ebin/systat/Makefile | 2 +- > usr=2Ebin/systat/Makefile=2Edepend | 1 - > usr=2Ebin/systat/cmds=2Ec | 4 +++- >=2E=2E=2E > 25 files changed, 234 insertions(+), 152 deletions(-) > >So the failure from `git cherry-pick -x` is just a patch conflict, the >same as would occur trying to merge those three commits in SVN=2E > >$ git cherry-pick -x a70af2507f720c2d7f56f51a18d358123b4770a5 >=2E=2E=2E >error: could not apply a70af2507f72=2E=2E=2E MFC r340361, r345804: catch = up >on systat in head/ >hint: after resolving the conflicts, mark the corrected paths >hint: with 'git add ' or 'git rm ' >hint: and commit the result with 'git commit' > >As with svn you can edit the conflicting files and then commit the >result - or, cherry-pick the other changes that are missing from >stable/11 if appropriate=2E > >It seems two files conflicted: >usr=2Ebin/systat/vmstat=2Ec >usr=2Ebin/systat/zarc=2Ec >the conflict in the former can be resolved automatically; for zarc=2Ec >you can check what's merged to stable/12: > >% git log =2E=2Efreebsd/stable/12 usr=2Ebin/systat/zarc=2Ec > >Looking through the commits it seems at least >45e9405ea4b05926b22a743237cbfe918206db50 was not merged and is >responsible for at least one of the conflicts=2E --=20 Michael