From owner-freebsd-git@freebsd.org Sun Dec 20 00:46: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 B3ACD4B16F2 for ; Sun, 20 Dec 2020 00:46:16 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cz3nM4Lvyz3R2P for ; Sun, 20 Dec 2020 00:46:15 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id qmrTkeb3o34axqmrVkjclC; Sat, 19 Dec 2020 17:46:13 -0700 X-Authority-Analysis: v=2.4 cv=LvQsdlRc c=1 sm=1 tr=0 ts=5fde9ed5 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=CNcP_D5m2eWl6Qtby3QA:9 a=CjuIK1q_8ugA:10 a=BOg4e644cxQA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 8E632664 for ; Sat, 19 Dec 2020 16:46:10 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BK0kAXE098032 for ; Sat, 19 Dec 2020 16:46:10 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012200046.0BK0kAXE098032@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: freebsd-git@freebsd.org Subject: Is it ok to MFC today Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 19 Dec 2020 16:46:10 -0800 X-CMAE-Envelope: MS4xfJIY3Ljqf6fyJgmD/CSyt0B2m5XG6op7y7wZZSnrFcCVrzGOWwC1YhBuWFFQlCLpC6gOXgQq/BnXRdSOxxuDNkFvA5kCNK/vdmVd2hQb5+3/wSDImwvG lvL+d11eeYh9Wq8ogivuuIa99Os7xr7OVG2bodIAgRCHT6qP1i0Skvx5qsP+ynXZEQAFQWzDz/xr8Pl7Lz65e4NdmbL3cTbaCp4= X-Rspamd-Queue-Id: 4Cz3nM4Lvyz3R2P X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.9) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [0.30 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.9:from]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.229.168:received]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.59.134.9:from]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[64.59.134.9:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.9:from]; RCVD_TLS_LAST(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; R_SPF_NA(0.00)[no SPF record]; 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: Sun, 20 Dec 2020 00:46:16 -0000 Would it be ok to MFC r368734 today? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Sun Dec 20 02:39:53 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 D42924B5794 for ; Sun, 20 Dec 2020 02:39:53 +0000 (UTC) (envelope-from lwhsu@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 4Cz6JT5Yvbz3nNt for ; Sun, 20 Dec 2020 02:39:53 +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 AB47D20145 for ; Sun, 20 Dec 2020 02:39:53 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f178.google.com with SMTP id x2so5691754ybt.11 for ; Sat, 19 Dec 2020 18:39:53 -0800 (PST) X-Gm-Message-State: AOAM532+0YZFGXV+Em+B61JVeAscuXFl1eLtcMmKlWgtwSAa3MX8B1AO fSQ7+q6TkSKFcDPmdE46x2VBZOoXt3Wdz/tXAoo= X-Google-Smtp-Source: ABdhPJwfYJiLvTzwAELkEFuC/22rH7ijMCOMXNolIpvCGkwUpSEoVyvnY6eT0xEj7MlxqkOT54x6+ry9qjy1Vpu+DLk= X-Received: by 2002:a25:bb8f:: with SMTP id y15mr15275912ybg.451.1608431993114; Sat, 19 Dec 2020 18:39:53 -0800 (PST) MIME-Version: 1.0 References: <202012200046.0BK0kAXE098032@slippy.cwsent.com> In-Reply-To: <202012200046.0BK0kAXE098032@slippy.cwsent.com> From: Li-Wen Hsu Date: Sun, 20 Dec 2020 10:39:41 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Is it ok to MFC today To: Cy Schubert Cc: freebsd-git@freebsd.org 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: Sun, 20 Dec 2020 02:39:53 -0000 On Sun, Dec 20, 2020 at 8:46 AM Cy Schubert wrote: > > Would it be ok to MFC r368734 today? Just seeing this now. You can do it _now_, but please note the next step for marking src svn to readonly is in less than 30 mins. Please do it ASAP. Or we're happy to help you with git after the repo migration is done. Best, Li-Wen From owner-freebsd-git@freebsd.org Sun Dec 20 04:21:59 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 1AA834B7AF4 for ; Sun, 20 Dec 2020 04:21:59 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cz8ZG5sP8z3sgr; Sun, 20 Dec 2020 04:21:58 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id qqEEk9cKbktFkqqEGk3eNy; Sat, 19 Dec 2020 21:21:56 -0700 X-Authority-Analysis: v=2.4 cv=NYRYa0P4 c=1 sm=1 tr=0 ts=5fded164 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=e_eBO2vzgt8UxUlSi-IA:9 a=CjuIK1q_8ugA:10 a=UJ0tAi3fqDAA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 043E5E66; Sat, 19 Dec 2020 20:21:54 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BK4LrYE002960; Sat, 19 Dec 2020 20:21:53 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012200421.0BK4LrYE002960@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Li-Wen Hsu cc: Cy Schubert , freebsd-git@freebsd.org Subject: Re: Is it ok to MFC today In-reply-to: References: <202012200046.0BK0kAXE098032@slippy.cwsent.com> Comments: In-reply-to Li-Wen Hsu message dated "Sun, 20 Dec 2020 10:39:41 +0800." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 19 Dec 2020 20:21:53 -0800 X-CMAE-Envelope: MS4xfK38FdUYykdCEW4UXy8x6m+cPqZwBFp8+05MRuzKMklgl0gV9pu0l0//OJvNxtQdMucGO3242Z6IdtSRKm2Rbju6maQlPWJfrEPmzUB4ivrMlJSF55X7 xIMwojo96Z8rNCi8dS234EsDCppds9MLjVaeKwGh62CDWM29zokCOX8nfrA4+HC3r1oDQq84C2AowfkZ+ue4BMXiOFm7VVjiY3ao44UBc6/VIrdztfM+gdzk X-Rspamd-Queue-Id: 4Cz8ZG5sP8z3sgr 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, 20 Dec 2020 04:21:59 -0000 In message , Li-Wen Hsu writes: > On Sun, Dec 20, 2020 at 8:46 AM Cy Schubert wrote > : > > > > Would it be ok to MFC r368734 today? > > Just seeing this now. You can do it _now_, but please note the next > step for marking src svn to readonly is in less than 30 mins. Please > do it ASAP. Or we're happy to help you with git after the repo > migration is done. Just got back. Looks like my first git commit tomorrow morning will be an MFC. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Sun Dec 20 11:12: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 E88CA4BF1D5 for ; Sun, 20 Dec 2020 11:12:23 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CzKgq02b8z4j57 for ; Sun, 20 Dec 2020 11:12:22 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (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) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 2F72741307 for ; Sun, 20 Dec 2020 20:12:09 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1608462729; bh=O/Ld/H2g49VkBWB7T+jtJ7gMsud7chychcgNkmdRJLw=; h=Date:To:Subject:From; b=V0aVScfgGZjCQFa7YejOmkz0h4jVFuouR2AM45zQsLGvFe7CwWbV0GBgHuvRcXxbh bT1InxaP6bGIaGh7ghe0OzkC/7vcFLB7hUi25KZNK+xWWqVkI1iJCw2eNtsokniQe1 SXZiXDTuz3pIPQJMOZjzJancO59c+cSTHOx7E8TxcP8yKyV02icDB6lWzS9sy2eorE U7ctXtcqtI5vjoEtJS1bGGRSlT+BikegjVEbIS6Jbdj1DjrWKAPrJ15Dz50BPiwnET FQQSXfyphE1v+AOYkQiso3boI3ZX56VsfcUstxyLUCL9GldAWEzW7T0dL89uUCd1LK BtFmwzRVIkuww== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (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) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id 5D1A06A2B5; Sun, 20 Dec 2020 20:12:08 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.0 at eastasia.home.utahime.org Date: Sun, 20 Dec 2020 20:11:25 +0900 (JST) Message-Id: <20201220.201125.1426773511521501984.yasu@utahime.org> To: freebsd-git@freebsd.org Subject: Is conversion from Git to SVN not provided for doc repository? From: Yasuhiro KIMURA X-Mailer: Mew version 6.8 on Emacs 27.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4CzKgq02b8z4j57 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=V0aVScfg; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [0.30 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(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)[utahime.org]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2020 11:12:24 -0000 Hello, I found doc SVN repository isn't updated after the final SVN commit. Does it means that Git to SVN conversion isn't provided for doc repository after the comversion from SVN to Git? Best Regards. --- Yasuhiro KIMURA From owner-freebsd-git@freebsd.org Sun Dec 20 17:14:44 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 E8BCC4C6ECB for ; Sun, 20 Dec 2020 17:14:44 +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 4CzTjw2gk1z3HB7 for ; Sun, 20 Dec 2020 17:14:44 +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 0BKHEYC3054520 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 20 Dec 2020 18:14:34 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 20 Dec 2020 18:14:34 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Yasuhiro KIMURA Cc: freebsd-git@freebsd.org Subject: Re: Is conversion from Git to SVN not provided for doc repository? Message-ID: References: <20201220.201125.1426773511521501984.yasu@utahime.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20201220.201125.1426773511521501984.yasu@utahime.org> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4CzTjw2gk1z3HB7 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; 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: Sun, 20 Dec 2020 17:14:45 -0000 On Sun, 2020-12-20 at 20:11:25 +0900, Yasuhiro KIMURA wrote: >Hello, > >I found doc SVN repository isn't updated after the final SVN commit. > >Does it means that Git to SVN conversion isn't provided for doc >repository after the comversion from SVN to Git? That's correct, _only_ the base SVN repo will get updates on the stable/11 and stable/12 branches (and not on main/trunk/HEAD/current). Could you explain your use case for SVN on doc? Is there something we can help with? Regards Uli From owner-freebsd-git@freebsd.org Sun Dec 20 17:32:51 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 618764C76E5 for ; Sun, 20 Dec 2020 17:32:51 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CzV6p0G0tz3J67 for ; Sun, 20 Dec 2020 17:32:49 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (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) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 86F354127C for ; Mon, 21 Dec 2020 02:32:46 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1608485566; bh=s4BLfU0D+I9GZpx0sLKf+bK54+ihXQqxXdHei3w6OKU=; h=Date:To:Subject:From:In-Reply-To:References; b=HUzD7RPmv3YRQ4tQa3HsLjtbWoKAO+49vtzf2DN35RDQQjmwfoqqB2oC6KTANIUDm E5wdqEEf7Uz4t/FATMcAyUKcs+BhiL1CTAjMDTQvmojXF60UuMW5bSjD1h6SuISMeY exyGrkxBeIcJB+6xbDCWKFN1y3zVtqVV6vH9evq9QGp8cRAZcdIOjxZtHMbRoFEbmt WV2ghcacTE1ZhsHgaBl8ZxIf3lbWPzxcyTcWyevKo1U6BtUOb1zuSvtGQOij87qJfO JcCPxKl1oc13X+cDeOI/mdPzjUaKED0xH0MSYCnMt75/KlL3r6GL7dijHOHh9iPUK3 374L73aSXKb4A== Received: from localhost (rolling.home.utahime.org [192.168.174.11]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id BB4656A557; Mon, 21 Dec 2020 02:32:45 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.0 at eastasia.home.utahime.org Date: Mon, 21 Dec 2020 02:32:35 +0900 (JST) Message-Id: <20201221.023235.2118414415659462993.yasu@utahime.org> To: freebsd-git@freebsd.org Subject: Re: Is conversion from Git to SVN not provided for doc repository? From: Yasuhiro Kimura In-Reply-To: References: <20201220.201125.1426773511521501984.yasu@utahime.org> X-Mailer: Mew version 6.8 on Emacs 27.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=utf-8 Content-Transfer-Encoding: base64 X-Rspamd-Queue-Id: 4CzV6p0G0tz3J67 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=HUzD7RPm; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [0.40 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; MIME_BASE64_TEXT(0.10)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(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)[utahime.org]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2020 17:32:51 -0000 RnJvbTogVWxyaWNoIFNww7ZybGVpbiA8dXFzQGZyZWVic2Qub3JnPg0KU3ViamVjdDogUmU6IElz IGNvbnZlcnNpb24gZnJvbSBHaXQgdG8gU1ZOIG5vdCBwcm92aWRlZCBmb3IgZG9jIHJlcG9zaXRv cnk/DQpEYXRlOiBTdW4sIDIwIERlYyAyMDIwIDE4OjE0OjM0ICswMTAwDQoNCj4gVGhhdCdzIGNv cnJlY3QsIF9vbmx5XyB0aGUgYmFzZSBTVk4gcmVwbyB3aWxsIGdldCB1cGRhdGVzIG9uIHRoZQ0K PiBzdGFibGUvMTEgYW5kIHN0YWJsZS8xMiBicmFuY2hlcyAoYW5kIG5vdCBvbiBtYWluL3RydW5r L0hFQUQvY3VycmVudCkuDQo+IA0KPiBDb3VsZCB5b3UgZXhwbGFpbiB5b3VyIHVzZSBjYXNlIGZv ciBTVk4gb24gZG9jPyBJcyB0aGVyZSBzb21ldGhpbmcgd2UNCj4gY2FuIGhlbHAgd2l0aD8NCg0K VGhlcmUgaXMgbm8gcHJvYmxlbS4gSSBhc2tlZCBpdCBzaW1wbHkgYmVjYXVzZSBJIG1pc3VuZGVy c3Rvb2QgdGhhdA0KY29udmVyc2lvbiBpcyBwcm92aWRlZCBmb3IgYWxsIG9mIGRvYy9wb3J0cy9z cmMgcmVwb3NpdG9yaWVzLiBCdXQgbm93DQpJIHVuZGVyc3RhbmQgaXQgaXNuJ3QgdGhlIGNhc2Uu IFNvcnJ5IGZvciBhbm5veWluZyB5b3UuDQoNCi0tLQ0KWWFzdWhpcm8gS0lNVVJBDQo= From owner-freebsd-git@freebsd.org Mon Dec 21 16:39: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 19EED4BF04C for ; Mon, 21 Dec 2020 16:39:57 +0000 (UTC) (envelope-from lwhsu@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 4D04vK0D5xz3nr6 for ; Mon, 21 Dec 2020 16:39:57 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f172.google.com (mail-yb1-f172.google.com [209.85.219.172]) (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 E975017DC for ; Mon, 21 Dec 2020 16:39:56 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f172.google.com with SMTP id j17so9310491ybt.9 for ; Mon, 21 Dec 2020 08:39:56 -0800 (PST) X-Gm-Message-State: AOAM532cP6UUrZPytWcJvpLaCwRbdFeVP8U4FYS1pAjrbFvussn1TDOO WpFECaMDXiYcepCpswJ2jE0Os6KgYf9jEDxVmvM= X-Google-Smtp-Source: ABdhPJw8r18jaBt0FLRg6NjKjoUpcjN5rRFpaadVLn2He0iahJ1D91dMAt7ebKVI8CqOCq8yU0zUzz74YZQqpa0FD9k= X-Received: by 2002:a25:e646:: with SMTP id d67mr22880554ybh.405.1608568796508; Mon, 21 Dec 2020 08:39:56 -0800 (PST) MIME-Version: 1.0 From: Li-Wen Hsu Date: Tue, 22 Dec 2020 00:39:45 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Src repository is available on git.freebsd.org To: freebsd-git@freebsd.org 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: Mon, 21 Dec 2020 16:39:57 -0000 Hello all, The src git repository is available in the official git mirrors, git.freebsd.org, and the GeoDNS behind it should direct you to the closest mirror based on your location. For clone, please use one of the following URLs: - https://git.freebsd.org/src.git - ssh://anongit@git.freebsd.org/src.git (anongit@git.freebsd.org:src.git) And the web-based repository browser is at: https://cgit.freebsd.org/src/ In case you didn't know, the status of src git repository migration is at https://wiki.freebsd.org/git We're still working on some final bits before enabling push to the src repository, and there will be another announcement after the migration is done. Best, Li-Wen From owner-freebsd-git@freebsd.org Mon Dec 21 17:28:43 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 3A4D34C0168 for ; Mon, 21 Dec 2020 17:28:43 +0000 (UTC) (envelope-from jhb@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 4D05zb10wZz3rb2; Mon, 21 Dec 2020 17:28:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:a4c5:833e:8ae:3fad]) (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 C46511C37; Mon, 21 Dec 2020 17:28:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: Git commit message templates To: Ed Maste Cc: freebsd-git 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: <5398f806-42a5-560e-a22c-c5483a0c6f9e@FreeBSD.org> Date: Mon, 21 Dec 2020 09:28:40 -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: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2020 17:28:43 -0000 On 12/17/20 12:58 PM, Ed Maste wrote: > On Wed, 16 Dec 2020 at 17:35, John Baldwin wrote: >> >> The only one I'm not a fan of is the lack of punctuation for the first >> sentence. Newspaper headlines also use additional capitalization >> (e.g. last word and "significant words"), so the current recommendation >> is a mix of things and not fully consistent with either one. > > Fair point - considering the first line as one would an email subject > is probably the best approach. I agree. Perhaps just say that (rather than newspaper headline) and leave off the note about punctuation. -- John Baldwin From owner-freebsd-git@freebsd.org Mon Dec 21 17:33:59 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 9DAAF4C046E for ; Mon, 21 Dec 2020 17:33:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (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 4D065g3wddz3s7q for ; Mon, 21 Dec 2020 17:33:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x731.google.com with SMTP id z11so9453539qkj.7 for ; Mon, 21 Dec 2020 09:33:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=uJwuuEgpjbCoxKWFGUUSnjBJuK2IHtGFUOkgZfSUaLM=; b=WQhjWDGx4LYpe96HVCmlsyYpBTKnsWCsanhNyI9WuAmeD6xZ2Dg3jaTEqZZaJsWIML PHFt5BdjVyGe3Dh+8YzuP0HF5MkVRX4YEo/wnw5QShHYhR5N7jUA3znQrf6+QQgogeiM rkxiZwWnyWGUPGsygx/d9h2WlWo2FN4yNNjqg2zZbSsqHpvAV6q8np2Yp4B6y2a1FofZ iP0CouE9xjYodjnShPgSKhjS0rNS3olAhHpAZwQ6GGoq8MzuwylDzVgQC7e5ajydkfHm 0KP5T9kNeqrYyLHFUpWcPfYukM/Uh2d6YM1dwXuc+PqEKoC6TJwEYWAxoGhd1TYXrYcN UGWw== 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=uJwuuEgpjbCoxKWFGUUSnjBJuK2IHtGFUOkgZfSUaLM=; b=mZgMEKSV1q5GVPWdqQJCQLxMDE/4K0dlirB2izlYwDxGQasth7kyTTFq4upTU+/Fpg U801WIRn8jMakzgwy4IikdWHbxlCcJMoNRJEaQaDnoJJPLMlgSLq2U2ckjcZbzqiQ1/7 bMz6W+w3P3bWCpw6nOT3xud5xAKCxsyQ1Ge3NGd1tGltXQTAV1nA6Ow+qde4eeMnDRIS a9U36qnRxDqmM5t1Pa4ZRz8o7hihjLloDlk3g03gR9A6al5oVr3v/NOg+VQ0EeJkfxxm F8NrDPilgzJDHsaisGS6eR/v62q7Mli7K2nPkwkdVPsBtrg4UFi3nthGQS4U7OhG0oJ5 lpiQ== X-Gm-Message-State: AOAM531CalOozrKVd7pWZs5edbJTKrZTlffhQKuivenW9ZXkR6bVChOq pRuDsuT9GiNOCLrOBYZaSw1B8wtl+YDRe1GrvnQXjw== X-Google-Smtp-Source: ABdhPJw53/CBE4hyyAmtX+XS9k4Ybu6cMvu8W+DR1t11BzFybGFlX40o3Swszu8jzP0l+lODQZQd+tCz5XyXa8tUhWc= X-Received: by 2002:a37:306:: with SMTP id 6mr17476320qkd.206.1608572038915; Mon, 21 Dec 2020 09:33:58 -0800 (PST) MIME-Version: 1.0 References: <5398f806-42a5-560e-a22c-c5483a0c6f9e@FreeBSD.org> In-Reply-To: <5398f806-42a5-560e-a22c-c5483a0c6f9e@FreeBSD.org> From: Warner Losh Date: Mon, 21 Dec 2020 10:33:48 -0700 Message-ID: Subject: Re: Git commit message templates To: John Baldwin Cc: Ed Maste , freebsd-git X-Rspamd-Queue-Id: 4D065g3wddz3s7q 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" 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, 21 Dec 2020 17:33:59 -0000 On Mon, Dec 21, 2020 at 10:28 AM John Baldwin wrote: > On 12/17/20 12:58 PM, Ed Maste wrote: > > On Wed, 16 Dec 2020 at 17:35, John Baldwin wrote: > >> > >> The only one I'm not a fan of is the lack of punctuation for the first > >> sentence. Newspaper headlines also use additional capitalization > >> (e.g. last word and "significant words"), so the current recommendation > >> is a mix of things and not fully consistent with either one. > > > > Fair point - considering the first line as one would an email subject > > is probably the best approach. > > I agree. Perhaps just say that (rather than newspaper headline) and leave > off the note about punctuation. > Personally, I think we're starting to get a bit over prescriptive here. Once you have the length down, and have a keyword at the start, you've got 99% of the benefit. Nobody cares if there's a dot at the end or not, and it's presence or absence adds no value to other readers. Nobody cares about having lots of caps or not. We should just let people use their judgement. Warner From owner-freebsd-git@freebsd.org Mon Dec 21 21:26:48 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 848B04C4AB3 for ; Mon, 21 Dec 2020 21:26:48 +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 4D0CGJ0k18z4Z8x for ; Mon, 21 Dec 2020 21:26:47 +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 0BLLR2IF079801 for ; Mon, 21 Dec 2020 13:27:08 -0800 (PST) (envelope-from bsd-lists@bsdforge.com) MIME-Version: 1.0 Date: Mon, 21 Dec 2020 13:27:02 -0800 From: Chris To: freebsd-git Subject: This may be a bit late in the game, but might this b any help? User-Agent: UDNSMS/17.0 Message-ID: X-Sender: bsd-lists@bsdforge.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D0CGJ0k18z4Z8x X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] 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, 21 Dec 2020 21:26:48 -0000 Maybe others have already examined this[1]. I forgot I had a copy. eposurgeon - a repository surgeon reposurgeon enables risky operations that version-control systems don't want to let you do, such as (a) editing past comments and metadata, (b) excising commits, (c) coalescing commits, and (d) removing files and subtrees from repo history. The original motivation for reposurgeon was to clean up artifacts created by repository conversions. reposurgeon is also useful for scripting very high-quality conversions from Subversion. It is better than git-svn at tag lifting, automatically cleaning up cvs2svn conversion artifacts, dealing with nonstandard repository layouts, recognizing branch merges, handling mixed-branch commits, and generally at coping with Subversion's many odd corner cases. Normally Subversion repos should be analyzed at a rate of upwards of ten thousand commits per minute. repodiffer is a program that reports differences between repository histories. It uses a diff(1)-like algorithm to identify spans of identical revisions, and to pick out revisions that have been changed or deleted or inserted. It may be useful for comparing the output of different repository-conversion tools in detail. Another auxiliary program, repopuller, assists in mirroring Subversion repositories. ... 1. https://gitlab.com/esr/reposurgeon --Chris From owner-freebsd-git@freebsd.org Tue Dec 22 09:00:45 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 4DF254B8518 for ; Tue, 22 Dec 2020 09:00:45 +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 4D0Vg06Mq2z3jZ7 for ; Tue, 22 Dec 2020 09:00:44 +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 0BM90OZg044408 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 22 Dec 2020 10:00:25 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Tue, 22 Dec 2020 10:00:24 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Chris Cc: freebsd-git Subject: Re: This may be a bit late in the game, but might this b any help? 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: 4D0Vg06Mq2z3jZ7 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; 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: Tue, 22 Dec 2020 09:00:45 -0000 On Mon, 2020-12-21 at 13:27:02 -0800, Chris wrote: >Maybe others have already examined this[1]. I forgot I had a copy. > >eposurgeon - a repository surgeon > >reposurgeon enables risky operations that version-control systems don't >want to let you do, such as (a) editing past comments and metadata, >(b) excising commits, (c) coalescing commits, and (d) removing files >and subtrees from repo history. The original motivation for >reposurgeon was to clean up artifacts created by repository >conversions. > >reposurgeon is also useful for scripting very high-quality conversions >from Subversion. It is better than git-svn at tag lifting, >automatically cleaning up cvs2svn conversion artifacts, dealing with >nonstandard repository layouts, recognizing branch merges, handling >mixed-branch commits, and generally at coping with Subversion's many >odd corner cases. Normally Subversion repos should be analyzed at a >rate of upwards of ten thousand commits per minute. > >repodiffer is a program that reports differences between repository >histories. It uses a diff(1)-like algorithm to identify spans of >identical revisions, and to pick out revisions that have been >changed or deleted or inserted. It may be useful for comparing the >output of different repository-conversion tools in detail. > >Another auxiliary program, repopuller, assists in mirroring Subversion >repositories. Thanks, but that is a bit late, yeah. I've been working on the converter for the last 10 years ... I had another look at reposurgeon about a year ago and couldn't make heads or tails of it. A straightforward conversion worked, but re-produced all the cvs2svn non-sense, so I figure an elaborate ruleset would've been required anyway. Take a look at https://github.com/freebsd/git_conv/blob/master/freebsd-base.rules to get a sense of what is needed. Cheers Uli From owner-freebsd-git@freebsd.org Tue Dec 22 15:50:17 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 CAEBA4C109A for ; Tue, 22 Dec 2020 15:50:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0glX2xSjz4YY9 for ; Tue, 22 Dec 2020 15:50:16 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id rjvQkytWlbYg3rjvSk0OQf; Tue, 22 Dec 2020 08:50:14 -0700 X-Authority-Analysis: v=2.4 cv=Q4RsX66a c=1 sm=1 tr=0 ts=5fe215b6 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=zTNgK-yGK50A:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=B8ZOKAVbCjLe9WOLcjgA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 1CA2E4B14 for ; Tue, 22 Dec 2020 07:50:12 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0BMFoBf9064149 for ; Tue, 22 Dec 2020 07:50:11 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202012221550.0BMFoBf9064149@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: freebsd-git@freebsd.org Subject: dev-commits-src-all Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 22 Dec 2020 07:50:11 -0800 X-CMAE-Envelope: MS4xfJ1cponxDk0vM4C7aUpgoGdj+b7M2hYILccP6u/9580Ake5/OTTTVF3EKFnJSiWTdpFX7grNqZsyGY3Jzc6Wk+icQt0pJ5Xuwu5TujtdLwtrkxwnP2MW HEjwQfOm85fil0/oG8JUYEmXKd9qLGRLTuvXLemwhsRJpKMxx1svK6IkoP5e7FwODZLxlX2HM410zLQRheoUl7lRoe7mWFDHp/o= X-Rspamd-Queue-Id: 4D0glX2xSjz4YY9 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.136.137) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-0.08 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.136.137:from]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.229.168:received]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.59.136.137:from]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[64.59.136.137:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.136.137:from]; RCVD_TLS_LAST(0.00)[]; NEURAL_SPAM_SHORT(0.62)[0.625]; R_SPF_NA(0.00)[no SPF record]; 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: Tue, 22 Dec 2020 15:50:17 -0000 Will committers be automatically subscribed to dev-commits-src-all or do we do this ourselves? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Tue Dec 22 17:38: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 41E814C2F27 for ; Tue, 22 Dec 2020 17:38:47 +0000 (UTC) (envelope-from Alexander.Sideropoulos@netapp.com) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e8a::617]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0k8k0kKZz4fn7; Tue, 22 Dec 2020 17:38:45 +0000 (UTC) (envelope-from Alexander.Sideropoulos@netapp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mw7/B0QB7wUZoVCRfOdNjpzLR2XlYIRf4a04hsAswxGlsXQ82iT4F5kAKddcHiNiNydTJ3Gl38rdBqxpWaEZXPCt/oPNJR5yzeNk/3JN3lxGAyto9qQcNCMmfwCXK5myefe0iWSgpvF2FmvM1gRsAVUBGeuNdINgVbJSW6eLpeqFIwq0FwuMlbE8OVktplGawPpjm9pkFJIkKjnCFwdiifedW8IwBCHD5ixcITHkNbLvF5krfPAmut52IfEMCFlEfEAK/jUx9JxXhsp1PJhCVPhiDsEMxArRS+unQfnrvLdwFihM7njBBzo49YjFJ7PXd+0ppWosehbyilmm/vlBgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Oqcsqb7uhMoOewGRYcZOG0twOFCZEc9s0nwWpdwSJTk=; b=PCgYbJrhVecmkUbX28IJmoH0yLwfnOVR/7A+gCdWtV3SSyVRmIfBPgFKdoMiAQKEhk9Jm+ewWvgFYQ1lBU88brc/3EgZnpWPXs/1ftQQRdvbHmSsxVoOhgxo6q8sBqA5TtexOICT/xg9KvYTwrcCBMON9BuD5woB+qg3E0e/W4g0kaUCzB1b+h0sCFWRWKAsXv4MZgaIiNFL8tQP9L2XC6KfTe1djrKMCqLa8naLVWokFWChwLc2ubsttzqmCKhlrA5lwIMTuXxmU1Rvbo+fl9RSh4pbLjyGe4abLnbG8QpQw/EE92D+TCH78Ep5gXWa+tghf0COD3GLfSx337kAeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=netapp.com; dmarc=pass action=none header.from=netapp.com; dkim=pass header.d=netapp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Oqcsqb7uhMoOewGRYcZOG0twOFCZEc9s0nwWpdwSJTk=; b=D3TbUDeauu3iqA7LVNbVkyPAT/qJ0cxKj6GarItIYT9k/IxEQyDLeXPAekOr6JWqsneEjBXbuiE8GpE26SkyN3e6BaYQoxo8gpcKKQp/mGLfF+ibVLGjZnrVyx900T3/kk6MLTJ5HydzN2ftS2C0Dg93TBbMopkaaEhzdrt0BAJ6jZYkr0GDFH/W5GDCjLAfry7zbI5iFd2QCCe2brbqjxIlCm6rJHEvB+QHG5Z7FiY1oGD4D52CrMbPqIkl9xvFT7i6pVC1IdedL/a+493OSQLfmbTe0fFkCBxF8XRup9X8v3unh9LZ+uy6h833dqUMWGP8YX30Drxmgowdfgoz0A== Received: from SJ0PR06MB7423.namprd06.prod.outlook.com (2603:10b6:a03:323::17) by SJ0PR06MB7598.namprd06.prod.outlook.com (2603:10b6:a03:320::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.25; Tue, 22 Dec 2020 17:38:44 +0000 Received: from SJ0PR06MB7423.namprd06.prod.outlook.com ([fe80::d01f:2d7a:8095:7827]) by SJ0PR06MB7423.namprd06.prod.outlook.com ([fe80::d01f:2d7a:8095:7827%7]) with mapi id 15.20.3676.033; Tue, 22 Dec 2020 17:38:44 +0000 From: "Sideropoulos, Alexander" To: Li-Wen Hsu , "freebsd-git@freebsd.org" Subject: Re: Src repository is available on git.freebsd.org Thread-Topic: Src repository is available on git.freebsd.org Thread-Index: AQHW17fxDHXuVzsLaUK+BGam3YwMuqoC3QmA Date: Tue, 22 Dec 2020 17:38:44 +0000 Message-ID: <2432AD44-79AB-40B1-AD7A-00D9CB23CEDC@netapp.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/16.44.20121301 x-originating-ip: [216.240.19.104] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d180ba1e-4678-42eb-a8c8-08d8a6a06de1 x-ms-traffictypediagnostic: SJ0PR06MB7598: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3FVUDkiPZQOsdmX11Pkg6yG/pk4iztOydGn/7UkHfnu5GAX7LbTRHviv79QZsIfD6KFV9teSuXbGgF9NP76ZkuoWjcPqHdqnvZt6bxQa9Sf8WQAiT0I9Z74CD6L5A0zKNOsHkV5JVZOC0hIYltoYMA9JmkAFqdUM9J5YYUZBi1cCJ0blG2MijMsEqlrDLdQkWVY+Bodu+L7A+AdvbuzKu37v1ACpGc4rO+GHDbJekAxgr6UGndCo9Rl+RIkabfgmGxvZl0qLubLSx7seQpwtPZ6sUcjTd1DlaU0+WYMfxliypFKa9v9mjAYdIE6ZuHi3SZmpm/ygbIRPSA1cWm1DdxqYAiJWTyJdahhhCg7Wj0DAMP+V8Y3W/36iQF291q+nlpwA6JGm1MTO2gkRRMU11fBDOaEuzVgj+/5cas0M0CHtuG1QJyMOP9tqIEeK60sHuRF/7VlIf3WgMpG9XoiKdo147Q16sSLbaklWQ282C4Co2wzL94ONNcNevX3L5N/GntalWeeD/8XCccsU7qaHnw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR06MB7423.namprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(376002)(396003)(346002)(136003)(366004)(86362001)(26005)(8936002)(66476007)(33656002)(2906002)(5660300002)(316002)(36756003)(8676002)(6486002)(2616005)(83380400001)(6506007)(64756008)(66574015)(478600001)(6512007)(66556008)(71200400001)(110136005)(966005)(66446008)(76116006)(450100002)(66946007)(186003)(45980500001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?utf-8?B?MDBxODc0SEVRY3JZNGhwcENxenRSeUYvVE1mNzNiMDZIbk9DcStlRWNWNDJj?= =?utf-8?B?MGgyUXdTa2EvUXh2bDREYTR6MUh6aVZDc2NRRXJYK3g2bWt3YnFYajB6eU4w?= =?utf-8?B?c0xWT0Vxb1RWQUkxcHlGcXk5N0NRR0kvRDFvSlQrYUhQQ3FKbUthTkpsNWZQ?= =?utf-8?B?ZjdReDFpcFZtQURjWnVxUW9wbk52dGRhZXJrN28wQ1loUW9sM0szalNiWVhi?= =?utf-8?B?WXVJV2NidHBCeE0wUmc5cDQrYUwxMWZLKy9pR0ExSTBGMnNzaWphd0M3Nk5B?= =?utf-8?B?MkpZbXRjQkZkWCt2YjZWT3F1N2NGSEJUczgyemh4dEk0dzRDYURRUEFyVHdx?= =?utf-8?B?bUhaU1R5bEkzaGd0RzJDVGpzd0hTRXozdndwYmFRWkZ4aXVVTENKSDNYZG1T?= =?utf-8?B?S0hzWHNzclRuUTdhRWxuZm12TTViT2VFSk9XclllZlNZOU0vbXlpVmpHUnpl?= =?utf-8?B?Sy9NUGpkTXJxeDBhYk1POVNzU2lSMlNhNUlUdWYwTkVhS2NQcEFuaHpoWVIz?= =?utf-8?B?UWtLVjBCSXVBUGxPdmdBSW9haE9mT25ueFNCcXdydVI5a3BYTldzSWpOU1JZ?= =?utf-8?B?VnhDOFNMSHBaT2QyRmk2NTNkSkdrcEd4RVNJci8zYm5aVkZSNW5WTW91QWg5?= =?utf-8?B?Qm5SNnM4UzdrbGFZTWp4ODZkZ1g2MUVId3NHRHg1WlJVVVY1UDJMTGZvV0hX?= =?utf-8?B?cUhXZnNtV1BpbnVpUDE4ajA0Q2UxSS9raGU0Rll4MHlWUFl6SE5NczZKZSs2?= =?utf-8?B?TkRQS1BRMkpIT3REaGN2NUp5bU83Z2NaaTdjRkRUZndVUUVYWVFjbXBzeUZk?= =?utf-8?B?WUtuU1lsc1IyUTF0UlVudldxbUtOZytSckpFSzVuUm43L0F1RHRZOXBsMWxH?= =?utf-8?B?QjhjUXBveDgwaTg1WGlINXc2WUtvK2VNVFlaZ1RLcFZDT3RVbTN4T1U1L3g5?= =?utf-8?B?a2NZTVMzbHJsenZERUNjQWVQa0lZaDM3ZHdHb01Uc1ljTlZTaVFCdDMyZ0tV?= =?utf-8?B?MnJxUlJqNitYcVZhcm1hVWoyVGRYNTd1NWRrUVQ2emZXR2hITTJQTndkZTky?= =?utf-8?B?ZGt1T016cmJIeUVCelVDUisvWFZHTmdHSVFLbkRNbmFXTXhmdzU3WUQycjR4?= =?utf-8?B?aXI2MjBURVhQMjBmaU83UVNMNk4rdTU1dkxjT0xFbk5GUUQ3a0loRHJvV1lW?= =?utf-8?B?R2RHQXhBbVRlSGh1aUxpWW53NVcvRUg2T05TemlVODlnQnI3NWg5MFN3OVVJ?= =?utf-8?B?dlMycDNhdUtVQWdYSXVoWjR0T2xtQjAwYUZNdSt4aDR6SWdxZEZVd3hBRkNK?= =?utf-8?Q?t3y/JDIHoU57gZBxOSgNQcr2EsMhDScoD0?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="utf-8" Content-ID: Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-OriginatorOrg: netapp.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR06MB7423.namprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d180ba1e-4678-42eb-a8c8-08d8a6a06de1 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Dec 2020 17:38:44.0452 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4b0911a0-929b-4715-944b-c03745165b3a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: eR7J+oV3xg0Uu2P+4EttZW3u+YW/dUKTPSS1p7foJPIzmtYr4X6D3pQ3CQ53tssmcSVWtMBwkaIHeACOY2BtHQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR06MB7598 X-Rspamd-Queue-Id: 4D0k8k0kKZz4fn7 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=netapp.com header.s=selector1 header.b=D3TbUDea; arc=pass (microsoft.com:s=arcselector9901:i=1); dmarc=none; spf=pass (mx1.freebsd.org: domain of Alexander.Sideropoulos@netapp.com designates 2a01:111:f400:7e8a::617 as permitted sender) smtp.mailfrom=Alexander.Sideropoulos@netapp.com X-Spamd-Result: default: False [-5.40 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; HAS_XOIP(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:111:f400::/48]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[netapp.com:+]; MIME_BASE64_TEXT(0.10)[]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a01:111:f400:7e8a::617:from]; ASN(0.00)[asn:8075, ipnet:2a01:111:f000::/36, country:US]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[netapp.com:s=selector1]; FROM_HAS_DN(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)[netapp.com]; SPAMHAUS_ZRD(0.00)[2a01:111:f400:7e8a::617:from:127.0.2.255]; DWL_DNSWL_LOW(-1.00)[netapp.com:dkim]; 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: Tue, 22 Dec 2020 17:38:47 -0000 Q291bGQgd2UgZW5hYmxlIHRoZSBzZWFyY2ggZmVhdHVyZSB0byBpbmNsdWRlIHRoZSBub3RlcyBz ZWN0aW9ucz8gVGhhdCB3YXkgd2UgY2FuIHVzZSBpdCB0byBzdGlsbCBmaW5kIG9sZGVyIGNvbW1p dHMgYnkgU1ZOLg0KDQpUaGFua3MhDQotLWFwDQoNCu+7v09uIDEyLzIxLzIwLCAwODo0MCwgIm93 bmVyLWZyZWVic2QtZ2l0QGZyZWVic2Qub3JnIG9uIGJlaGFsZiBvZiBMaS1XZW4gSHN1IiA8b3du ZXItZnJlZWJzZC1naXRAZnJlZWJzZC5vcmcgb24gYmVoYWxmIG9mIGx3aHN1QGZyZWVic2Qub3Jn PiB3cm90ZToNCg0KICAgIE5ldEFwcCBTZWN1cml0eSBXQVJOSU5HOiBUaGlzIGlzIGFuIGV4dGVy bmFsIGVtYWlsLiBEbyBub3QgY2xpY2sgbGlua3Mgb3Igb3BlbiBhdHRhY2htZW50cyB1bmxlc3Mg eW91IHJlY29nbml6ZSB0aGUgc2VuZGVyIGFuZCBrbm93IHRoZSBjb250ZW50IGlzIHNhZmUuDQoN Cg0KDQoNCiAgICBIZWxsbyBhbGwsDQoNCiAgICBUaGUgc3JjIGdpdCByZXBvc2l0b3J5IGlzIGF2 YWlsYWJsZSBpbiB0aGUgb2ZmaWNpYWwgZ2l0IG1pcnJvcnMsDQogICAgZ2l0LmZyZWVic2Qub3Jn LCBhbmQgdGhlIEdlb0ROUyBiZWhpbmQgaXQgc2hvdWxkIGRpcmVjdCB5b3UgdG8gdGhlDQogICAg Y2xvc2VzdCBtaXJyb3IgYmFzZWQgb24geW91ciBsb2NhdGlvbi4NCg0KICAgIEZvciBjbG9uZSwg cGxlYXNlIHVzZSBvbmUgb2YgdGhlIGZvbGxvd2luZyBVUkxzOg0KDQogICAgICAtIGh0dHBzOi8v Z2l0LmZyZWVic2Qub3JnL3NyYy5naXQNCiAgICAgIC0gc3NoOi8vYW5vbmdpdEBnaXQuZnJlZWJz ZC5vcmcvc3JjLmdpdA0KICAgICAgICAoYW5vbmdpdEBnaXQuZnJlZWJzZC5vcmc6c3JjLmdpdCkN Cg0KICAgIEFuZCB0aGUgd2ViLWJhc2VkIHJlcG9zaXRvcnkgYnJvd3NlciBpcyBhdDoNCg0KICAg ICAgICBodHRwczovL2NnaXQuZnJlZWJzZC5vcmcvc3JjLw0KDQogICAgSW4gY2FzZSB5b3UgZGlk bid0IGtub3csIHRoZSBzdGF0dXMgb2Ygc3JjIGdpdCByZXBvc2l0b3J5IG1pZ3JhdGlvbiBpcyBh dA0KDQogICAgICAgIGh0dHBzOi8vd2lraS5mcmVlYnNkLm9yZy9naXQNCg0KICAgIFdlJ3JlIHN0 aWxsIHdvcmtpbmcgb24gc29tZSBmaW5hbCBiaXRzIGJlZm9yZSBlbmFibGluZyBwdXNoIHRvIHRo ZSBzcmMNCiAgICByZXBvc2l0b3J5LCBhbmQgdGhlcmUgd2lsbCBiZSBhbm90aGVyIGFubm91bmNl bWVudCBhZnRlciB0aGUgbWlncmF0aW9uDQogICAgaXMgZG9uZS4NCg0KICAgIEJlc3QsDQogICAg TGktV2VuDQogICAgX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18NCiAgICBmcmVlYnNkLWdpdEBmcmVlYnNkLm9yZyBtYWlsaW5nIGxpc3QNCiAgICBodHRwczov L2xpc3RzLmZyZWVic2Qub3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWJzZC1naXQNCiAgICBUbyB1 bnN1YnNjcmliZSwgc2VuZCBhbnkgbWFpbCB0byAiZnJlZWJzZC1naXQtdW5zdWJzY3JpYmVAZnJl ZWJzZC5vcmciDQoNCg== From owner-freebsd-git@freebsd.org Tue Dec 22 18:43: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 662C24C5494 for ; Tue, 22 Dec 2020 18:43:18 +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 4D0lbB2DDLz4lGk for ; Tue, 22 Dec 2020 18:43:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) (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 3DCB3D53B for ; Tue, 22 Dec 2020 18:43:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f180.google.com with SMTP id o144so12551230ybc.0 for ; Tue, 22 Dec 2020 10:43:18 -0800 (PST) X-Gm-Message-State: AOAM530EQf293wZosUdzHx60qCVI9X97VbEoI1YfEFrHrIdRL08LWI06 ZF2IMijKitFjYnKMo4gyu3XE4lXppRi91yHI4iI= X-Google-Smtp-Source: ABdhPJwrL9CMZBDq2j8+bARx1T9o6p7KFVzOlduWfMhJTNtp3oZ4ESWgeuhywotCfZppaBa8XX3tmJIfRGUaF/cjV6Q= X-Received: by 2002:a25:bb8f:: with SMTP id y15mr31895697ybg.451.1608662597113; Tue, 22 Dec 2020 10:43:17 -0800 (PST) MIME-Version: 1.0 References: <202012221550.0BMFoBf9064149@slippy.cwsent.com> In-Reply-To: <202012221550.0BMFoBf9064149@slippy.cwsent.com> From: Li-Wen Hsu Date: Wed, 23 Dec 2020 02:43:05 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: dev-commits-src-all To: Cy Schubert Cc: freebsd-git@freebsd.org 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: Tue, 22 Dec 2020 18:43:18 -0000 On Tue, Dec 22, 2020 at 11:50 PM Cy Schubert wrote: > > Will committers be automatically subscribed to dev-commits-src-all or do we > do this ourselves? Not for dev-commits-*, but all committers are already in another list generated from the repository's access file. If you check the header of the commit message, you will find there are three lists in the To: field. Take a commit to svn's src head: To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org The first one will be kept. Best, Li-Wen From owner-freebsd-git@freebsd.org Tue Dec 22 18:45: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 27BA04C5885 for ; Tue, 22 Dec 2020 18:45:18 +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 4D0ldV0dwKz4lSX for ; Tue, 22 Dec 2020 18:45:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182]) (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 025B5DF92 for ; Tue, 22 Dec 2020 18:45:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f182.google.com with SMTP id w127so12518631ybw.8 for ; Tue, 22 Dec 2020 10:45:17 -0800 (PST) X-Gm-Message-State: AOAM533T5E5pAmiMKflOKgEYq9rCIjrXdb2+hHx6uEeIKALDqPq6nQte 4HRtNvht43W7gyEb4YlvzuOanEVDC8hjSMg58k4= X-Google-Smtp-Source: ABdhPJw6EjBODzmJ4ZX3fLzGWhgl06Xx+zdJL8FgntJL3d2cQBrFsvB6tnysGNlaeuo18zPnC4MCjREhuSOp4J2G6Ik= X-Received: by 2002:a25:c845:: with SMTP id y66mr26975204ybf.110.1608662717554; Tue, 22 Dec 2020 10:45:17 -0800 (PST) MIME-Version: 1.0 References: <2432AD44-79AB-40B1-AD7A-00D9CB23CEDC@netapp.com> In-Reply-To: <2432AD44-79AB-40B1-AD7A-00D9CB23CEDC@netapp.com> From: Li-Wen Hsu Date: Wed, 23 Dec 2020 02:45:06 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Src repository is available on git.freebsd.org To: "Sideropoulos, Alexander" Cc: "freebsd-git@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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: Tue, 22 Dec 2020 18:45:18 -0000 Do you mean search notes on cgit.freebsd.org? I need to check cgit's configuration if this is possible. I am happy to enable it if it is available. Please let me know if you know how to do it. Best, Li-Wen On Wed, Dec 23, 2020 at 1:38 AM Sideropoulos, Alexander wrote: > > Could we enable the search feature to include the notes sections? That wa= y we can use it to still find older commits by SVN. > > Thanks! > --ap > > =EF=BB=BFOn 12/21/20, 08:40, "owner-freebsd-git@freebsd.org on behalf of = Li-Wen Hsu" = wrote: > > NetApp Security WARNING: This is an external email. Do not click link= s or open attachments unless you recognize the sender and know the content = is safe. > > > > > Hello all, > > The src git repository is available in the official git mirrors, > git.freebsd.org, and the GeoDNS behind it should direct you to the > closest mirror based on your location. > > For clone, please use one of the following URLs: > > - https://git.freebsd.org/src.git > - ssh://anongit@git.freebsd.org/src.git > (anongit@git.freebsd.org:src.git) > > And the web-based repository browser is at: > > https://cgit.freebsd.org/src/ > > In case you didn't know, the status of src git repository migration i= s at > > https://wiki.freebsd.org/git > > We're still working on some final bits before enabling push to the sr= c > repository, and there will be another announcement after the migratio= n > is done. > > Best, > Li-Wen > _______________________________________________ > 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 Tue Dec 22 21:32:50 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 4EFA04C9ABC for ; Tue, 22 Dec 2020 21:32:50 +0000 (UTC) (envelope-from Alexander.Sideropoulos@netapp.com) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2085.outbound.protection.outlook.com [40.107.223.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0qLp0dlDz3C6v; Tue, 22 Dec 2020 21:32:49 +0000 (UTC) (envelope-from Alexander.Sideropoulos@netapp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=egZV2p9bsVztQzeD12WbNfiI2xdC8CpYUUwpwe7Q7aKfkE7lLk1OGoJl+WJr9hcyLlRT0T8DpW6kLv+XFW9IRdn+zeiotjgO5gF/N2GFduslIdWm/OqPtfP14SaWRUA9E3fPiumW/5zFx6z5fG+nIWg82hSWnu/rO1sLWLcG4HldF41XwdBeMrxPfSRjuy4jJDdMSDtZFrUgwUrXpZ+KAFA8g2StCGastUMTi7SFvmtMKHAjlnPTOk69PLytys5be8SzB3qgn1q1KZXJ2vQJ0pJv3urc6/UQjtfXLwbvQWEx93Y+NG+JvurWLRrow7wqgEJMptvzNegT0TNt4zB+Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nRb+29N6yKDdVbnwBBoF7hIHMf4m3HYmSZpPHBdPXHM=; b=n6z/QYhprAHEeO2S3PVZGRz1Zqr5SVSXS7ighytZ13fLeThw038KupUiNc6d5dzyeOf4MCRuxTNXIEdemc/bWqiobxsChjSKt1buNfMyTWr4OBdeVE962no09osTSVI88JcKWUZ1MfE9K0OZ55DG3P0m6vJ7hCf8TUUNkyUr3va/7EvOI3ugAtNi5lFU4z9YxPeN2laeCVbL32Qqd1GY2P5QZoczlEzM1pTi3DlpeJmZfJq4UUmxYg6pTOsF4xX7rEC+Il8fNw2jmoBVw3g9s8XBIxUd3UZev0eXe9ZOtHpZhFQkSEOKt1mEbjbfGp2rVYd4FFrnCJy03CQCTHVT5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=netapp.com; dmarc=pass action=none header.from=netapp.com; dkim=pass header.d=netapp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nRb+29N6yKDdVbnwBBoF7hIHMf4m3HYmSZpPHBdPXHM=; b=tjbPTH1WzdS+slbtxGDtCAwhBAKZrWIWbWzW440Cq1vyUXdh9soAeXOkBDriJzNLskXaZjTb8UdG2XFfbSDFeoXke4GPbv2+OhshLITt1rv8pSvvvX9iC1swhElMAsXKf37kw4K6Pdm0kRt8jJrW5ZLMR4HwMeC3XDanubrkdd98E2nR0O56/RuBZtifYJLr209L/cVZPDlII9pAz6T5Euz7FXbyFogMUOq1x4mf7zIkK+lpGWxmE63wY+eJ7C37RBicqYrPVMUiaEaFVv6gU6shpnG1PzFvpYWBlff36NHA8Lbcrw59SzmmzLNz9BzMmV4RlxFhEeWZnGxIWbI18Q== Received: from SJ0PR06MB7423.namprd06.prod.outlook.com (2603:10b6:a03:323::17) by BYAPR06MB5237.namprd06.prod.outlook.com (2603:10b6:a03:d1::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.33; Tue, 22 Dec 2020 21:32:48 +0000 Received: from SJ0PR06MB7423.namprd06.prod.outlook.com ([fe80::d01f:2d7a:8095:7827]) by SJ0PR06MB7423.namprd06.prod.outlook.com ([fe80::d01f:2d7a:8095:7827%7]) with mapi id 15.20.3676.033; Tue, 22 Dec 2020 21:32:48 +0000 From: "Sideropoulos, Alexander" To: Li-Wen Hsu CC: "freebsd-git@freebsd.org" Subject: Re: Src repository is available on git.freebsd.org Thread-Topic: Src repository is available on git.freebsd.org Thread-Index: AQHW17fxDHXuVzsLaUK+BGam3YwMuqoC3QmAgACYqAD//6i+gA== Date: Tue, 22 Dec 2020 21:32:47 +0000 Message-ID: <56436ED9-31B3-4D3D-AAE3-12E9D3B83E29@netapp.com> References: <2432AD44-79AB-40B1-AD7A-00D9CB23CEDC@netapp.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/16.44.20121301 x-originating-ip: [216.240.19.104] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 24f55d9a-4fa8-40c0-0a9d-08d8a6c120bd x-ms-traffictypediagnostic: BYAPR06MB5237: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Tw2g3Nq5AD9CaiPYjHoH1NRrntzQBPKFL/54ZFeeA5f9+Ax2s+SeYR8L4cHtFBAucKthEyeBpK9jV5icJhD5cJ5BlSGuznx/AjACJ2dpByltqc7TOMpORzLZzg2cXqZ9DwTHskpI7T7fbV6D7NQR9oqPCT5TIdd9fiHun2iKgpTqW/nYGenWdrcImRi84gNtwCndgATEpG5pPkKVLWyJ4qxqlH63Sf7WUtKllgVSskDuVJlaGdjnQFCG/gMAigCPp43xUI5Kh9J5jpjjOnWWuCF4xjivxFYi9jTF/9gf1xducjo08/Unj3bmHd3Rp/xdvLjPD2zkhkx0W++4kzA+ND0ws+gYaznmZlFXeb3ZvY901cGbdbhBVGa8Kk256mI4tV661TKbRye0ks5hfJruAveeGZu6Ls6sQHf5kgDCW5QWX672nbYX/I/OWVVDDF9kWuZF37aPEp1zQwVRR4zobrEXCLnOuc/C2Hqls4CpkY7/7n2oKaPFv71Sz5cJjG7nxeOofjxaDlqXY42GcQhG8A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR06MB7423.namprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(136003)(366004)(396003)(39860400002)(346002)(71200400001)(966005)(316002)(33656002)(66476007)(66946007)(66556008)(8676002)(66446008)(4326008)(64756008)(8936002)(53546011)(76116006)(6512007)(86362001)(6506007)(450100002)(6916009)(5660300002)(83380400001)(36756003)(186003)(2616005)(478600001)(2906002)(66574015)(6486002)(26005)(45980500001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?utf-8?B?RlB6TFZObGpvRktKMFJuT2kvUXpXWldjQ2R2UHNock1wb29jRDhRcTJBeHBF?= =?utf-8?B?MS9OKzNXM3FySGlPc2E5cXdxTjVaSzBIZFdJcGFaeEF3Sk9DU3phR0JEWHlN?= =?utf-8?B?aE5EYmZMSG1Pdlp6czhvZW5nbnBjbmlmWkQ3ZVVEQVRPdUN0dlBLV24vWTJ0?= =?utf-8?B?czFoN0s1bEJ3RkpkMmlacU1pSGZJRU9IcjBxcTZmOUZkK3NKTkdIZTJyeDhl?= =?utf-8?B?S1Q3RnJCMnpOYkprOS95YnlTTVlTTW8xSGdaK3JjejdPcnhldjZURWEzRTEx?= =?utf-8?B?VDNFY1RjaGZMSXZUbGdNeTQ1VFZxM2xibEc4K3JRaTVqNndyRXlsNkNRL0VN?= =?utf-8?B?ZDdrNEpFdkJQSE9kYXlwdmEvQjhGVE1lMmtZU0I1aGdlN3hWRzNONUlpeDQy?= =?utf-8?B?Z0N4dVVBSERFL1hJcGZzMThJclJnOEZyMVVtTk14WDMyWFcyRDdlcy9lS1ky?= =?utf-8?B?SXlLVHh1cUJyUkN5Ui9tUk9paEVYTkg2RXR3Mm5TOWdEUndxYXNnQTR4VWZv?= =?utf-8?B?NCtpaGlheEtBY3UwZjB3Q3RwWG1kemh3MWp2dXpQaXpQc2RSN1RnUEk2TkYr?= =?utf-8?B?QlpOYzJ6WEFmMkxOQWE3d1c4NXNyeUswVFY0QzNwOS9WV0MrOGg4NDdDNVZn?= =?utf-8?B?a0QvV25wMEVkWGlPOGpOTHh4blV4bFJSSHpMVGNqWlFHeEpiMkxSejQzd1Fi?= =?utf-8?B?SWszY0RkY0swRE96NmRZVmNvWkhRSEtXSUROS0h1eW5Rdm1mYzhKUW9FZmYr?= =?utf-8?B?S1ZyaUd4a2VGcXQrdHNsbGdGUHFyclZaTEVYenVwVVVMS1ZZVjBSeEdINkVr?= =?utf-8?B?UzA3VDN0Ti9UZldFbmo5Yy9NZmdZZFNQTmpGSWs3bXp0K2UxbUk1cXlFUis4?= =?utf-8?B?WG5jTGlZSm9LMkp6LzhJRVlwcmx0a2Uvdzg1Qm5RWVdHaitUMnFRZ2UrM1Yr?= =?utf-8?B?OUtKU1hkOXhQYStDSjFid1R1alRDUVpXV1dJQlk0UEorMnRXWDNLY0tNblFO?= =?utf-8?B?WWZjVmdBM0lzUnkrb3JKdmMxa2UxeFNnUTV4OHpHd1NuTDVON3BCcklOL0lu?= =?utf-8?B?MXd3T3F1Unl0WGREb3JNdkFGUE4rRHN3WXVpZ0F2VUNydFJWVGVmci9keWpU?= =?utf-8?B?VkNLYzlESlRweU1abTdwOExyL0NOaG5XREJjc05ZWHBxYUZQUTRvVFV4Qllq?= =?utf-8?B?SU9PQ0dtc0M5TkRyeU9PRDZBb0R4aUpCcndXdjFISHMwNkVVeUVKVFU1VlUw?= =?utf-8?B?VkRjYW8yS08yR0E5aExRRWJjSi8xT0g5VTEybE05TFVwY21xV3Z6bjVVOUdj?= =?utf-8?Q?/7Pic0ZgB5p4v1T6eCV2se2Ew6ERVkph/C?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="utf-8" Content-ID: <2720EE341EC7254BA72ECA74156A4532@namprd06.prod.outlook.com> Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-OriginatorOrg: netapp.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR06MB7423.namprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24f55d9a-4fa8-40c0-0a9d-08d8a6c120bd X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Dec 2020 21:32:48.0207 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4b0911a0-929b-4715-944b-c03745165b3a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: xoBCpfTwONa3ozFVV2XYwqL7yZNTRS4axUkmlYnf9giCS2MQz0SEKPywV73UKuVLuxF+KScfyhvyakKY8ycpLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR06MB5237 X-Rspamd-Queue-Id: 4D0qLp0dlDz3C6v 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: Tue, 22 Dec 2020 21:32:50 -0000 Tm90IHN1cmUgYWJvdXQgdGhlIGNnaXQgY29uZmlnLg0KDQpJIGp1c3Qgbm90aWNlZCBpbiBteSBs b2NhbCBHaXRIdWIgbWlycm9yIHRoYXQgdGhlIG9sZCBub3RlcyByZWZzIHdhcyBtb3ZlZCB0byBj b21taXRzX21hc3Rlcl9sZWdhY3kuIE5vdCBzdXJlIGlmIHRoaXMgaXMgdGhlIHNhbWUgZm9yIGNn aXQuDQoNCi0tYXANCg0K77u/T24gMTIvMjIvMjAsIDEwOjQ1LCAiTGktV2VuIEhzdSIgPGx3aHN1 QGZyZWVic2Qub3JnPiB3cm90ZToNCg0KICAgIE5ldEFwcCBTZWN1cml0eSBXQVJOSU5HOiBUaGlz IGlzIGFuIGV4dGVybmFsIGVtYWlsLiBEbyBub3QgY2xpY2sgbGlua3Mgb3Igb3BlbiBhdHRhY2ht ZW50cyB1bmxlc3MgeW91IHJlY29nbml6ZSB0aGUgc2VuZGVyIGFuZCBrbm93IHRoZSBjb250ZW50 IGlzIHNhZmUuDQoNCg0KDQoNCiAgICBEbyB5b3UgbWVhbiBzZWFyY2ggbm90ZXMgb24gY2dpdC5m cmVlYnNkLm9yZz8gSSBuZWVkIHRvIGNoZWNrIGNnaXQncw0KICAgIGNvbmZpZ3VyYXRpb24gaWYg dGhpcyBpcyBwb3NzaWJsZS4gSSBhbSBoYXBweSB0byBlbmFibGUgaXQgaWYgaXQgaXMNCiAgICBh dmFpbGFibGUuIFBsZWFzZSBsZXQgbWUga25vdyBpZiB5b3Uga25vdyBob3cgdG8gZG8gaXQuDQoN CiAgICBCZXN0LA0KICAgIExpLVdlbg0KDQogICAgT24gV2VkLCBEZWMgMjMsIDIwMjAgYXQgMToz OCBBTSBTaWRlcm9wb3Vsb3MsIEFsZXhhbmRlcg0KICAgIDxBbGV4YW5kZXIuU2lkZXJvcG91bG9z QG5ldGFwcC5jb20+IHdyb3RlOg0KICAgID4NCiAgICA+IENvdWxkIHdlIGVuYWJsZSB0aGUgc2Vh cmNoIGZlYXR1cmUgdG8gaW5jbHVkZSB0aGUgbm90ZXMgc2VjdGlvbnM/IFRoYXQgd2F5IHdlIGNh biB1c2UgaXQgdG8gc3RpbGwgZmluZCBvbGRlciBjb21taXRzIGJ5IFNWTi4NCiAgICA+DQogICAg PiBUaGFua3MhDQogICAgPiAtLWFwDQogICAgPg0KICAgID4gT24gMTIvMjEvMjAsIDA4OjQwLCAi b3duZXItZnJlZWJzZC1naXRAZnJlZWJzZC5vcmcgb24gYmVoYWxmIG9mIExpLVdlbiBIc3UiIDxv d25lci1mcmVlYnNkLWdpdEBmcmVlYnNkLm9yZyBvbiBiZWhhbGYgb2YgbHdoc3VAZnJlZWJzZC5v cmc+IHdyb3RlOg0KICAgID4NCiAgICA+ICAgICBOZXRBcHAgU2VjdXJpdHkgV0FSTklORzogVGhp cyBpcyBhbiBleHRlcm5hbCBlbWFpbC4gRG8gbm90IGNsaWNrIGxpbmtzIG9yIG9wZW4gYXR0YWNo bWVudHMgdW5sZXNzIHlvdSByZWNvZ25pemUgdGhlIHNlbmRlciBhbmQga25vdyB0aGUgY29udGVu dCBpcyBzYWZlLg0KICAgID4NCiAgICA+DQogICAgPg0KICAgID4NCiAgICA+ICAgICBIZWxsbyBh bGwsDQogICAgPg0KICAgID4gICAgIFRoZSBzcmMgZ2l0IHJlcG9zaXRvcnkgaXMgYXZhaWxhYmxl IGluIHRoZSBvZmZpY2lhbCBnaXQgbWlycm9ycywNCiAgICA+ICAgICBnaXQuZnJlZWJzZC5vcmcs IGFuZCB0aGUgR2VvRE5TIGJlaGluZCBpdCBzaG91bGQgZGlyZWN0IHlvdSB0byB0aGUNCiAgICA+ ICAgICBjbG9zZXN0IG1pcnJvciBiYXNlZCBvbiB5b3VyIGxvY2F0aW9uLg0KICAgID4NCiAgICA+ ICAgICBGb3IgY2xvbmUsIHBsZWFzZSB1c2Ugb25lIG9mIHRoZSBmb2xsb3dpbmcgVVJMczoNCiAg ICA+DQogICAgPiAgICAgICAtIGh0dHBzOi8vZ2l0LmZyZWVic2Qub3JnL3NyYy5naXQNCiAgICA+ ICAgICAgIC0gc3NoOi8vYW5vbmdpdEBnaXQuZnJlZWJzZC5vcmcvc3JjLmdpdA0KICAgID4gICAg ICAgICAoYW5vbmdpdEBnaXQuZnJlZWJzZC5vcmc6c3JjLmdpdCkNCiAgICA+DQogICAgPiAgICAg QW5kIHRoZSB3ZWItYmFzZWQgcmVwb3NpdG9yeSBicm93c2VyIGlzIGF0Og0KICAgID4NCiAgICA+ ICAgICAgICAgaHR0cHM6Ly9jZ2l0LmZyZWVic2Qub3JnL3NyYy8NCiAgICA+DQogICAgPiAgICAg SW4gY2FzZSB5b3UgZGlkbid0IGtub3csIHRoZSBzdGF0dXMgb2Ygc3JjIGdpdCByZXBvc2l0b3J5 IG1pZ3JhdGlvbiBpcyBhdA0KICAgID4NCiAgICA+ICAgICAgICAgaHR0cHM6Ly93aWtpLmZyZWVi c2Qub3JnL2dpdA0KICAgID4NCiAgICA+ICAgICBXZSdyZSBzdGlsbCB3b3JraW5nIG9uIHNvbWUg ZmluYWwgYml0cyBiZWZvcmUgZW5hYmxpbmcgcHVzaCB0byB0aGUgc3JjDQogICAgPiAgICAgcmVw b3NpdG9yeSwgYW5kIHRoZXJlIHdpbGwgYmUgYW5vdGhlciBhbm5vdW5jZW1lbnQgYWZ0ZXIgdGhl IG1pZ3JhdGlvbg0KICAgID4gICAgIGlzIGRvbmUuDQogICAgPg0KICAgID4gICAgIEJlc3QsDQog ICAgPiAgICAgTGktV2VuDQogICAgPiAgICAgX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18NCiAgICA+ICAgICBmcmVlYnNkLWdpdEBmcmVlYnNkLm9yZyBtYWls aW5nIGxpc3QNCiAgICA+ICAgICBodHRwczovL2xpc3RzLmZyZWVic2Qub3JnL21haWxtYW4vbGlz dGluZm8vZnJlZWJzZC1naXQNCiAgICA+ICAgICBUbyB1bnN1YnNjcmliZSwgc2VuZCBhbnkgbWFp bCB0byAiZnJlZWJzZC1naXQtdW5zdWJzY3JpYmVAZnJlZWJzZC5vcmciDQogICAgPg0KDQo= From owner-freebsd-git@freebsd.org Tue Dec 22 21:51:44 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 4EA834CA274 for ; Tue, 22 Dec 2020 21:51:44 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (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 4D0qmb4fQNz3DgF for ; Tue, 22 Dec 2020 21:51:43 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: by mail-pg1-x535.google.com with SMTP id p18so9234481pgm.11 for ; Tue, 22 Dec 2020 13:51:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iitbombay-org.20150623.gappssmtp.com; s=20150623; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=NIrkYb9npIAaoOtntnI6QT4Yw1c7sv0B1b43hEqfS1Q=; b=Ey6Zuh+m8fRqdFFEHXbSUIIIiuyU0A4SekqfmuVKjiVOCWdarNczR3kpTrX/9Vo3GK q8esivyOON88ZIxFjVrni5Gw6noJo9vZ9r1ef2KysrEqDBYdHDwrOpQZYLXFGIhaiqXh IjZ0VIiS2YdxnUkTX28fXuaWbnmt8mKYAzzI9XRT4LUCEHWbNDEKKOThsyMKN5lSkswh fbqXoGolVE5mv7ecGf7wKJrZym28Q8NLRngHBAEFIuJGWuJtGt7W638Pgx2f2PS6N2Mw 99SCDwb+eCkhD2v0YGMN1dwa9TYnIeE9N3JMVtCVfnPqVKN4/MpfNirshnVv3EsFjDTB A8+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=NIrkYb9npIAaoOtntnI6QT4Yw1c7sv0B1b43hEqfS1Q=; b=H5pcj9mXPAjU7wi67YeJGDC56i3/PFFyBt046bU0l5/QssMo5flVym0kIcXE8ArSUg Rs5vAH8fh4p0Yvl4CkiFlOt4JH77lDdLE6fJztSr7MgSsQ/B4e6VtSXUZ6JuFfpKAAMu QHupsEoyb/x2Hscz/6ha0Pzwb3ssSOSFEuhgYXznSe+IhHWLQdGqGaZYY97/FAMpTYn2 0fZun1gWcARVc0yiUpi19UvYQVhzBOEhFNf5XR4rlbRiBx8JbhzFS037zc4bY6OqfFMP 3F4cEpQeI81g5JpqSVRlXZvnEiTAJkhXuvVoFWRLnqet56F5y3ZjFnGyKk17Bqwi/xpL iaPg== X-Gm-Message-State: AOAM530gkejqDpedxXTFYBHfd9JPfRmCT6MEpYSIh1S4xWAIqrzQK6j7 CQVw+XU6Z85MVef3h6m7KrLD9w== X-Google-Smtp-Source: ABdhPJyKK8cNT/Dldvxbp9tLW5KHe0Kl/oG6ASsdF1UV/TeBsU8BhAMu0eDoSYZuLWRWG/LK5zUgJA== X-Received: by 2002:a63:c441:: with SMTP id m1mr13572767pgg.353.1608673902379; Tue, 22 Dec 2020 13:51:42 -0800 (PST) Received: from [192.168.1.113] (172-125-77-130.lightspeed.sntcca.sbcglobal.net. [172.125.77.130]) by smtp.gmail.com with ESMTPSA id q23sm21460781pgm.89.2020.12.22.13.51.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Dec 2020 13:51:41 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: Src repository is available on git.freebsd.org From: Bakul Shah In-Reply-To: Date: Tue, 22 Dec 2020 13:51:39 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: <1527634C-4E31-4325-BB93-BDFF0C8ADB8C@iitbombay.org> References: To: Li-Wen Hsu X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4D0qmb4fQNz3DgF X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=iitbombay-org.20150623.gappssmtp.com header.s=20150623 header.b=Ey6Zuh+m; dmarc=none; spf=pass (mx1.freebsd.org: domain of bakul@iitbombay.org designates 2607:f8b0:4864:20::535 as permitted sender) smtp.mailfrom=bakul@iitbombay.org X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[iitbombay-org.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::535:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[iitbombay-org.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[bakul]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[iitbombay.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::535:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::535:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 21:51:44 -0000 I have been tracking cgit-beta.freebsd.org since September. What is the process for switching over to git.freebsd.org? I thought there were instructions for that but I can't find them any more! Thanks. > On Dec 21, 2020, at 8:39 AM, Li-Wen Hsu wrote: > > Hello all, > > The src git repository is available in the official git mirrors, > git.freebsd.org, and the GeoDNS behind it should direct you to the > closest mirror based on your location. > > For clone, please use one of the following URLs: > > - https://git.freebsd.org/src.git > - ssh://anongit@git.freebsd.org/src.git > (anongit@git.freebsd.org:src.git) > > And the web-based repository browser is at: > > https://cgit.freebsd.org/src/ > > In case you didn't know, the status of src git repository migration is at > > https://wiki.freebsd.org/git > > We're still working on some final bits before enabling push to the src > repository, and there will be another announcement after the migration > is done. > > Best, > Li-Wen > _______________________________________________ > 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 Tue Dec 22 22:03:45 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 23BEC4CAD92 for ; Tue, 22 Dec 2020 22:03:45 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0r2S5t7Xz3FVZ for ; Tue, 22 Dec 2020 22:03:44 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 0BMM3aFQ024985; Tue, 22 Dec 2020 22:03:36 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 0BMM3awM024984; Tue, 22 Dec 2020 14:03:36 -0800 (PST) (envelope-from david) Date: Tue, 22 Dec 2020 14:03:36 -0800 From: David Wolfskill To: Bakul Shah Cc: freebsd-git@freebsd.org Subject: Re: Src repository is available on git.freebsd.org Message-ID: References: <1527634C-4E31-4325-BB93-BDFF0C8ADB8C@iitbombay.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7cgiG+8dlya+xwO4" Content-Disposition: inline In-Reply-To: <1527634C-4E31-4325-BB93-BDFF0C8ADB8C@iitbombay.org> X-Rspamd-Queue-Id: 4D0r2S5t7Xz3FVZ 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: Tue, 22 Dec 2020 22:03:45 -0000 --7cgiG+8dlya+xwO4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 22, 2020 at 01:51:39PM -0800, Bakul Shah wrote: > I have been tracking cgit-beta.freebsd.org since September. > What is the process for switching over to git.freebsd.org? > I thought there were instructions for that but I can't find them any more! > Thanks. > .... I aqssumed(!) that the hashes would be different, so I moved aside the repo I had from cgit-beta and cloned a new one (from git.freebsd/org), then removed the old one once I was satisfied that the new one was OK. A couple of caveats: * I'm not a committer; I merely use the repo a a "source of truth" for updating machines locally, and I never have any commits to be pushed anywhere. * I actually used "git clone --mirror" (as noted in https://www.catwhisker.org/~david/FreeBSD/repo-sync.html); I then clone from that mirror to make working copies. There are certainly other ways to accomplish this; some may be better for some folks. Peace, david --=20 David H. Wolfskill david@catwhisker.org "Dismissing reality doesn't make it go away." - Rajiv Shah, Rockefeller Foundation president See https://www.catwhisker.org/~david/publickey.gpg for my public key. --7cgiG+8dlya+xwO4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/ibThfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmI1wf/RwGHMzosT7kusBOII70FJwBaG7nWFrWvC3FCdKyai2DXFAbjXJMHTI12 iWMYE6Ec4ynJktZCqgTIYSXIKfGMbM+o1t1Mq21fGZgFg7HRCzeqVXSprNyfqZzO nVFyT1qPqh7mu0yFXOpjFdKnaFDM6YiBkxiI4xkDyRvMB53avY9aZUiPcmXimHky Zmjzy7rfosrNhLwBSJt3J11GbgKX4kelGOb0gYm0afOQ+/GZpqAcYezyl2Csv976 IspLQ95eGu8VS9b/IPskKCAjdpg+rkv3x6j91EK/AJCtunA9heOngA+AfaW4PJgi QLed8+c7m4+w8YbF6oT0unrssbCQ5g== =kr2l -----END PGP SIGNATURE----- --7cgiG+8dlya+xwO4-- From owner-freebsd-git@freebsd.org Tue Dec 22 22:18: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 0E9CC4CAF16 for ; Tue, 22 Dec 2020 22:18:15 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) (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 4D0rMB0cF2z3G0l for ; Tue, 22 Dec 2020 22:18:13 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: by mail-pg1-x530.google.com with SMTP id i5so1215456pgo.1 for ; Tue, 22 Dec 2020 14:18:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iitbombay-org.20150623.gappssmtp.com; s=20150623; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ahr+VYjHKQ0iU4+suT5dUZiu5MzYyEWyT0FMmmMQBmo=; b=bwkhbhs64AE4HBAeJ3LHcdthAO5o/k18xZoSMuZgD8TmFudEXZ8GBh8lEqfdXB0i7r ZnFdWRjPWYDJjoBlkm6Ml4xkK/fyclVenkcpcLM25i0/yizYM+FDuYc4a2UPpefbNn+I dVABLqXTTXdvSgaXUsZ64pU0cvKE046+TKgKBAWubO8p50vjeEw/cygZZF4pl6K/uIOF c/2QeQlNQ0Ob7DtPZc5f6aecut9AusNu6Ii1q99bB8h34aDeURd1Glw9BW0DO1jPdp1I G+HN+8zocNFXs76zJYu2QebJ6o2emIxAH9uF3fkIOu9gLiHoBnd3R7/7/iIjCQkynNxi s5aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ahr+VYjHKQ0iU4+suT5dUZiu5MzYyEWyT0FMmmMQBmo=; b=GoBrW/mQdOATAG0wjEBv+cDHEo1iuM7InF54nmjhZtiuk/qpwmNoDs1Pf3rAJbrhwD vN61fd7ePCFNV34TXakZTxPt8TCPB8X8fXbCeG4LxtB5GO+6U8afAZewGstGqj351lMP rJ4VH1RAeRRA5LJooJhQ3xkhRh5sCbgazvaB0yt31t6sJXXh79d/YsAIoeDCGe8ZMmG2 Kcj6d8v0OGn4iL4TNG2P9o1lHt88GfyzNebjcRQdvAZ/n9vudnYUoPld6s6i9s5zTFrB J76XFNRoJLoqLTPQDWn+prmr4wxiMYTz6tBdb8/57zMj5gZmP71FGl/vsSj2ciPkUh3K VxSQ== X-Gm-Message-State: AOAM533/82PDTN9MBgLfpoZL7FI26cGUHh5yE7Xl/pzSGVOM9DN43Tll LaBmad4nR1SAmedM1Uzymrt2GA== X-Google-Smtp-Source: ABdhPJzx3Ka5oRZuhLsETRCd+XiAlwhTA50PgvLF8DHv9IiHBFVzGMMaEBGVUF91XD8OxlMACy1Rtw== X-Received: by 2002:aa7:9e52:0:b029:19e:6c32:30d4 with SMTP id z18-20020aa79e520000b029019e6c3230d4mr21203396pfq.21.1608675492795; Tue, 22 Dec 2020 14:18:12 -0800 (PST) Received: from [192.168.1.113] (172-125-77-130.lightspeed.sntcca.sbcglobal.net. [172.125.77.130]) by smtp.gmail.com with ESMTPSA id v15sm18091451pfn.217.2020.12.22.14.18.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Dec 2020 14:18:11 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: Src repository is available on git.freebsd.org From: Bakul Shah In-Reply-To: Date: Tue, 22 Dec 2020 14:18:10 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <0C3B8F33-851B-4513-815A-09F33EF96DE8@iitbombay.org> References: <1527634C-4E31-4325-BB93-BDFF0C8ADB8C@iitbombay.org> To: David Wolfskill X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4D0rMB0cF2z3G0l X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=iitbombay-org.20150623.gappssmtp.com header.s=20150623 header.b=bwkhbhs6; dmarc=none; spf=pass (mx1.freebsd.org: domain of bakul@iitbombay.org designates 2607:f8b0:4864:20::530 as permitted sender) smtp.mailfrom=bakul@iitbombay.org X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[iitbombay-org.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::530:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[iitbombay-org.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[bakul]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[iitbombay.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::530:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::530:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 22:18:15 -0000 On Dec 22, 2020, at 2:03 PM, David Wolfskill = wrote: >=20 > On Tue, Dec 22, 2020 at 01:51:39PM -0800, Bakul Shah wrote: >> I have been tracking cgit-beta.freebsd.org since September. >> What is the process for switching over to git.freebsd.org? >> I thought there were instructions for that but I can't find them any = more! >> Thanks. >> .... >=20 > I aqssumed(!) that the hashes would be different, so I moved aside the > repo I had from cgit-beta and cloned a new one (from git.freebsd/org), > then removed the old one once I was satisfied that the new one was OK. Forgot to add that I wanted to switch over *without* blowing away 3.2GB of local git bits. Hashes shouldn't change unless something major got redone. Comparing hashes from my local repo with = https://cgit.freebsd.org/src/commit/ I see they are the same. > A couple of caveats: > * I'm not a committer; I merely use the repo a a "source of truth" for > updating machines locally, and I never have any commits to be pushed > anywhere. Same here. >=20 > * I actually used "git clone --mirror" (as noted in > https://www.catwhisker.org/~david/FreeBSD/repo-sync.html); I then > clone from that mirror to make working copies. There are certainly > other ways to accomplish this; some may be better for some folks. I don't quite do this because I am tracking -current and -stable locally and am using worktrees so as to avoid keeping multiple local git copies. AFAIK a mirror would blow away any local changes. From owner-freebsd-git@freebsd.org Wed Dec 23 02:07:43 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 A72D54CF5B6 for ; Wed, 23 Dec 2020 02:07:43 +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 4D0xRz4DCNz3hQB for ; Wed, 23 Dec 2020 02:07:43 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 8EF414CF5B5; Wed, 23 Dec 2020 02:07:43 +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 8D8674CF42F for ; Wed, 23 Dec 2020 02:07:43 +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 4D0xRz3L6sz3h51; Wed, 23 Dec 2020 02:07:43 +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 4F94D20BD1; Wed, 23 Dec 2020 02:07:43 +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) 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 4D0xRy31bxz1ZC3; Wed, 23 Dec 2020 02:07:42 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4D0xRx0ksqz5xbK; Wed, 23 Dec 2020 02:07:40 +0000 (UTC) From: "Philip Paeps" To: "Warner Losh" Cc: git@freebsd.org Subject: Re: Imminent tzdata import (was: Re: Vendor Imports in Subversion) Date: Wed, 23 Dec 2020 10:07:37 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5757) Message-ID: In-Reply-To: <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> References: <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; format=flowed 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, 23 Dec 2020 02:07:43 -0000 On 2020-12-10 00:18:23 (+0800), Philip Paeps wrote: > If the tzdata release does end up only happening after the 19th ... > well ... we'll attack that dragon when it shows its tail. :-) > > I'll keep git@ posted whatever happens. tzdata 2020e was finally released this morning. It looks like src is still being migrated. I'll do a test vendor import in the test repository Li-Wen set up and merge to the real repository when 1) it's there and 2) I'm confident that I'm not setting anything on fire. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Wed Dec 23 02:21: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 9537C4CF99C for ; Wed, 23 Dec 2020 02:21:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D0xlk2gwKz3hrL for ; Wed, 23 Dec 2020 02:21:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 5BDB44CF8A8; Wed, 23 Dec 2020 02:21:22 +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 5B8BC4CF46A for ; Wed, 23 Dec 2020 02:21:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (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 4D0xlk1z54z3hrK for ; Wed, 23 Dec 2020 02:21:21 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82e.google.com with SMTP id z9so10426190qtn.4 for ; Tue, 22 Dec 2020 18:21:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=4E4D9fFMX1pKY92ZUe4OeQGgFRkn6MIRSdnoc2VC+fA=; b=X3QVpbngTycSIK5mCJVgPorv1ksBvbst949gsWIvM5YNPz6LZgUTqWKNu9uU0cixDi nU8nXZ/p0dj4U884/qzSJnNZL3/gn/6ZkC3pWSyDNxYs/4T5NyH91ax8Oyc1FrAZH8sv cBmNqfgT3aCgF8+EBFw/0kdxe3sxPPNShJtcmQuy43vqK2uh1izzPeWf7eQ/4sqY2trj JzRdDIqKOs7qpKaHw9qp6JRVTWnUhxLtByXyYgmofYVaXfjlQsqejurqRZtWbQMGyQ5J RJNWfzaPstPOPnjMQgwoguoZbTqSLyBHJpye4AmvwazE/hhRcxl3at91pUATiq50a4Hg xy4w== 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=4E4D9fFMX1pKY92ZUe4OeQGgFRkn6MIRSdnoc2VC+fA=; b=OU6YNf8pBnh+6AmFK/7gNLWpKlnmbdeLhtBCbUPRqHWlqW20JbyhtMdeby6MXYnvpb ynsKK6J5v5G29Nxz0SGmBQWA3AkbAJdFDFCuw1H70gf+Afx4sD2mEimLU6Vfh1hVCjXJ ih031wGjVZWOXbG86U8/C3jbw1/r6dbUlL1C2Xx9hKnfwrwEYbSZrpxAdv5VZ7sJFFS8 xG8Zq1sdPBrXopXwuM3asiVtSS1PpvhMfPrB55tnqlmIrgpCeLEb4K1cDgtF8ZQ1Uxxm D+cUsXEkGBt/xS3B8oaGpqq+Rau/U05cOVEyPbfWzf+3T4YNb6IId1rdAsr/HBbUyb1L eXzA== X-Gm-Message-State: AOAM533VF1hTQPRe+0evDvbbvBiaLQxi0/X8T+U8Lr5IMad3+Lmt52O1 i528T7fXwu6Gb97Me+fNVEGPgsbig+5O7Id/1kZhzT2olbgJfw== X-Google-Smtp-Source: ABdhPJy4eWfhpFimprBwThVe18o0gp/CcdJC7cqO1z2lU3AnKTs0jszJiZm/HKOf1Yd4B+AuB/G7FciElCkmtaJ1yZ0= X-Received: by 2002:ac8:51d8:: with SMTP id d24mr23252880qtn.73.1608690080589; Tue, 22 Dec 2020 18:21:20 -0800 (PST) MIME-Version: 1.0 References: <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> In-Reply-To: From: Warner Losh Date: Tue, 22 Dec 2020 19:21:08 -0700 Message-ID: Subject: Re: Imminent tzdata import (was: Re: Vendor Imports in Subversion) To: Philip Paeps Cc: git@freebsd.org X-Rspamd-Queue-Id: 4D0xlk1z54z3hrK 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" 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, 23 Dec 2020 02:21:22 -0000 On Tue, Dec 22, 2020, 7:07 PM Philip Paeps wrote: > On 2020-12-10 00:18:23 (+0800), Philip Paeps wrote: > > If the tzdata release does end up only happening after the 19th ... > > well ... we'll attack that dragon when it shows its tail. :-) > > > > I'll keep git@ posted whatever happens. > > tzdata 2020e was finally released this morning. > > It looks like src is still being migrated. I'll do a test vendor import > in the test repository Li-Wen set up and merge to the real repository > when 1) it's there and 2) I'm confident that I'm not setting anything on > fire. > Great. I'm happy to review changes. We are like a day away from opening it up. Warner Philip > > -- > Philip Paeps > Senior Reality Engineer > Alternative Enterprises > From owner-freebsd-git@freebsd.org Wed Dec 23 10:28:50 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 C644B4BA722 for ; Wed, 23 Dec 2020 10:28:50 +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 4D18ZB46rNz4dr9; Wed, 23 Dec 2020 10:28:50 +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 0BNASfXQ051846 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 23 Dec 2020 11:28:42 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 23 Dec 2020 11:28:41 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: "Sideropoulos, Alexander" Cc: Li-Wen Hsu , "freebsd-git@freebsd.org" Subject: Re: Src repository is available on git.freebsd.org Message-ID: References: <2432AD44-79AB-40B1-AD7A-00D9CB23CEDC@netapp.com> <56436ED9-31B3-4D3D-AAE3-12E9D3B83E29@netapp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <56436ED9-31B3-4D3D-AAE3-12E9D3B83E29@netapp.com> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D18ZB46rNz4dr9 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, 23 Dec 2020 10:28:50 -0000 On Tue, 2020-12-22 at 21:32:47 +0000, Sideropoulos, Alexander wrote: >Not sure about the cgit config. > >I just noticed in my local GitHub mirror that the old notes refs was moved to commits_master_legacy. Not sure if this is the same for cgit. Yeah, sorry, that will be undone again in a day or two. We will provide a legacy repo for the old hashes and old notes that you can in the future add as a 2nd remote, if you have need to look up historical things. Going forward, the non-legacy Github repos will have only the new stuff and only the subset that is interesting to _users_, not _developers_. As a FreeBSD developer, we expect people to clone from our infra, not Github. Stay tuned! Uli` From owner-freebsd-git@freebsd.org Wed Dec 23 10:34:17 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 234AA4BA3B4 for ; Wed, 23 Dec 2020 10:34:17 +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 4D18hS513Jz4fWY for ; Wed, 23 Dec 2020 10:34:16 +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 0BNAY8ct052253 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 23 Dec 2020 11:34:10 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 23 Dec 2020 11:34:08 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Bakul Shah Cc: David Wolfskill , freebsd-git@freebsd.org Subject: Re: Src repository is available on git.freebsd.org Message-ID: References: <1527634C-4E31-4325-BB93-BDFF0C8ADB8C@iitbombay.org> <0C3B8F33-851B-4513-815A-09F33EF96DE8@iitbombay.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <0C3B8F33-851B-4513-815A-09F33EF96DE8@iitbombay.org> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D18hS513Jz4fWY X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; 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: Wed, 23 Dec 2020 10:34:17 -0000 On Tue, 2020-12-22 at 14:18:10 -0800, Bakul Shah wrote: >On Dec 22, 2020, at 2:03 PM, David Wolfskill wrote: >> >> On Tue, Dec 22, 2020 at 01:51:39PM -0800, Bakul Shah wrote: >>> I have been tracking cgit-beta.freebsd.org since September. >>> What is the process for switching over to git.freebsd.org? >>> I thought there were instructions for that but I can't find them any more! >>> Thanks. >>> .... >> >> I aqssumed(!) that the hashes would be different, so I moved aside the >> repo I had from cgit-beta and cloned a new one (from git.freebsd/org), >> then removed the old one once I was satisfied that the new one was OK. > >Forgot to add that I wanted to switch over *without* blowing away 3.2GB >of local git bits. Hashes shouldn't change unless something major got >redone. Comparing hashes from my local repo with https://cgit.freebsd.org/src/commit/ >I see they are the same. 3.2GB sounds wrong, it looks like you have the new hashes and the old hashes and no GC run in between. This is expected and would fix itself over time, you might want to compress things down to 1.6GB however, using: git gc --prune=now BEWARE: that you don't have any loose refs that you still might need later on. If all your changes are in regular branches and you didn't go wild with rebase -i or anything, then this should be safe. To not re-download everything, use --reference to point to an existing clone, that is: git clone --reference /path/to/old/clone https://git.FreeBSD.org/src.git /path/to/new/clone You could also: git init git add remote .... cp the objects/* files over to the new repo git fetch >> A couple of caveats: >> * I'm not a committer; I merely use the repo a a "source of truth" for >> updating machines locally, and I never have any commits to be pushed >> anywhere. > >Same here. > >> >> * I actually used "git clone --mirror" (as noted in >> https://www.catwhisker.org/~david/FreeBSD/repo-sync.html); I then >> clone from that mirror to make working copies. There are certainly >> other ways to accomplish this; some may be better for some folks. > >I don't quite do this because I am tracking -current and -stable locally >and am using worktrees so as to avoid keeping multiple local git copies. >AFAIK a mirror would blow away any local changes. I think you're right, for that a single --bare clone (not --mirror) plus workspaces and local branches sounds more applicable. Cheers Uli From owner-freebsd-git@freebsd.org Wed Dec 23 12:35:17 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 ADE6B4BE51C for ; Wed, 23 Dec 2020 12:35:17 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 4D1CN41XS1z4nyp for ; Wed, 23 Dec 2020 12:35:16 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qt1-x831.google.com with SMTP id a6so11113035qtw.6 for ; Wed, 23 Dec 2020 04:35:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=c42gstSQVkG2Hnk9EZNMjmf8nNHvhI45nVyiQrVPI54=; b=KGYM79+8z3lxS7rU7XkIYVOtJpy/WsHSTpNR9KTKasyOLTGhmxG1U4go31G4t3GxWH S3EqcoR6rYMSYjKGI0PBPlL0ta43WrVbJpqaCpnxn+iqOcpsw8LAdPfezATlIBTxwTTU ifpJKT2FQMyJHgw46OIJGf83KifI7kXcXQVkbyeAir8YHGFKW3+TCqtSlnd2TypEgKwF ALVaziz34lAE13tP4cp/CBw8egXSfUVeM+jmH13VmEznIOy0O+2pVg4buOLUdGeBptvF naK20SwRRjKKAhDvxmr/x75qUZD03Hk1qLCGGSRWrqXL/uZGtqA76JPMhppAvXnJDTh3 Q3ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language:content-transfer-encoding; bh=c42gstSQVkG2Hnk9EZNMjmf8nNHvhI45nVyiQrVPI54=; b=oP5icwQdzy5wFFK1H3DFjD3d18MUP4IllT/yMaxWCgpLhOeBN638yuidgu0aMKLEbU +qIlkUxtxNgV56pTsx413CUAl1o364/lFI2jCWrbDcFY9IOoUj0BEsg6ldUc3Sru+g+M EaWv2pswgy9qX6SYkwlNKz9H4xxw52r2YJMQbcOhlqBpVlWLjAixVpyTbz7sPq5oZICz H95niCPUWQ90bQTjunij0td2x0zbL1GX+HoVENevOUW16j+fQa9Wl6+89khXjwsB/Zds 1Z4zwyEqA7y/O5kQB0K5uIsTulZSFXK8Z4P0hdCaO5FuDVYEfWOYP1iguHbrciMEPlJG d/1g== X-Gm-Message-State: AOAM530OOerrMEqAWHzQVoOtYwdyrqqcHPMUzlSuF/5iQK81boG2SNFq HSHJ8NYSi9Nu6TMPFgywbkN9HWLPrlrayQ== X-Google-Smtp-Source: ABdhPJxFRcOYr4n6fAeRNa5tnETOErsmWlNQs8jxgZeVw9w0JT6xJuWrJEmmbcVTX8Ni72J3LqZBEg== X-Received: by 2002:ac8:6947:: with SMTP id n7mr25738562qtr.83.1608726915066; Wed, 23 Dec 2020 04:35:15 -0800 (PST) Received: from mbp.home (200-12-5-188.rev.tribenet.com.br. [200.12.5.188]) by smtp.gmail.com with ESMTPSA id 184sm5884126qkg.92.2020.12.23.04.35.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Dec 2020 04:35:14 -0800 (PST) Sender: Renato Botelho To: freebsd-git@freebsd.org From: Renato Botelho Subject: Migrating a merge based project to new tree Message-ID: Date: Wed, 23 Dec 2020 09:35:11 -0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D1CN41XS1z4nyp X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=KGYM79+8; dmarc=none; spf=pass (mx1.freebsd.org: domain of gargabsd@gmail.com designates 2607:f8b0:4864:20::831 as permitted sender) smtp.mailfrom=gargabsd@gmail.com X-Spamd-Result: default: False [-3.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.998]; FORGED_SENDER(0.30)[garga@FreeBSD.org,gargabsd@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[garga@FreeBSD.org,gargabsd@gmail.com]; TAGGED_FROM(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::831:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[FreeBSD.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::831:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::831:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2020 12:35:17 -0000 I'm working to migrate a downstream stable/12 based tree to the new git repository following instructions from [1]. I did a final merge from legacy repository and made sure top commits on both branches point to the same tree: # git show -s --format=%T f4d0bc6aa6b9 98db7229803a5c93e3132bc661201f204487eee9 # git show -s --format=%T f262e04c92d7 98db7229803a5c93e3132bc661201f204487eee9 When I try to merge new one git refuses to merge due to unrelated histories. Should I use --allow-unrelated-histories parameter? [1] https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree -- Renato Botelho From owner-freebsd-git@freebsd.org Wed Dec 23 12:54: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 DA3594BEA25; Wed, 23 Dec 2020 12:54:03 +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 4D1Cnl3JKRz4q55; Wed, 23 Dec 2020 12:54:03 +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 0BNCs036062333 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 23 Dec 2020 13:54:00 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 23 Dec 2020 13:54:00 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Miroslav Lachman <000.fbsd@quip.cz> Cc: freebsd-current@freebsd.org, freebsd-git@freebsd.org Subject: Re: git tools for building in base? Message-ID: Mail-Followup-To: Miroslav Lachman <000.fbsd@quip.cz>, freebsd-current@freebsd.org, freebsd-git@freebsd.org References: <20201125055425.01AA628417@elsa.codelab.cz> <10f7b800-b015-2a80-b741-4f7db03bf6eb@quip.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <10f7b800-b015-2a80-b741-4f7db03bf6eb@quip.cz> User-Agent: Mutt/2.0.2 (2020-11-20) X-Rspamd-Queue-Id: 4D1Cnl3JKRz4q55 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:39540, ipnet:2a05:fc87::/32, country:CH] 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, 23 Dec 2020 12:54:03 -0000 On Fri, 2020-12-18 at 14:02:08 +0100, Miroslav Lachman wrote: >On 25/11/2020 06:54, Thomas Mueller wrote: > >> NetBSD users face a similar problem with their upcoming switch from cvs to hg (Mercurial). > >Do anybody have a link to some documents stating why FreeBSD chose Git >and why NetBSD chose Mercurial? I am using both tools at $WORK, I am >just curious what leads to these decisions. No documents, but git was simply more mature back when I started this effort a decade ago and it is and was more popular (with all the added side effects that has). I was (and am) only an occasional user of hg and even git, so familiarity wasn't quite an argument back then, though the git storage model is much nicer for the required history re-writing. In the early days I pushed to googlecode and bitbucket as well, you can see that here https://svnweb.freebsd.org/base/user/uqs/git_conv/git_conv?r1=251786&r2=251785&pathrev=251786 Not visible are the trials I ran with git-svn and hg, both of which only could handle the single head branch, but not all the other branching craziness that was and is going on in the repo. I don't fully recall, but I think that the hg conversion was slow and the disk space needed was quite a bit more than git. So in summary, I guess it can be summed up as: - there was no svn-all-fast-export for hg back then - even bitbucket switched from hg to git - history rewriting is easier in git, see e.g. this file for the stuff that's required to make the cvs2svn things a bit nicer: https://github.com/freebsd/git_conv/blob/master/fix_bogus_tags.sh Granted, now that the heavy lifting is done, one could probably do a git2hg transition, as the history is now pretty sane and should be compatible to the hg model. But lack of anyone (to my knowledge?) providing a hg copy of FreeBSD all these years tells me that there's simply no demand for it. There's https://wiki.freebsd.org/LocalMercurial from 2008 but that skips converting from r1. Of interest is also https://www.mercurial-scm.org/pipermail/mercurial/2019-May/051240.html which looks like the size issues with hg haven't been fixed yet. It also seems that http://hg-beta.freebsd.org/base/branches has the user-servicable branches only, but not vendor. So it's not usable as a source-of-truth for the project. I would encourage everyone *not* to base their hg work off of SVN but take the soon-official git repo instead. If you wanted to do this right off of SVN, here's just one of dozens of quirks: https://github.com/freebsd/git_conv/blob/master/revisions.md You've been warned ;] Cheers Uli From owner-freebsd-git@freebsd.org Wed Dec 23 14:15:20 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 8B8A54C0345 for ; Wed, 23 Dec 2020 14:15:20 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) (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 4D1FbW6J5Cz4vnV for ; Wed, 23 Dec 2020 14:15:19 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt1-x82f.google.com with SMTP id u21so11278857qtw.11 for ; Wed, 23 Dec 2020 06:15:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ATvDOdIA4HLOEzh6qqBwh7FsZvKF+5vsS9zlMjKqTBQ=; b=dfviS9JlUsPqwqU8n5KH3TPFS3amUjvwcmxXaBmdfE7638wqr6eKMKGD7bsVFL32WE WPpDa+39B0gjrry50nc+MTZQqXC7CO7kEgaKolzCbw0rEHyj1cKDAE2eubHL7iKDdARZ xpUzlCxQ0JE30l0tpahl5eUoa7TCEuzmBeuMT4iXgb3iFQPPep6eC8Op3HycjEmX8d1L 1m7euB0Tnzi0UkDzZgicmrcjB+FGINHVvBmkM7KUi1bFm1nFBkv08GoRgWd+iOTOOthU EkfIlTl647mJsfKQUMyOCfNjYjy47SDtcnRdQgp3Q+rQTZCB8wy6n4ERAmdljFfbdt8e 0G6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ATvDOdIA4HLOEzh6qqBwh7FsZvKF+5vsS9zlMjKqTBQ=; b=fXDMhOqWZxs2UY8q5ajkOUIOqK2Qs9opFR9usLhwf6UCzUv4/m7MkudS9e98LvChpt xPKb911kSjcGa0O94eWOJNfhHvvA4ADxWMV4lT3kS87gAsHKLMxXr9ZIqF6sPSNXCHks SaQMStkcfbIiljPNx6WhjYUKovbaBOmk4inPjm/UlLlIpcuDaw9GX1KVnoVCZi/3fhj9 Va2qm+y5gRcFBxwaGfpn9fd23zhHZRITJY0wNrKri9q3UKHAKzX3JqBmjsek1CLyLjxC Wvc2sYBcHT/aB92YfqXaMC9Fq8DqDPeJjMC9UAACmj/P9HyWk8hKk/joZ+wy0JdM6xeR XoGQ== X-Gm-Message-State: AOAM5337LWTen9lPeHhTC8srJzCepQWq2T6vTfQ3plnOziqpLS24IjST F9QfL4h1rsMdt1MNUWGWp8ge7v2Xv3IwjhQJ X-Google-Smtp-Source: ABdhPJzUU1p9vzT+MXz1QtE0TUh/XV3xctWS5i7Ku+1F3Q4GX+b5vtmM0am0Wg2uXIMc1oEZuJPC9A== X-Received: by 2002:aed:2070:: with SMTP id 103mr18834672qta.287.1608732918598; Wed, 23 Dec 2020 06:15:18 -0800 (PST) Received: from mutt-hbsd (pool-100-16-222-53.bltmmd.fios.verizon.net. [100.16.222.53]) by smtp.gmail.com with ESMTPSA id v137sm15573447qka.110.2020.12.23.06.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Dec 2020 06:15:17 -0800 (PST) Date: Wed, 23 Dec 2020 09:15:17 -0500 From: Shawn Webb To: Renato Botelho Cc: freebsd-git@freebsd.org Subject: Re: Migrating a merge based project to new tree Message-ID: <20201223141517.xk66q3fboch6fwhj@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="fonvmsktny6wvm6c" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D1FbW6J5Cz4vnV X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=dfviS9Jl; dmarc=none; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::82f as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org X-Spamd-Result: default: False [-5.10 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::82f:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RECEIVED_SPAMHAUS_PBL(0.00)[100.16.222.53:received]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::82f:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82f:from]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2020 14:15:20 -0000 --fonvmsktny6wvm6c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 23, 2020 at 09:35:11AM -0300, Renato Botelho wrote: > I'm working to migrate a downstream stable/12 based tree to the new git > repository following instructions from [1]. >=20 > I did a final merge from legacy repository and made sure top commits on b= oth > branches point to the same tree: >=20 > # git show -s --format=3D%T f4d0bc6aa6b9 > 98db7229803a5c93e3132bc661201f204487eee9 > # git show -s --format=3D%T f262e04c92d7 > 98db7229803a5c93e3132bc661201f204487eee9 >=20 > When I try to merge new one git refuses to merge due to unrelated histori= es. > Should I use --allow-unrelated-histories parameter? >=20 > [1] https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-projec= t-from-legacy-git-tree HardenedBSD's in the same boat. We're toying around with different methods of fixing our repo right now. When I used --allow-unrelated-histories, git noted merge conflicts on every single file HardenedBSD has touched over the last 7.5 years. I tacked on "-X ours" and that made git happy. However, I'm unsure git always did the right thing. I'm working to verify that this week along with trying the other documented methods. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --fonvmsktny6wvm6c Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl/jUPIACgkQ/y5nonf4 4fp3Iw//TZAwsaUMI2B5rvmTPh7rjfwwp4hnw3xHrk1tMDNcqPlh4h1O5MFlP1uq CyGWX/JkLha0uWTLSPV40v8HCX3hddFY7CL/jfSZUY2IKSB2qoiwZl68J83X48pu TmBP1DgK83w5xioyPby/TQF6KyXoO9oZogjhTAcLA+pxmFKqh+ZkhbpENhnAfIcs Khyv5XId3veLPwJ0hM0NEh4JqKlkI00gn2jpUNT/QV7dzYSrSPZmygsluT9Q+AQy ASN6jizBt4rV5J96WNAxZH4FobGH6lawpCq/aY6Ede6X6+34AZ8uLCQwx4+kI99L xywrRNGuM8hem9EAzpvaIuA7sldHMjnscMt2+4c3HfP+QPl9LnMv6NX0rGh7f2Qp UBCHiH70f/fu40t+0nMYgXb5n/Q1mmKbuv/KJafqcEqCGZJWOkLdX0xNkNgnzr+R v0TORVAWrJ7leVwcjGe1qLwlBnWErdA9kKAWowujsZbDkOaWa+gnab8SBnAflKmd awwaQ+Q29yD2GXBt32Sihm7/YOKeqAW4Yr+D7S7MqGk92yeoN3H0Y0Pwq9vE8nNk uHhN4OAhiAbE7hclxpYGXgGFJV5FZnVp39W0aSppsfTez2nn+bcQa8Sv2eDOqMc/ IpcIouYQAm/u/ZWMEKlyYUm1KH55c0C0wVuloDhtsFS/+s9Gm8w= =uXE5 -----END PGP SIGNATURE----- --fonvmsktny6wvm6c-- From owner-freebsd-git@freebsd.org Wed Dec 23 14:29: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 E76424C06F9 for ; Wed, 23 Dec 2020 14:29:16 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (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 4D1Fvc5wl4z3C4l for ; Wed, 23 Dec 2020 14:29:16 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qv1-xf33.google.com with SMTP id h16so7628178qvu.8 for ; Wed, 23 Dec 2020 06:29:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Xsi13L+83/DQec89hbk426zGAwUC5swYmOS5CEYfTjM=; b=RVa54ERceIrZz+dlJZHecW6FE50hDuqR3k5d5BFSMhKYtFPF4YcE05DlIPlhOve3Ft AnMa/bBVHgaI4hXkE290YZS1HypsnsKXJLxS8ADbeitsx5Ut0+buutnrU9emoQsmMAyq SVaERtPRldm+JaItO2pNjzCP/USbNyl1+YtCz5nyqdAM5yxg2IXlUhxVDiu/z78wpBqO HKerQr8x/wy69yepBQLHQc5BnIXDQuva65keIp0ilJ4zmUEH0SiqNSxhX4MVzr3h9lDy Z6FDXR+plX2XgYAlze8BAWiYmZNizAXN8Sg8wfrkE+pK83rd6rSvoY758JxfNJcrhDvL iNKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Xsi13L+83/DQec89hbk426zGAwUC5swYmOS5CEYfTjM=; b=QwWJ55ixOH/tpLbwvF0FcsDsHaI7NncJkMFHrDjuev3OlBYC059kl7uJ6MN2/nlKAV iXrVBYzBefRj40PQGxDhWsCg+/nLyJ/hV6U9Czw8Nj0Wjgh3YKOEdXaNjLJBtSlaLW6A D/1eVcI1t0oZArReaDYHwf1bWTSs4GMN0IZqkfF5bi6YzyP3oMDWKIA2b2Z6bKAJPScB N2iHkmiuPoUzfVQ4+PU8D3QYHuefwdVWA3lW9hilFYE4peJhuPrvRtLyxUbWIbqv7xnQ CLTAZXLZTHTb+m1XrfTK+jpnWhSJKVkY4SCYHV5lJbZD2vMDGlBt5EW7d48CkiQixVPi w1hw== X-Gm-Message-State: AOAM531X/RWcqzQ555uGgoRpi/hFj6MlgiRAyKhbw5S7iVIEQx9rzU/y lvhWM9772eok8bayBH1bPJl1W5jC4r+AOA== X-Google-Smtp-Source: ABdhPJwlj8PJGU5w6yu5xYEmR9ZNUpXaJm+c2MQrr/0BqPVCcO1pi4JmxdpmYaVI6leTReHiwUjfYg== X-Received: by 2002:a05:6214:14ae:: with SMTP id bo14mr26915608qvb.16.1608733754448; Wed, 23 Dec 2020 06:29:14 -0800 (PST) Received: from mbp.home (200-12-5-188.rev.tribenet.com.br. [200.12.5.188]) by smtp.gmail.com with ESMTPSA id q185sm4447544qka.96.2020.12.23.06.29.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Dec 2020 06:29:13 -0800 (PST) Sender: Renato Botelho Subject: Re: Migrating a merge based project to new tree To: Shawn Webb Cc: freebsd-git@freebsd.org References: <20201223141517.xk66q3fboch6fwhj@mutt-hbsd> From: Renato Botelho Message-ID: Date: Wed, 23 Dec 2020 11:29:10 -0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.16; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20201223141517.xk66q3fboch6fwhj@mutt-hbsd> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D1Fvc5wl4z3C4l X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; TAGGED_FROM(0.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, 23 Dec 2020 14:29:17 -0000 On 23/12/20 11:15, Shawn Webb wrote: > On Wed, Dec 23, 2020 at 09:35:11AM -0300, Renato Botelho wrote: >> I'm working to migrate a downstream stable/12 based tree to the new git >> repository following instructions from [1]. >> >> I did a final merge from legacy repository and made sure top commits on both >> branches point to the same tree: >> >> # git show -s --format=%T f4d0bc6aa6b9 >> 98db7229803a5c93e3132bc661201f204487eee9 >> # git show -s --format=%T f262e04c92d7 >> 98db7229803a5c93e3132bc661201f204487eee9 >> >> When I try to merge new one git refuses to merge due to unrelated histories. >> Should I use --allow-unrelated-histories parameter? >> >> [1] https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree > > HardenedBSD's in the same boat. We're toying around with different > methods of fixing our repo right now. When I used > --allow-unrelated-histories, git noted merge conflicts on every single > file HardenedBSD has touched over the last 7.5 years. I tacked on "-X > ours" and that made git happy. However, I'm unsure git always did the > right thing. I'm working to verify that this week along with trying > the other documented methods. I've managed to do it adding `-s ours` to change merge strategy and preserve our changes. git merge legacy/stable/12 git push origin devel-12 git merge --allow-unrelated-histories -s ours freebsd/stable/12 After that I can confirm there are no differences: # git status On branch devel-12 Your branch is ahead of 'origin/devel-12' by 243035 commits. (use "git push" to publish your local commits) # git diff origin/devel-12 # -- Renato Botelho From owner-freebsd-git@freebsd.org Wed Dec 23 15:39:41 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 AEFEB4C2B77 for ; Wed, 23 Dec 2020 15:39:41 +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 4D1HSs1dvZz3JvX; Wed, 23 Dec 2020 15:39:40 +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 0BNFdd1u002504 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 23 Dec 2020 16:39:39 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 23 Dec 2020 16:39:39 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Renato Botelho Cc: Shawn Webb , freebsd-git@freebsd.org Subject: Re: Migrating a merge based project to new tree Message-ID: References: <20201223141517.xk66q3fboch6fwhj@mutt-hbsd> 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: 4D1HSs1dvZz3JvX X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; 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: Wed, 23 Dec 2020 15:39:41 -0000 On Wed, 2020-12-23 at 11:29:10 -0300, Renato Botelho wrote: >On 23/12/20 11:15, Shawn Webb wrote: >> On Wed, Dec 23, 2020 at 09:35:11AM -0300, Renato Botelho wrote: >>> I'm working to migrate a downstream stable/12 based tree to the new git >>> repository following instructions from [1]. >>> >>> I did a final merge from legacy repository and made sure top commits on both >>> branches point to the same tree: >>> >>> # git show -s --format=%T f4d0bc6aa6b9 >>> 98db7229803a5c93e3132bc661201f204487eee9 >>> # git show -s --format=%T f262e04c92d7 >>> 98db7229803a5c93e3132bc661201f204487eee9 >>> >>> When I try to merge new one git refuses to merge due to unrelated histories. >>> Should I use --allow-unrelated-histories parameter? >>> >>> [1] https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree >> >> HardenedBSD's in the same boat. We're toying around with different >> methods of fixing our repo right now. When I used >> --allow-unrelated-histories, git noted merge conflicts on every single >> file HardenedBSD has touched over the last 7.5 years. I tacked on "-X >> ours" and that made git happy. However, I'm unsure git always did the >> right thing. I'm working to verify that this week along with trying >> the other documented methods. > >I've managed to do it adding `-s ours` to change merge strategy and >preserve our changes. > >git merge legacy/stable/12 >git push origin devel-12 >git merge --allow-unrelated-histories -s ours freebsd/stable/12 > >After that I can confirm there are no differences: > ># git status >On branch devel-12 >Your branch is ahead of 'origin/devel-12' by 243035 commits. > (use "git push" to publish your local commits) > ># git diff origin/devel-12 ># Heh, you can simply write out your own commit and give it a number of parents (any number you like). Given your example above, you can merge those two commits (with the same tree, or with a tree from your actual branch) like so: tree=98db7229803a5c93e3132bc661201f204487eee9 git commit-tree -m "now kiss" -p f4d0bc6aa6b9 -p f262e04c92d7 98db7229803a5c93e3132bc661201f204487eee9 This will spit out a new commit hash, that has the tree of your choosing as well as those 2 commits as parents. You still need to stick that ref into something that you can name. Now I never know what git reset does precisely, but I think you can point your checkout out copy to that commit with git reset --hard or you stick it into a brand new ref (also called a branch). git update-ref refs/heads/my_merge If you can easily rebase your changes, that would be best. If the changes are scattered throughout the history and upstream was frequently merged, that doesn't work of course. If you don't need the per-change history, you can of course extract a patch and apply it to a clean tree, but that seems a lot of effort when you can craft your own commits with a one liner and then just need to update a ref to point to it (somehow). hth Uli From owner-freebsd-git@freebsd.org Wed Dec 23 16:35:29 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 B1D2E4C440F for ; Wed, 23 Dec 2020 16:35:29 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D1JjF4hbrz3NqW for ; Wed, 23 Dec 2020 16:35:29 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9F3754C440D; Wed, 23 Dec 2020 16:35:29 +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 9EFEE4C413C for ; Wed, 23 Dec 2020 16:35:29 +0000 (UTC) (envelope-from gbe@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 4D1JjF47Jdz3Nw1 for ; Wed, 23 Dec 2020 16:35:29 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from localhost (p548616ad.dip0.t-ipconnect.de [84.134.22.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 1C43E282B0 for ; Wed, 23 Dec 2020 16:35:29 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Wed, 23 Dec 2020 17:35:26 +0100 From: Gordon Bergling To: git@freebsd.org Subject: Checkout problems Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Url: X-Operating-System: FreeBSD 12.2-STABLE amd64 X-Host-Uptime: 5:31PM up 6 days, 10:23, 4 users, load averages: 0.41, 0.28, 0.24 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, 23 Dec 2020 16:35:29 -0000 Fellow developers, I try to checkout the new FreeBSD git sources, but even afer after 3 days I had not luck. The command I tried was the following, git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/src.git But even on freefall, it wasn't successful. Has anyone an idea about what the problem my be? --Gordon From owner-freebsd-git@freebsd.org Wed Dec 23 16:39: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 CDE404C3B7B for ; Wed, 23 Dec 2020 16:39:22 +0000 (UTC) (envelope-from david@catwhisker.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 4D1Jnk3y5Fz3PLw for ; Wed, 23 Dec 2020 16:39:22 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 878FC4C4491; Wed, 23 Dec 2020 16:39:22 +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 8759A4C442A for ; Wed, 23 Dec 2020 16:39:22 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1Jnk27hkz3PBf; Wed, 23 Dec 2020 16:39:21 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 0BNGdKe1034862; Wed, 23 Dec 2020 16:39:20 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 0BNGdKRR034861; Wed, 23 Dec 2020 08:39:20 -0800 (PST) (envelope-from david) Date: Wed, 23 Dec 2020 08:39:20 -0800 From: David Wolfskill To: Gordon Bergling Cc: git@freebsd.org Subject: Re: Checkout problems Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8MXxAGGymT2Hg6ke" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D1Jnk27hkz3PBf 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, 23 Dec 2020 16:39:22 -0000 --8MXxAGGymT2Hg6ke Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 23, 2020 at 05:35:26PM +0100, Gordon Bergling wrote: > Fellow developers, >=20 > I try to checkout the new FreeBSD git sources, but even afer after > 3 days I had not luck. >=20 > The command I tried was the following, >=20 > git clone -o freebsd --config remote.freebsd.fetch=3D'+refs/notes/*:refs/= notes/*' https://git.freebsd.org/src.git >=20 > But even on freefall, it wasn't successful. >=20 > Has anyone an idea about what the problem my be? >=20 > --Gordon > .... What response(s) (if any) are you seeing? If no response, does ^T (SIGINFO) tell you anything? In my case, I had no issues, but my approach was slightly different (ref. https://www.catwhisker.org/~david/FreeBSD/repo-sync.html). Peace, david --=20 David H. Wolfskill david@catwhisker.org "Dismissing reality doesn't make it go away." - Rajiv Shah, Rockefeller Foundation president See https://www.catwhisker.org/~david/publickey.gpg for my public key. --8MXxAGGymT2Hg6ke Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/jcrhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PclvKAgAju1AksDADULiz9e/zogxd+xLD79SjwvnIgoccphWXncOaDiYs+iAQ5l0 Ktn/pkvOh5QbANiKdVGaSfvKZxZxG2zOl8K9056DUXgOMzWvA0OLLjPYRWoE3sya S0WsSgUtrIw+i+6vCZJ7DVwFmQnosMkUUxtGh/8d40cx3U2pXxhlt5542vmgLdzt uNVJmbC8vMFA+G1kWHR9Nh4Ylgv39VcboDpWfS0doyqN7ZScnGfGMA2uR298SSIn LYEaPvrPT3HzPdk1JoTpMrOKCZZhxD+d1CqIOkN6eb5j8U/djS+Y8yI4X4fMMSRo t52IAsDawIcRCGsk+94XUX7Y9DzZmQ== =KdG+ -----END PGP SIGNATURE----- --8MXxAGGymT2Hg6ke-- From owner-freebsd-git@freebsd.org Wed Dec 23 16:47:28 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 633874C46D0 for ; Wed, 23 Dec 2020 16:47:28 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (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 4D1Jz34z7Rz3Q0h; Wed, 23 Dec 2020 16:47:27 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 7DA9D3C0199; Wed, 23 Dec 2020 16:47:21 +0000 (UTC) Date: Wed, 23 Dec 2020 16:47:21 +0000 From: Brooks Davis To: Warner Losh Cc: John Baldwin , freebsd-git Subject: Re: Git commit message templates Message-ID: <20201223164721.GA94898@spindle.one-eyed-alien.net> References: <5398f806-42a5-560e-a22c-c5483a0c6f9e@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="J2SCkAp4GZ/dPZZf" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4D1Jz34z7Rz3Q0h X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-1.90 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[199.48.129.229:from]; FREEFALL_USER(0.00)[brooks]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[199.48.129.229:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; R_SPF_NA(0.00)[no SPF record]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; 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: Wed, 23 Dec 2020 16:47:28 -0000 --J2SCkAp4GZ/dPZZf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 21, 2020 at 10:33:48AM -0700, Warner Losh wrote: > On Mon, Dec 21, 2020 at 10:28 AM John Baldwin wrote: >=20 > > On 12/17/20 12:58 PM, Ed Maste wrote: > > > On Wed, 16 Dec 2020 at 17:35, John Baldwin wrote: > > >> > > >> The only one I'm not a fan of is the lack of punctuation for the fir= st > > >> sentence. Newspaper headlines also use additional capitalization > > >> (e.g. last word and "significant words"), so the current recommendat= ion > > >> is a mix of things and not fully consistent with either one. > > > > > > Fair point - considering the first line as one would an email subject > > > is probably the best approach. > > > > I agree. Perhaps just say that (rather than newspaper headline) and le= ave > > off the note about punctuation. > > >=20 > Personally, I think we're starting to get a bit over prescriptive here. > Once you have the length down, and have a keyword at the start, you've got > 99% of the benefit. Nobody cares if there's a dot at the end or not, and > it's presence or absence adds no value to other readers. Nobody cares abo= ut > having lots of caps or not. We should just let people use their judgement. While it makes little difference it seems reasonable to make a suggestion here and for it to follow common conventions. IMO there's little value in un-opinionated style guides. There might be something to be said for flagging things that are more or less important. -- Brooks --J2SCkAp4GZ/dPZZf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJf43SYAAoJEKzQXbSebgfAsqkH/AxLLfFdYGU9/rbVWSvzfAwm 3D+JNKTxEQ4+nHg/UUF4aE6IsR0OrnzztpNW5WLbVEJkEuZ6uEiq+07s42dNS9Q+ rIFKL5X6iagCNbl/ZcIyCHGJy10edP9Incsi5zx/xtDxrWmavWwdYyWtAekmR263 Wvzwtl8Rzbz7ImIqeZ0mUY9wzV0znzn7w1GOL1tCW93cRJ0di1c9wUTq91P2BiKu 4y0NM2+gXKD/J6ioD8+XobU0WyPTcIEKpP+qMRgvg/ZWZg7VdPUrZmhNUKTh0/te yeMgZDQ5cCocedFNZNLNj7rm9rz/UDC8lVOAG8fR3uV67MPOFnjbA2Pk3B/SQFo= =SqPz -----END PGP SIGNATURE----- --J2SCkAp4GZ/dPZZf-- From owner-freebsd-git@freebsd.org Wed Dec 23 16:49: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 9955A4C4831 for ; Wed, 23 Dec 2020 16:49:15 +0000 (UTC) (envelope-from uspoerlein@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 4D1K172DPmz3Q7q for ; Wed, 23 Dec 2020 16:49:15 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 4C61E4C4939; Wed, 23 Dec 2020 16:49: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 4C2B54C46E2 for ; Wed, 23 Dec 2020 16:49:15 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-yb1-f179.google.com (mail-yb1-f179.google.com [209.85.219.179]) (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 4D1K171bQrz3Q5Y; Wed, 23 Dec 2020 16:49:15 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-yb1-f179.google.com with SMTP id y128so72747ybf.10; Wed, 23 Dec 2020 08:49:15 -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=QIuGVpXqfOwROA4rWD4YZooO/QPWlLW0jIBfhZvLy+w=; b=Oqf8bIAELK7RkUCMPWPsYp7nyQ8zq+AP5iZm+TPXa3/Lzuv6p8QQZz4qigFPfZFDAb 9Xy5DPH8SVrUxOm17ShVscOZ6zsder5LnZyldv1CJL+3toDllTMol0jJ7meqFj/Sk19j Bt1WaFt8TltvxVqsGo3kFZS0vF6K6SQ/stg2sWTc0vUOUZsJYn5M1B//Du+8GwGIOEg4 lomhjXaBXfNCUT+V/7eTor9WxkN9a1HqSxXn5s2uiM583B7VoQlJG0Ho0ptjlFOjax9x 7eZkWq2RS6/PVQprXbkqrbsyoueOD5zwFevqNrlbc4gg2Bs31LGE8wtG/7W9gXgBMsOM ArAw== X-Gm-Message-State: AOAM531m20QptpwEPw/9ySRwOqzFwRpKCfEtudOBugEj13qYz1Od/DPl x65brQc5hxk/e1Vg1IyU1cWAEIj6DrFwIJpYuZFwuAOSuvU= X-Google-Smtp-Source: ABdhPJyNgVSo75dFYTHeSL/guTc7cMvkA5YAOScypVCmPDU4Q9T+nbqpRxCTCguPQ+Gm3udJM1vPGYMwd8N7jSDfPCI= X-Received: by 2002:a25:4148:: with SMTP id o69mr36350698yba.462.1608742154218; Wed, 23 Dec 2020 08:49:14 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Wed, 23 Dec 2020 17:49:03 +0100 Message-ID: Subject: Re: Checkout problems To: Gordon Bergling Cc: git@freebsd.org, David Wolfskill X-Rspamd-Queue-Id: 4D1K171bQrz3Q5Y 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" 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, 23 Dec 2020 16:49:15 -0000 On Wed, Dec 23, 2020 at 5:39 PM David Wolfskill wrote: > On Wed, Dec 23, 2020 at 05:35:26PM +0100, Gordon Bergling wrote: > > Fellow developers, > > > > I try to checkout the new FreeBSD git sources, but even afer after > > 3 days I had not luck. > > > > The command I tried was the following, > > > > git clone -o freebsd --config > remote.freebsd.fetch='+refs/notes/*:refs/notes/*' > https://git.freebsd.org/src.git > > > > But even on freefall, it wasn't successful. > > > > Has anyone an idea about what the problem my be? > > Well, you're not showing us any logs, so it's hard to tell for sure. Please add -v (maybe two or three times) and actually show us the error you are getting. Cheers Uli PS: any reason you need a checkout on freefall itself? From owner-freebsd-git@freebsd.org Wed Dec 23 18:29:59 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 43A8E4C81C4 for ; Wed, 23 Dec 2020 18:29:59 +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 4D1MFM1FMzz3pTh for ; Wed, 23 Dec 2020 18:29:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id 2AAD44C81C3; Wed, 23 Dec 2020 18:29:59 +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 2A7204C8337 for ; Wed, 23 Dec 2020 18:29:59 +0000 (UTC) (envelope-from jhb@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 4D1MFM0Vzcz3pYP for ; Wed, 23 Dec 2020 18:29:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:b999:7:ba68:d13e]) (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 C8978286C5 for ; Wed, 23 Dec 2020 18:29:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: Thoughts on git commit mail From: John Baldwin To: git@FreeBSD.org References: 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: <797fe074-e65a-cebf-cc23-58aa9cff77c7@FreeBSD.org> Date: Wed, 23 Dec 2020 10:29:56 -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: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2020 18:29:59 -0000 On 12/15/20 3:59 PM, John Baldwin wrote: > So far I have a few possible suggestions on the git commit mail > that I would find useful. Mostly it consists of making it a bit > leaner: Another suggestion from Glen and Ed is to include the "counter" in the subject line. Perhaps the subject would go from: 'git: ' to: 'git : ' The : format is what mercurial uses FWIW, and seems a sensible format to borrow. -- John Baldwin From owner-freebsd-git@freebsd.org Wed Dec 23 19:30:14 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 771D94C9696 for ; Wed, 23 Dec 2020 19:30:14 +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 4D1NZs5YfPz3sLy for ; Wed, 23 Dec 2020 19:30:13 +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 1ks9pl-002yIG-5r; Wed, 23 Dec 2020 20:30: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 0BNJTCah086560 for ; Wed, 23 Dec 2020 20:29:12 +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 0BNJTCaY086559 for freebsd-git@freebsd.org; Wed, 23 Dec 2020 20:29:12 +0100 (CET) (envelope-from naddy) Date: Wed, 23 Dec 2020 20:29:12 +0100 From: Christian Weisgerber To: freebsd-git@freebsd.org Subject: Following src with got (sic!) Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4D1NZs5YfPz3sLy 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.05 / 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_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[inka.de]; SUBJECT_HAS_EXCLAIM(0.00)[]; NEURAL_HAM_SHORT(-0.95)[-0.948]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; 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: Wed, 23 Dec 2020 19:30:14 -0000 Got is a nascent version control system that uses the git repository format and thus has some degree of interoperability with git. http://gameoftrees.org/ People who don't need the full git experience may be able to use got to check out the FreeBSD src repository. There has been some talk of importing got into base as a successor to svnlite. Meanwhile, there's a devel/got port. If you feel overwhelmed by the flood of magic command lines and configuration file sections that are being posted for git... Well, here are some less imposing magic command lines that will also be easier to make sense of from the got(1) man page: Clone the repository: $ cd /somewhere $ got clone -a ssh://anongit@git.freebsd.org/src.git Check out stable/12: $ cd /usr $ got checkout -b stable/12 /somewhere/src.git I verified with "diff -uNr -x .got -x .svn -I '\$FreeBSD.*\$'" that this is indeed identical to a svn checkout. Update your source: $ cd /usr/src $ got fetch $ got update -b origin/stable/12 $ got rebase stable/12 This is the standard configuration which allows you to have changes on a local branch distinct from the upstream origin/* one. If you are sure you don't need this, you can simplify things by cloning a mirror of the original repository: $ got clone -a -m ssh://anongit@git.freebsd.org/src.git ... and updating your checked out source will simply be: $ cd /usr/src $ got fetch $ got update You may also want to give the tog(1) repository browser a spin. Very handy to figure out who, say, probably broke wcwidth()... Check it out! (pun intended) - - - - - At this time, got does not yet support cloning/fetching over https, pushing to a remote repository, or garbage collection. Git can be used to supply missing functionality for the time being. -- Christian "naddy" Weisgerber naddy@mips.inka.de From owner-freebsd-git@freebsd.org Wed Dec 23 22:06:04 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 584934CC9B1; Wed, 23 Dec 2020 22:06:04 +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 4D1S2g0WTFz4Y0N; Wed, 23 Dec 2020 22:06:02 +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 cb149d7d; Wed, 23 Dec 2020 17:05:52 -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 ba4cc09e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Wed, 23 Dec 2020 17:05:52 -0500 (EST) To: freebsd-current@freebsd.org, freebsd-git@freebsd.org References: <20201125055425.01AA628417@elsa.codelab.cz> <10f7b800-b015-2a80-b741-4f7db03bf6eb@quip.cz> From: Charlie Li Organization: FreeBSD mailing lists Subject: Re: git tools for building in base? Message-ID: <59893166-d05a-89b5-798b-c89e3392756b@vishwin.info> Date: Wed, 23 Dec 2020 17:05:49 -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="ITqAKabA1ofaueFaEpBppTBTtDVneuNLZ" X-Rspamd-Queue-Id: 4D1S2g0WTFz4Y0N X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.10 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; HAS_ATTACHMENT(0.00)[]; TO_DN_NONE(0.00)[]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[vishwin.info:+]; DMARC_POLICY_ALLOW(-0.50)[vishwin.info,quarantine]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[46.101.93.59:from]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~]; TAGGED_FROM(0.00)[freebsd]; ASN(0.00)[asn:14061, ipnet:46.101.80.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[vishwin.info:s=fuccboi12]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; SPAMHAUS_ZRD(0.00)[46.101.93.59:from:127.0.2.255]; MAILMAN_DEST(0.00)[freebsd-current,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: Wed, 23 Dec 2020 22:06:04 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ITqAKabA1ofaueFaEpBppTBTtDVneuNLZ Content-Type: multipart/mixed; boundary="HkyMKpgcNgAmUmZuUFENAarhoTqE23PJz"; protected-headers="v1" From: Charlie Li To: freebsd-current@freebsd.org, freebsd-git@freebsd.org Cc: uqs@freebsd.org Message-ID: <59893166-d05a-89b5-798b-c89e3392756b@vishwin.info> Subject: Re: git tools for building in base? References: <20201125055425.01AA628417@elsa.codelab.cz> <10f7b800-b015-2a80-b741-4f7db03bf6eb@quip.cz> In-Reply-To: --HkyMKpgcNgAmUmZuUFENAarhoTqE23PJz Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable Ulrich Sp=C3=B6rlein wrote: > I don't fully recall, but I think that the hg conversion was slow and > the disk space needed was quite a bit more than git. >=20 One of Mercurial's biggest design principles is immutable history (with history rewriting disabled by default), so increased disk space compared to git is reasonable. > So in summary, I guess it can be summed up as: > - there was no svn-all-fast-export for hg back then > - even bitbucket switched from hg to git Bitbucket dropping Mercurial support was more a business decision, although more ancillary tooling for git existing and developer appetite certainly played factors there. > - history rewriting is easier in git, see e.g. this file for the stuff = =C2=A0 > that's required to make the cvs2svn things a bit nicer: =C2=A0 > https://github.com/freebsd/git_conv/blob/master/fix_bogus_tags.sh >=20 > Granted, now that the heavy lifting is done, one could probably do a > git2hg transition, as the history is now pretty sane and should be > compatible to the hg model. >=20 Mercurial's branches are more similar to subversion than git. The hg analogue to git's branches are bookmarks, for which even they are optional since hg has its heads concept. > But lack of anyone (to my knowledge?) providing a hg copy of FreeBSD al= l > these years tells me that there's simply no demand for it. >=20 I use hg-beta for ports. Also used it for src up until git-beta came online. Not sure what I will do once ports is converted to git, however. My mercurial use stems from two sources: committers' need to preserve copy/move history (though this will probably go away with git) and horrendous performance with the ports tree in git. Horrendous as in, for example, takes about five minutes just to run git-status(1) on a ports tree stored on a hard drive with UFS (-uno doesn't help) whilst locking up the entire system I/O for the duration. The I/O lockups have since subsided but as of six months ago the slow enumeration has persisted. For some reason, mercurial is far more efficient in this regard. --=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) --HkyMKpgcNgAmUmZuUFENAarhoTqE23PJz-- --ITqAKabA1ofaueFaEpBppTBTtDVneuNLZ 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/jvz4FAwAAAAAACgkQjnB43vIDq2x8 QQ/9HpolrtYaQlLG095p3vX8YdukhQLFOF743/tzT2kFrA/SKUD8XGZ7Q7xGEYnbvUB7P0bnajU0 Nr8CX3Sq6udD3L5FXUxXt/h7MVbxmtp6xvjEffthzaS0zNNqDOblzZoAD7tPYMqAF+QgniMuutJv HAluWdiS8URryJ8EkZRmxcnJYQ385NmAzi+0T0XCJuVdXASjBWf/5Gg9hdLhSQY4jOFKfx0EFF9F UFG3Ap/nh4TL0uXe4+aopQ+i6UskpsMRsIbuJnjsC7CfH0s3MvIseX8epzBPxfQb4V9g/3qi4wSm xVveHzNeaHwFnRXmS73aqlKgGqlzg6Qtwu15Llh+PBCL7J6HxnP7t3WAVOKlcKKMrhP7jWsax5z9 w1PjWDPUw5Si6bK016yOmQyXXF1c2oDeKqBIIxtzwjYb5UUGKrQMl0VAy+Espx1qwo+GIkCHqDVs v+KHr+UsHSad2lZHZQa9+0VtCvy5wLfDjMmrTIvB35A38mf2e7SC7WrupYgHpL/qSgoZbYOjhCKx VJYVH/CKou4AwCXSGhRX1sp9RXuQ2dSwvExJHyg+rvNEBY/7bW/OK8xTAYEe66m9TlkMcrSEDwFv KLpcivzonqSS/u9ZhW4tY8DEL8GfmhGkPsriUzs9TeZoWNQFlTGILcQPSM/FIMNJ2JnEUr36+heh +xo= =TVbD -----END PGP SIGNATURE----- --ITqAKabA1ofaueFaEpBppTBTtDVneuNLZ-- From owner-freebsd-git@freebsd.org Thu Dec 24 00:59:59 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 AAEBF4CFCF4 for ; Thu, 24 Dec 2020 00:59:59 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) (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 4D1WvL4Xc2z4hWW for ; Thu, 24 Dec 2020 00:59:58 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: by mail-pf1-x431.google.com with SMTP id t22so405415pfl.3 for ; Wed, 23 Dec 2020 16:59:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iitbombay-org.20150623.gappssmtp.com; s=20150623; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=5vohMjtVMdXaAhuIaPbXfnnW/rYQdemktK1wqbVk2rQ=; b=Sv76IFiaZfG5V/UNAVofM32xCqv9DCzhc133lqYIhUwOIJrZJNkXldqA9A3tiZHClq sSMOIP9TfVkvT3LRvFw6D+wDiF0BSwoSfPkvlctxMPs0Ha/WBJ4sjq+GhHJ31+elofTZ SHLy84UAKqcaN19Xx2Cy1sz1ItRu2uQvPoGvOAlpGxpPlEhmwaB37SabAoYVSgtkBkLx U1YRLm/PtRQqXlvH2xSQrEho8omr3LF9P6KaqopKesPHMRWZSZS2t088dN1iAt3b+i8/ qlBbdErn8W00DQMQH4zN8Y+tMpVhe2hYO2BTbvd5v4GFCjP1NT9NoHSfNwFfIDrpOmth w9Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=5vohMjtVMdXaAhuIaPbXfnnW/rYQdemktK1wqbVk2rQ=; b=Wekfl6D+P9ZRnFAM63F1KkPpoolracYsfxkDs3pq/zE8yAHupbWZbPvxWz8LGtTCgw WXAW0bqiSad49ad2h/NJNGEcwbJgYMtv0zZn0Z3FV3vN8RWGL8cj7hqlvwDKMtidDJRb ew/wt4/BEatyLKtJLr0MuqOvycVoGqvqtskfjukSShsbYFTDjB5KEWhN8NLfpmrMitYg aBHtT0sLrvPDWQqn2UYUnYNFvRHWlzcO6k3d7BWokbufw67fmuVAjt2aWabkQw+DIdoj Nuppxs3MrFNDq0fkMGJa/48kFsLKaKV+94OxJubmv6SNLVLjl7SZhk4o9GIX+r1y2zRm Dt8w== X-Gm-Message-State: AOAM532dW9EYRFqH2Zinx8eqe3baln/Fizni4okg2gMMckVoBFDGGekW e2e18R5p/9wjIlMLVYzrskLztA== X-Google-Smtp-Source: ABdhPJwBGqvqpYIMiR2S1pQ2xzNDffZhXlqaIujhMHMUzcgMeSWu3SCv0GduqXk+32savXrS3xmscg== X-Received: by 2002:a63:db57:: with SMTP id x23mr26322091pgi.131.1608771597055; Wed, 23 Dec 2020 16:59:57 -0800 (PST) Received: from [192.168.1.113] (172-125-77-130.lightspeed.sntcca.sbcglobal.net. [172.125.77.130]) by smtp.gmail.com with ESMTPSA id e10sm21321081pgu.42.2020.12.23.16.59.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Dec 2020 16:59:56 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: Src repository is available on git.freebsd.org From: Bakul Shah In-Reply-To: Date: Wed, 23 Dec 2020 16:59:53 -0800 Cc: David Wolfskill , freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <1C743D50-3240-48A0-A012-2D80E217EC64@iitbombay.org> References: <1527634C-4E31-4325-BB93-BDFF0C8ADB8C@iitbombay.org> <0C3B8F33-851B-4513-815A-09F33EF96DE8@iitbombay.org> To: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4D1WvL4Xc2z4hWW X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=iitbombay-org.20150623.gappssmtp.com header.s=20150623 header.b=Sv76IFia; dmarc=none; spf=pass (mx1.freebsd.org: domain of bakul@iitbombay.org designates 2607:f8b0:4864:20::431 as permitted sender) smtp.mailfrom=bakul@iitbombay.org X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[iitbombay-org.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::431:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[iitbombay-org.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[bakul]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[iitbombay.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::431:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::431:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 00:59:59 -0000 On Dec 23, 2020, at 2:34 AM, Ulrich Sp=C3=B6rlein = wrote: >=20 > On Tue, 2020-12-22 at 14:18:10 -0800, Bakul Shah wrote: >> On Dec 22, 2020, at 2:03 PM, David Wolfskill = wrote: >>>=20 >>> On Tue, Dec 22, 2020 at 01:51:39PM -0800, Bakul Shah wrote: >>>> I have been tracking cgit-beta.freebsd.org since September. >>>> What is the process for switching over to git.freebsd.org? >>>> I thought there were instructions for that but I can't find them = any more! >>>> Thanks. >>>> .... >>>=20 >>> I aqssumed(!) that the hashes would be different, so I moved aside = the >>> repo I had from cgit-beta and cloned a new one (from = git.freebsd/org), >>> then removed the old one once I was satisfied that the new one was = OK. >>=20 >> Forgot to add that I wanted to switch over *without* blowing away = 3.2GB >> of local git bits. Hashes shouldn't change unless something major got >> redone. Comparing hashes from my local repo with = https://cgit.freebsd.org/src/commit/ >> I see they are the same. >=20 > 3.2GB sounds wrong, it looks like you have the new hashes and the old = hashes and no GC run in between. This is expected and would fix itself = over time, you might want to compress things down to 1.6GB however, = using: git gc --prune=3Dnow In spite of this the repo remains at 3.0G. Though now there are a bunch = lines like=20 warning: reflog of 'refs/notes/commits' references pruned commits warning: reflog of 'refs/remotes/origin/main' references pruned commits warning: reflog of 'refs/remotes/origin/releng/11.0' references pruned = commits warning: reflog of 'refs/remotes/origin/releng/7.1' references pruned = commits warning: reflog of 'refs/remotes/origin/releng/5.5' references pruned = commits warning: reflog of 'refs/remotes/origin/releng/4.8' references pruned = commits warning: reflog of 'refs/remotes/origin/releng/8.4' references pruned = commits warning: reflog of 'refs/remotes/origin/releng/9.3' references pruned = commits warning: reflog of 'refs/remotes/origin/releng/8.3' references pruned = commits in gc.log. I fixed that with git reflog expire --all --stale-fix > BEWARE: that you don't have any loose refs that you still might need = later on. If all your changes are in regular branches and you didn't go = wild with rebase -i or anything, then this should be safe. >=20 > To not re-download everything, use --reference to point to an existing = clone, that is: >=20 > git clone --reference /path/to/old/clone = https://git.FreeBSD.org/src.git /path/to/new/clone >=20 > You could also: > git init > git add remote .... > cp the objects/* files over to the new repo > git fetch I just did git remote set-url origin -- this really only rewrites the = url=3D line in config! From owner-freebsd-git@freebsd.org Thu Dec 24 01:20:44 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 74D7A4B1115 for ; Thu, 24 Dec 2020 01:20:44 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D1XMJ2ZMjz4k89 for ; Thu, 24 Dec 2020 01:20:44 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 560F04B1114; Thu, 24 Dec 2020 01:20:44 +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 55CC94B0F5A for ; Thu, 24 Dec 2020 01:20:44 +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 4D1XMJ1zTBz4kKp for ; Thu, 24 Dec 2020 01:20:44 +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 207672BBEA for ; Thu, 24 Dec 2020 01:20:44 +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 4D1XMH06Cnz1b3Q for ; Thu, 24 Dec 2020 01:20:43 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4D1XMF5fg8z5y3q; Thu, 24 Dec 2020 01:20:41 +0000 (UTC) From: Philip Paeps To: git@freebsd.org Subject: Trying the vendor import of tzdata2020e Date: Thu, 24 Dec 2020 09:20:37 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5757) Message-ID: <5C70EE9E-DA23-413C-898B-B1B33F2EC4D7@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; format=flowed; markup=markdown X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 01:20:44 -0000 I am trying to test the vendor import of tzdata2020e but I am running into trouble: (playground is gitrepo-dev.freebsd.org) ``` [658] {vendor/tzdata+1}(philip@rincewind)~/freebsd/tzdata% git push --follow-tags playground vendor/tzdata Enumerating objects: 36, done. Counting objects: 100% (36/36), done. Delta compression using up to 8 threads Compressing objects: 100% (18/18), done. Writing objects: 100% (19/19), 16.28 KiB | 241.00 KiB/s, done. Total 19 (delta 16), reused 0 (delta 0), pack-reused 0 remote: remote: ================================================================ remote: ref = refs/heads/vendor/tzdata remote: old = f8bfb27fbdf6a3166b475dffc909a6b96d120357 remote: new = ee953ec3715145740e17314b2982649803a38ed2 remote: repo = src remote: hash = ee953ec3715145740e17314b2982649803a38ed2 remote: commit: remote: tree 4a14014aca01b04b386a9b685e3a15d1084df3d3 remote: parent f8bfb27fbdf6a3166b475dffc909a6b96d120357 remote: author Philip Paeps 1608772383 +0000 remote: committer Philip Paeps 1608772383 +0000 remote: remote: Import tzdata 2020e remote: remote: ================================================================ remote: remote: FATAL: VREF/APPROVERS-CHECK/src: helper program exit status 65280 remote: error: hook declined to update refs/heads/vendor/tzdata remote: WARNING: ref create/delete ignored for purposes of merge-check remote: remote: remote: FATAL -- ACCESS DENIED remote: Repo src remote: User philip remote: Stage From git's update hook remote: Ref Tag 'vendor/tzdata/tzdata2020e' remote: Operation Create ref remote: remote: FATAL: C refs/tags/vendor/tzdata/tzdata2020e src philip DENIED by fallthru remote: error: hook declined to update refs/tags/vendor/tzdata/tzdata2020e To gitrepo-dev.freebsd.org:src.git ! [remote rejected] vendor/tzdata -> vendor/tzdata (hook declined) ! [remote rejected] vendor/tzdata/tzdata2020e -> vendor/tzdata/tzdata2020e (hook declined) error: failed to push some refs to 'gitrepo-dev.freebsd.org:src.git' ``` Any idea what I'm doing wrong here? Aside, while I was preparing the import, I discovered that I have a `GIT_AUTHOR_EMAIL` in my environment which Git will use in preference to the user.email setting in the repository. Pointing this out here so someone searching the archives when debugging a similar problem has a breadcrumb. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Thu Dec 24 02:00:31 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 F054B4B236B for ; Thu, 24 Dec 2020 02:00:31 +0000 (UTC) (envelope-from wlosh@bsdimp.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 4D1YFC5b5Qz4mHT for ; Thu, 24 Dec 2020 02:00:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id BFB9D4B236A; Thu, 24 Dec 2020 02:00:31 +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 BF8094B2369 for ; Thu, 24 Dec 2020 02:00:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1YFC4w1pz4m5r for ; Thu, 24 Dec 2020 02:00:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72e.google.com with SMTP id f26so1153563qka.0 for ; Wed, 23 Dec 2020 18:00:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=cdeB2xbFtWEO42+5Vuoq8NJXrDv8Gkh1js9r+4HbnS4=; b=w/MT90h/1BD+j2817i+NYhdRP4kJuvKH4lfrUkKP5TNgboALFxS+qCJkJFgopsCs2L x4M5DO4p6Z8urEcwz5MZfdz5gCFS3mD4xlxpAZ7VOsoA1pEgSqDuiVelsy8QdVDex5VW Ii+fpzAhH6T7vd9DiknjO456wbtlUS3+R5uUtwvuEHSniskPCcLE3c0pT7LtMgFmLoCH bmj5vjAU8vw1iVjN2khXmVPeYJd4pzsQ69ptBfD8Pd2nuHfxNaYuOLD8/QUDY6iEYEvo 4MzAkNEyklMUqIt9ygPtwV7aQ5N7pTckmE2ePyHggFukf/5bo1Vja/N1cr9x/P5+XSas t3RQ== 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=cdeB2xbFtWEO42+5Vuoq8NJXrDv8Gkh1js9r+4HbnS4=; b=bKz7ToIKTrav4oINpn1a+WJ5y+YV7sm9u9EcgegGe0j21JHUsaSjxxWpccrSu6kPq0 jiDybTzU1v3uZPzXhvbSU8fPATwZgOdLgUF5QIpYRLDidAd2N4Ao0ZucYdJTc1jYfpxX F1uWR+K0yxST5UGKypGxYn3t30AioqBfPX/boQ4zZVM7y4un50eEIjzh9GLCL+EBUniE LV5g/8o34aeKP9jjHehYrGYUncb4cAno79T+5dAns1hmoryQU9J+wWbopmiQRDWbO9g/ YIYzdz3n8UkS/vvoMntMtlWKt2coAoOGubx4NvQa0gGpmQ/2OIJnDxzW4npE0Cluy2kK ZqGQ== X-Gm-Message-State: AOAM530BaIQdRvgH4bo+FqtiyCGB5qxJSvhlgQNFlOpfooX7FC4MMKv6 Ola6+B2/QJ/o3oXETRN2In7ouuDh2ZtiwSsoyPFKQg== X-Google-Smtp-Source: ABdhPJxfGcavMlPigS3KBhxOXNgSlTT0PvqKftlOcG9paDHo2tCgYfaf0WBTbNwU8t8YO7vJ1ajNtWhj7Ts1Mr5O/2Y= X-Received: by 2002:a37:4a4e:: with SMTP id x75mr29357601qka.89.1608775229835; Wed, 23 Dec 2020 18:00:29 -0800 (PST) MIME-Version: 1.0 References: <5C70EE9E-DA23-413C-898B-B1B33F2EC4D7@freebsd.org> In-Reply-To: <5C70EE9E-DA23-413C-898B-B1B33F2EC4D7@freebsd.org> From: Warner Losh Date: Wed, 23 Dec 2020 19:00:18 -0700 Message-ID: Subject: Re: Trying the vendor import of tzdata2020e To: Philip Paeps Cc: git@freebsd.org X-Rspamd-Queue-Id: 4D1YFC4w1pz4m5r 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" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 02:00:32 -0000 On Wed, Dec 23, 2020, 6:20 PM Philip Paeps wrote: > I am trying to test the vendor import of tzdata2020e but I am running > into trouble: > > (playground is gitrepo-dev.freebsd.org) > > ``` > [658] {vendor/tzdata+1}(philip@rincewind)~/freebsd/tzdata% git push > --follow-tags playground vendor/tzdata > Enumerating objects: 36, done. > Counting objects: 100% (36/36), done. > Delta compression using up to 8 threads > Compressing objects: 100% (18/18), done. > Writing objects: 100% (19/19), 16.28 KiB | 241.00 KiB/s, done. > Total 19 (delta 16), reused 0 (delta 0), pack-reused 0 > remote: > remote: ================================================================ > remote: ref = refs/heads/vendor/tzdata > remote: old = f8bfb27fbdf6a3166b475dffc909a6b96d120357 > remote: new = ee953ec3715145740e17314b2982649803a38ed2 > remote: repo = src > remote: hash = ee953ec3715145740e17314b2982649803a38ed2 > remote: commit: > remote: tree 4a14014aca01b04b386a9b685e3a15d1084df3d3 > remote: parent f8bfb27fbdf6a3166b475dffc909a6b96d120357 > remote: author Philip Paeps 1608772383 +0000 > remote: committer Philip Paeps 1608772383 +0000 > remote: > remote: Import tzdata 2020e > remote: > remote: ================================================================ > remote: > remote: FATAL: VREF/APPROVERS-CHECK/src: helper program exit status > 65280 > remote: error: hook declined to update refs/heads/vendor/tzdata > remote: WARNING: ref create/delete ignored for purposes of merge-check > remote: > remote: > remote: FATAL -- ACCESS DENIED > remote: Repo src > remote: User philip > remote: Stage From git's update hook > remote: Ref Tag 'vendor/tzdata/tzdata2020e' > remote: Operation Create ref > remote: > remote: FATAL: C refs/tags/vendor/tzdata/tzdata2020e src philip DENIED > by fallthru > remote: error: hook declined to update > refs/tags/vendor/tzdata/tzdata2020e > To gitrepo-dev.freebsd.org:src.git > ! [remote rejected] vendor/tzdata -> vendor/tzdata (hook > declined) > ! [remote rejected] vendor/tzdata/tzdata2020e -> > vendor/tzdata/tzdata2020e (hook declined) > error: failed to push some refs to 'gitrepo-dev.freebsd.org:src.git' > ``` > > Any idea what I'm doing wrong here? > We have not turned on vendor pushing yet. It looks right otherwise. Warner Aside, while I was preparing the import, I discovered that I have a > `GIT_AUTHOR_EMAIL` in my environment which Git will use in preference to > the user.email setting in the repository. Pointing this out here so > someone searching the archives when debugging a similar problem has a > breadcrumb. > > Philip > > -- > Philip Paeps > Senior Reality Engineer > Alternative Enterprises > _______________________________________________ > 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 Thu Dec 24 02:05: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 778234B33F2 for ; Thu, 24 Dec 2020 02:05:34 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D1YM22rMHz4n7F for ; Thu, 24 Dec 2020 02:05:34 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 6180B4B3652; Thu, 24 Dec 2020 02:05: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 6146F4B35E8 for ; Thu, 24 Dec 2020 02:05:34 +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 4D1YM22GwKz4n26; Thu, 24 Dec 2020 02:05:34 +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 302D22C238; Thu, 24 Dec 2020 02:05:34 +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) 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 4D1YM12ry2z1b45; Thu, 24 Dec 2020 02:05:33 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, from userid 1001) id 4D1YM06KbNz5xy2; Thu, 24 Dec 2020 02:05:32 +0000 (UTC) Date: Thu, 24 Dec 2020 10:05:32 +0800 From: Philip Paeps To: Warner Losh Cc: git@freebsd.org Subject: Re: Trying the vendor import of tzdata2020e Message-ID: References: <5C70EE9E-DA23-413C-898B-B1B33F2EC4D7@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: X-PGP-Fingerprint: 2CD1 92C2 6EE7 B7D1 F552 6619 31AE B9B5 FDBB CB0E X-Date: Today is Pungenday, the 66th day of The Aftermath in the YOLD 3186 X-Phase-of-Moon: The Moon is Waxing Gibbous (69% of Full) X-Clacks-Overhead: GNU Terry Pratchett 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, 24 Dec 2020 02:05:34 -0000 On 2020-12-23 19:00:18 (-0700), Warner Losh wrote: >On Wed, Dec 23, 2020, 6:20 PM Philip Paeps wrote: > >> I am trying to test the vendor import of tzdata2020e but I am running >> into trouble: >> >> (playground is gitrepo-dev.freebsd.org) >> >> ``` >> [658] {vendor/tzdata+1}(philip@rincewind)~/freebsd/tzdata% git push >> --follow-tags playground vendor/tzdata >> >> [...] >> >> remote: FATAL: C refs/tags/vendor/tzdata/tzdata2020e src philip >> DENIED >> by fallthru >> remote: error: hook declined to update >> refs/tags/vendor/tzdata/tzdata2020e >> To gitrepo-dev.freebsd.org:src.git >> ! [remote rejected] vendor/tzdata -> vendor/tzdata (hook >> declined) >> ! [remote rejected] vendor/tzdata/tzdata2020e -> >> vendor/tzdata/tzdata2020e (hook declined) >> error: failed to push some refs to 'gitrepo-dev.freebsd.org:src.git' >> ``` >> >> Any idea what I'm doing wrong here? >> > >We have not turned on vendor pushing yet. It looks right otherwise. Ooh! Okay. That explains. I mistakenly believed that the gitrepo-dev playground was open for all manner of mischief. Sorry for the noise. :) I'll try again when vendor pushes are enabled. Thanks. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Thu Dec 24 02: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 3018C4B3FC0 for ; Thu, 24 Dec 2020 02:23:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D1YlL6wJpz4nxt for ; Thu, 24 Dec 2020 02:23:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id EBB454B4204; Thu, 24 Dec 2020 02:23:10 +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 EB79A4B3BF5 for ; Thu, 24 Dec 2020 02:23:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1YlL6Cvlz4nvC for ; Thu, 24 Dec 2020 02:23:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72e.google.com with SMTP id d14so1104706qkc.13 for ; Wed, 23 Dec 2020 18:23:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=3YlEit5bdCv+LIzGiFjzQzDf69LNDHE+xrT6xxj24YY=; b=LR/Mi3rtNciuo54ocbNckmczOXZJsMKhHtAxyZ2dHFmSCnpmJMy8fwKIFTJ2eDr61h aCoUf79iM/dVngqorJdCa/4V+6PiwSxowXEduEqRnNh4PSEOZ8Z76fBq/75Xz+c7FPrF qUlm4939zt7b40ajD71KmmteL4ivBup9tEom8y1uAyQfJMDCSgNxZUlgHl/7+mQIfd5G pTqhnCBWA8WsSUjqrFf+zlSpMiPHVSkNMv2WXsYOQ5nFqasWqlcB3ZD40QBS0w2ZTw/S oUeA6IU3ZN8ACsPHeKUz6iyijshQ8YvDSJdxzVsWAcJI4OicpSY3NTOlsCrE89sV19Zw pG8A== 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=3YlEit5bdCv+LIzGiFjzQzDf69LNDHE+xrT6xxj24YY=; b=J24ziTsSRuMsYUMiw3xvhCulFlg65e0FD/n8Yx/XWzvYijzUIa2Ni9NzVzU6ewhxA0 nlKyZspQFAfH/bVSq+UfM0tLUHbTFB7SmOagxhYCof1GpX16YgpxG3ST4pMiMkcXFdhV 2/54FbpMlkzqyeCgtsV0Jdx4kMxGTLWVdpXwWh4afUOO9id/uucFsc7FmQKik5zj8t+J e54nw7ZhEmQ1ZE6Tw3JQ/vJvcveRky7fqDRiUF9u2Sq+MrGALdNMv3mQqYMSsBXD7Jtc cw+/WSH93ozG7RrdHz8HBjYDa2kFSFn2wvT6CZOCp+W0jrHkRq1Yl+iAc65XNuhkmt+f tHoA== X-Gm-Message-State: AOAM5330oUkOuLD0hz0/i/z4jDpit8s4Fsq1nawgO6/8LV5nARZ9vgQc MUORDUv6J96x3bYYguPsFWr7oaXJRuKnxMj+86tf5g== X-Google-Smtp-Source: ABdhPJyKQgMFK0UoWu2b84/KmtaZTbpCVWDrsU56RwkB/2n9Dm/8XI6DGm/5uzCHW6chRSqrbHCawE08owQlrKkQ7+E= X-Received: by 2002:a37:4a4e:: with SMTP id x75mr29414045qka.89.1608776589976; Wed, 23 Dec 2020 18:23:09 -0800 (PST) MIME-Version: 1.0 References: <5C70EE9E-DA23-413C-898B-B1B33F2EC4D7@freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 23 Dec 2020 19:22:58 -0700 Message-ID: Subject: Re: Trying the vendor import of tzdata2020e To: Philip Paeps Cc: git@freebsd.org X-Rspamd-Queue-Id: 4D1YlL6Cvlz4nvC 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" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 02:23:11 -0000 On Wed, Dec 23, 2020, 7:05 PM Philip Paeps wrote: > On 2020-12-23 19:00:18 (-0700), Warner Losh wrote: > >On Wed, Dec 23, 2020, 6:20 PM Philip Paeps wrote: > > > >> I am trying to test the vendor import of tzdata2020e but I am running > >> into trouble: > >> > >> (playground is gitrepo-dev.freebsd.org) > >> > >> ``` > >> [658] {vendor/tzdata+1}(philip@rincewind)~/freebsd/tzdata% git push > >> --follow-tags playground vendor/tzdata > >> > >> [...] > >> > >> remote: FATAL: C refs/tags/vendor/tzdata/tzdata2020e src philip > >> DENIED > >> by fallthru > >> remote: error: hook declined to update > >> refs/tags/vendor/tzdata/tzdata2020e > >> To gitrepo-dev.freebsd.org:src.git > >> ! [remote rejected] vendor/tzdata -> vendor/tzdata (hook > >> declined) > >> ! [remote rejected] vendor/tzdata/tzdata2020e -> > >> vendor/tzdata/tzdata2020e (hook declined) > >> error: failed to push some refs to 'gitrepo-dev.freebsd.org:src.git' > >> ``` > >> > >> Any idea what I'm doing wrong here? > >> > > > >We have not turned on vendor pushing yet. It looks right otherwise. > > Ooh! Okay. That explains. > > I mistakenly believed that the gitrepo-dev playground was open for all > manner of mischief. > > Sorry for the noise. :) > > I'll try again when vendor pushes are enabled. I'll let you know. I think that lwhsu or uqs has to wake up first and double check something. Warner > Thanks. > > Philip > > -- > Philip Paeps > Senior Reality Engineer > Alternative Enterprises > From owner-freebsd-git@freebsd.org Thu Dec 24 12:15: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 1FCA14C2852 for ; Thu, 24 Dec 2020 12:15:33 +0000 (UTC) (envelope-from stsp@stsp.name) Received: from einhorn-mail-out.in-berlin.de (einhorn-mail-out.in-berlin.de [217.197.80.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.in-berlin.de", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1ptq75pQz3rQr for ; Thu, 24 Dec 2020 12:15:31 +0000 (UTC) (envelope-from stsp@stsp.name) X-Envelope-From: stsp@stsp.name Received: from authenticated.user (localhost [127.0.0.1]) by einhorn.in-berlin.de with ESMTPSA id 0BOCFTOA002825 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 24 Dec 2020 13:15:29 +0100 Received: from localhost (ted.stsp.name [local]) by ted.stsp.name (OpenSMTPD) with ESMTPA id 8498fcd4; Thu, 24 Dec 2020 13:15:28 +0100 (CET) Date: Thu, 24 Dec 2020 13:15:28 +0100 From: Stefan Sperling To: Christian Weisgerber Cc: freebsd-git@freebsd.org Subject: Re: Following src with got (sic!) Message-ID: <20201224121528.GD92065@ted.stsp.name> Mail-Followup-To: Christian Weisgerber , freebsd-git@freebsd.org References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D1ptq75pQz3rQr X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of stsp@stsp.name has no SPF policy when checking 217.197.80.21) smtp.mailfrom=stsp@stsp.name X-Spamd-Result: default: False [-2.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[stsp.name]; RBL_DBL_DONT_QUERY_IPS(0.00)[217.197.80.21:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[217.197.80.21:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; SUBJECT_HAS_EXCLAIM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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:29670, ipnet:217.197.80.0/20, country:DE]; RCVD_TLS_LAST(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_IN_DNSWL_LOW(-0.10)[217.197.80.21:from] 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, 24 Dec 2020 12:15:33 -0000 On Wed, Dec 23, 2020 at 08:29:12PM +0100, Christian Weisgerber wrote: > Got is a nascent version control system that uses the git repository > format and thus has some degree of interoperability with git. > http://gameoftrees.org/ > People who don't need the full git experience may be able to use > got to check out the FreeBSD src repository. There has been some > talk of importing got into base as a successor to svnlite. Meanwhile, > there's a devel/got port. Thanks for writing this up :) One small correction below: > If you feel overwhelmed by the flood of magic command lines and > configuration file sections that are being posted for git... > Well, here are some less imposing magic command lines that will > also be easier to make sense of from the got(1) man page: > > Clone the repository: > $ cd /somewhere > $ got clone -a ssh://anongit@git.freebsd.org/src.git > > Check out stable/12: > $ cd /usr > $ got checkout -b stable/12 /somewhere/src.git > > I verified with "diff -uNr -x .got -x .svn -I '\$FreeBSD.*\$'" that > this is indeed identical to a svn checkout. > > Update your source: > $ cd /usr/src > $ got fetch > $ got update -b origin/stable/12 > $ got rebase stable/12 > > This is the standard configuration which allows you to have changes > on a local branch distinct from the upstream origin/* one. > > If you are sure you don't need this, you can simplify things by > cloning a mirror of the original repository: > $ got clone -a -m ssh://anongit@git.freebsd.org/src.git > ... and updating your checked out source will simply be: > $ cd /usr/src > $ got fetch > $ got update The above commands will not result in updated files even if new changes appeared in stable/12 on the server. By default 'got fetch' will only fetch the branch corresponding to the HEAD reference of the repository, which usually points at the "main" branch. Instead, this fetches all branches: $ got fetch -a To fetch just new commits on the stable/12 branch, either use: $ got fetch -b stable/12 or add the 'stable/12' branch to the repository's got.conf(5) file: remote "origin" { server anongit@git.freebsd.org protocol ssh repository "/src.git" branch "stable/12" } Now a simple 'got fetch' implies '-b stable/12'. A collection of branches to fetch by default can be defined like this: remote "origin" { server anongit@git.freebsd.org protocol ssh repository "/src.git" branch "main" branch "stable/12" branch "stable/11" branch "stable/10" } Cheers, Stefan > You may also want to give the tog(1) repository browser a spin. > Very handy to figure out who, say, probably broke wcwidth()... > > Check it out! (pun intended) > > - - - - - > > At this time, got does not yet support cloning/fetching over https, > pushing to a remote repository, or garbage collection. Git can be > used to supply missing functionality for the time being. > > -- > Christian "naddy" Weisgerber naddy@mips.inka.de > _______________________________________________ > 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 Thu Dec 24 14:02:36 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 4C7684C60D5 for ; Thu, 24 Dec 2020 14:02:36 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D1sGN1j5Hz4ZYG for ; Thu, 24 Dec 2020 14:02:36 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 3A5614C632E; Thu, 24 Dec 2020 14:02:36 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3A1E84C6448 for ; Thu, 24 Dec 2020 14:02:36 +0000 (UTC) (envelope-from gbe@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 4D1sGN1Hmcz4ZWH; Thu, 24 Dec 2020 14:02:36 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from localhost (p548616ad.dip0.t-ipconnect.de [84.134.22.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id B620716F4; Thu, 24 Dec 2020 14:02:35 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Thu, 24 Dec 2020 15:02:34 +0100 From: Gordon Bergling To: David Wolfskill Cc: git@freebsd.org Subject: Re: Checkout problems Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Url: X-Operating-System: FreeBSD 12.2-STABLE amd64 X-Host-Uptime: 2:58PM up 7 days, 7:50, 5 users, load averages: 0.29, 0.23, 0.26 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, 24 Dec 2020 14:02:36 -0000 Hi David, On Wed, Dec 23, 2020 at 08:39:20AM -0800, David Wolfskill wrote: > On Wed, Dec 23, 2020 at 05:35:26PM +0100, Gordon Bergling wrote: > > Fellow developers, > > > > I try to checkout the new FreeBSD git sources, but even afer after > > 3 days I had not luck. > > > > The command I tried was the following, > > > > git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/src.git > > > > But even on freefall, it wasn't successful. > > > > Has anyone an idea about what the problem my be? > > > > --Gordon > > .... > > What response(s) (if any) are you seeing? If no response, does ^T > (SIGINFO) tell you anything? > > In my case, I had no issues, but my approach was slightly different > (ref. https://www.catwhisker.org/~david/FreeBSD/repo-sync.html). > > Peace, > david > -- > David H. Wolfskill david@catwhisker.org > "Dismissing reality doesn't make it go away." > - Rajiv Shah, Rockefeller Foundation president > > See https://www.catwhisker.org/~david/publickey.gpg for my public key. ^T reports the following. The checkout process just starts and then stuck somewhere in the middle of it, mostly around 300 - 400 MB (30%). load: 0.24 cmd: git 36260 [piperd] 2956.09r 16.70u 6.11s 0% 344732k The link you posted leads to an 404. --Gordon From owner-freebsd-git@freebsd.org Thu Dec 24 14:07: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 A8B904C615D for ; Thu, 24 Dec 2020 14:07:49 +0000 (UTC) (envelope-from gbe@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 4D1sNP4N8yz4ZcG for ; Thu, 24 Dec 2020 14:07:49 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9474D4C60F2; Thu, 24 Dec 2020 14:07:49 +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 944064C623D for ; Thu, 24 Dec 2020 14:07:49 +0000 (UTC) (envelope-from gbe@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 4D1sNP3sCsz4Zl6; Thu, 24 Dec 2020 14:07:49 +0000 (UTC) (envelope-from gbe@freebsd.org) Received: from localhost (p548616ad.dip0.t-ipconnect.de [84.134.22.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 1D7052147; Thu, 24 Dec 2020 14:07:49 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Thu, 24 Dec 2020 15:07:47 +0100 From: Gordon Bergling To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org, David Wolfskill Subject: Re: Checkout problems 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-Url: X-Operating-System: FreeBSD 12.2-STABLE amd64 X-Host-Uptime: 2:58PM up 7 days, 7:50, 5 users, load averages: 0.29, 0.23, 0.26 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, 24 Dec 2020 14:07:49 -0000 Hi Uli, On Wed, Dec 23, 2020 at 05:49:03PM +0100, Ulrich Spörlein wrote: > On Wed, Dec 23, 2020 at 5:39 PM David Wolfskill > wrote: > > > On Wed, Dec 23, 2020 at 05:35:26PM +0100, Gordon Bergling wrote: > > > Fellow developers, > > > > > > I try to checkout the new FreeBSD git sources, but even afer after > > > 3 days I had not luck. > > > > > > The command I tried was the following, > > > > > > git clone -o freebsd --config > > remote.freebsd.fetch='+refs/notes/*:refs/notes/*' > > https://git.freebsd.org/src.git > > > > > > But even on freefall, it wasn't successful. > > > > > > Has anyone an idea about what the problem my be? > > > > > Well, you're not showing us any logs, so it's hard to tell for sure. Please > add -v (maybe two or three times) and actually show us the error you are > getting. > > Cheers > Uli > > PS: any reason you need a checkout on freefall itself? I tried the checkout with '-vvv' applied. A shortened log is the following, [...] want 9399617194d8919c03460eeeb49aa5e7bb930047 (refs/tags/vendor/zstd/1.4.1) want e103cc7d192afc1de4ebc29e6e467651c6436112 (refs/tags/vendor/zstd/1.4.2) want 41746347b22e30608746cf036cb3b36bc24d2ab3 (refs/tags/vendor/zstd/1.4.4) want f57d3351ea7669d274e6763623c24bc2f14e0bcb (refs/tags/vendor/zstd/1.4.5) done POST git-upload-pack (gzip 164615 to 81924 bytes) remote: Enumerating objects: 4249437, done. remote: Counting objects: 100% (4249437/4249437), done. remote: Compressing objects: 100% (829788/829788), done. Receiving objects: 14% (594922/4249437), 152.45 MiB | 6.29 MiB/s Afterwards it just stalls and sometimes the checkout process went to about 30% before it stalls. The checkout on freefall was just a test that my network connection isn't problem. --Gordon From owner-freebsd-git@freebsd.org Thu Dec 24 16:57:10 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 573FE4CB01D for ; Thu, 24 Dec 2020 16:57:10 +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 4D1x7p20zpz4mjb for ; Thu, 24 Dec 2020 16:57:10 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 44C5F4CAFA2; Thu, 24 Dec 2020 16:57:10 +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 448814CA971 for ; Thu, 24 Dec 2020 16:57:10 +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 4D1x7p0LJLz4mWy; Thu, 24 Dec 2020 16:57:09 +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 0BOGuu8r051645 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 24 Dec 2020 17:56:56 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Thu, 24 Dec 2020 17:56:56 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Gordon Bergling Cc: git@freebsd.org, David Wolfskill Subject: Re: Checkout problems Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D1x7p0LJLz4mWy 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, 24 Dec 2020 16:57:10 -0000 On Thu, 2020-12-24 at 15:07:47 +0100, Gordon Bergling wrote: >Hi Uli, > >On Wed, Dec 23, 2020 at 05:49:03PM +0100, Ulrich Spörlein wrote: >> On Wed, Dec 23, 2020 at 5:39 PM David Wolfskill >> wrote: >> >> > On Wed, Dec 23, 2020 at 05:35:26PM +0100, Gordon Bergling wrote: >> > > Fellow developers, >> > > >> > > I try to checkout the new FreeBSD git sources, but even afer after >> > > 3 days I had not luck. >> > > >> > > The command I tried was the following, >> > > >> > > git clone -o freebsd --config >> > remote.freebsd.fetch='+refs/notes/*:refs/notes/*' >> > https://git.freebsd.org/src.git >> > > >> > > But even on freefall, it wasn't successful. >> > > >> > > Has anyone an idea about what the problem my be? >> > >> > >> Well, you're not showing us any logs, so it's hard to tell for sure. Please >> add -v (maybe two or three times) and actually show us the error you are >> getting. >> >> Cheers >> Uli >> >> PS: any reason you need a checkout on freefall itself? > >I tried the checkout with '-vvv' applied. A shortened log is the following, > >[...] >want 9399617194d8919c03460eeeb49aa5e7bb930047 (refs/tags/vendor/zstd/1.4.1) >want e103cc7d192afc1de4ebc29e6e467651c6436112 (refs/tags/vendor/zstd/1.4.2) >want 41746347b22e30608746cf036cb3b36bc24d2ab3 (refs/tags/vendor/zstd/1.4.4) >want f57d3351ea7669d274e6763623c24bc2f14e0bcb (refs/tags/vendor/zstd/1.4.5) >done >POST git-upload-pack (gzip 164615 to 81924 bytes) >remote: Enumerating objects: 4249437, done. >remote: Counting objects: 100% (4249437/4249437), done. >remote: Compressing objects: 100% (829788/829788), done. >Receiving objects: 14% (594922/4249437), 152.45 MiB | 6.29 MiB/s > >Afterwards it just stalls and sometimes the checkout process went to about 30% before it >stalls. > >The checkout on freefall was just a test that my network connection isn't problem. Strange. So I had less than stellar performance when checking out via https:// myself, but never a stall or an abort. I logged into freefall just now and ran the above command and it fetched with 34MB/s and took an overall of 2:45 min. Did you just get very unlucky wrt. timing? I could imagine a lot of folks are checking out right now ... hth Uli From owner-freebsd-git@freebsd.org Thu Dec 24 17:00:12 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 59CC94CB093 for ; Thu, 24 Dec 2020 17:00:12 +0000 (UTC) (envelope-from jbeich@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 4D1xCJ29nDz4mk5 for ; Thu, 24 Dec 2020 17:00:12 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1608829212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Xv3i5ugtrPG0f7bo/M5cq7XH1Pe1znUYe8m6cI8JYQo=; b=AiyaJ1YzYkzsrwhr/9rRXqC4O2/KtU4GTDz3uoiHh0JENrlVrNPv+9eyCbUUNnlWVzKYJQ cJPjvLaxqS2zwfPZQulkMbW6MQ+TwF8Xnqmkh4xUIlXxyi+osLquSXNn4bZ9hH+XGFFEz2 XNRdKrp2Un3EeuM877upjoES6mILIndkbCD7tGzKAHmMyUMwtckAnyGy5AP/e03rfJjbe4 PcVJ830jsed1yljRP9axJ/GA/2EfZwqeie1Pv28BeHjn1+KQmcFjkEf2iH65tJOSJQjNgt GZDhFmo76R14HQSvNh8+ZOvt/HCpLiMstxMvtgXSogkocn5uo3uOaEVgY6koUQ== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 3EA1214167; Thu, 24 Dec 2020 17:00:12 +0000 (UTC) From: Jan Beich To: freebsd-git@freebsd.org Subject: Cross-repo access vs. repo-dev playground Date: Thu, 24 Dec 2020 18:00:10 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1608829212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Xv3i5ugtrPG0f7bo/M5cq7XH1Pe1znUYe8m6cI8JYQo=; b=f1vwCY0Bt/CdRSDTQM7HXxJJsRIhrNJ2dutMlKjmg6NvQM/nn5xAR6l8XOkGKg7jHhkDz1 +KE30cTvafsgm4NdC6LwkPijuWspI9X2/Ytw3ACgVARctaZHoNVzx4h34rGeCW2uZzvIQ5 Ei6IiwrROqUyGymrk33u6/iZp2dvsRYcrCi25FXrAh+/B1nSimxmTpoXs2u9YhmJug+qJb PjfeTN8GcF9+teUj8XJ3suPVbfn4F/b+a8nWWi0faWI8qCPaUU9gxppab2VAgh6ftQAHLi BQea5Pekdcsblh8FhMBtEv/tdRitc/Cm9dwqC/rT78j00iqx6w8hs3BR6W/gCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1608829212; a=rsa-sha256; cv=none; b=w+XZjIVsBQnwdEc+MOez8AgyMdQ4mRVNlGV5sohai08RQkOcrE25gFfp+n093a+vA6p0CW AmEZH8yjMzqJV/csW+q5W1WChX7E03jbke6jF9AAGXXUwJx9gXr0aT/AgEYhQRqebK5j3Y KsmdwbkcDFprxaXzYP2g3NwdOluMQZ0xd5py9/XQpgY+NN1mlRCgGH0o83IXUe73DBmgk+ 6j4YFXVhB8qm3IypEDWMmZmi6vI7/j94728A2vMdnuDTXnYCHqwcWFGMmNwvN72giNBTMa m+nRt8KgIXGJwRtwYBLQJGgKEuKy4UHT+2+zvNgRWw7TmbOG5cI/5leombxt8Q== 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: Thu, 24 Dec 2020 17:00:12 -0000 Having only ports/ bit it seems my ~/.gitconfig is correct, so I've pushed https://cgit-dev.freebsd.org/ports/commit/?h=57b1cfb8f79b but pushing to other *-dev repos fails. Am I missing something? $ cd /path/to/freebsd-doc $ ee share/pgpkeys/jbeich.key $ git commit -m "pgpkeys: update my key" !$ $ git push freebsd FATAL -- ACCESS DENIED Repo doc User jbeich Stage Before git was called Operation Repo write FATAL: W any doc jbeich DENIED by fallthru (or you mis-spelled the reponame) fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. $ git remote -v freebsd git@repo-dev.FreeBSD.org:doc.git (fetch) freebsd git@repo-dev.FreeBSD.org:doc.git (push) origin https://git.FreeBSD.org/doc.git (fetch) origin https://git.FreeBSD.org/doc.git (push) From owner-freebsd-git@freebsd.org Thu Dec 24 17:43: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 C7A144CBBCB for ; Thu, 24 Dec 2020 17:43:06 +0000 (UTC) (envelope-from lwhsu@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 4D1y8p5J9sz4pgb; Thu, 24 Dec 2020 17:43:06 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com [209.85.219.170]) (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 A92F43C22; Thu, 24 Dec 2020 17:43:06 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f170.google.com with SMTP id v67so2768867ybi.1; Thu, 24 Dec 2020 09:43:06 -0800 (PST) X-Gm-Message-State: AOAM532YZY6oLENeaTrwU9TauXQ5SGw3InMbf9KQGLv3sabPKIhf2CD0 AFwomEpLrw8UjVlFTAR+mQPWOlkNuxtTvPC4wLU= X-Google-Smtp-Source: ABdhPJy/u2c9R7UFxdO4hJKBd6/naIoJfkNov6n6GnBsY1i8o0AqOvx0ZhF6xLz1/g+y1n9y/JGMWgOrUyzXNIyvC7Q= X-Received: by 2002:a25:c107:: with SMTP id r7mr33143488ybf.492.1608831786047; Thu, 24 Dec 2020 09:43:06 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Li-Wen Hsu Date: Fri, 25 Dec 2020 01:42:54 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Cross-repo access vs. repo-dev playground To: Jan Beich Cc: freebsd-git@freebsd.org 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, 24 Dec 2020 17:43:06 -0000 On Fri, Dec 25, 2020 at 1:00 AM Jan Beich wrote: > > Having only ports/ bit it seems my ~/.gitconfig is correct, so > I've pushed https://cgit-dev.freebsd.org/ports/commit/?h=57b1cfb8f79b > but pushing to other *-dev repos fails. > > Am I missing something? > > $ cd /path/to/freebsd-doc > $ ee share/pgpkeys/jbeich.key > $ git commit -m "pgpkeys: update my key" !$ > $ git push freebsd > FATAL -- ACCESS DENIED > Repo doc > User jbeich > Stage Before git was called > Operation Repo write > > FATAL: W any doc jbeich DENIED by fallthru > (or you mis-spelled the reponame) > fatal: Could not read from remote repository. > > Please make sure you have the correct access rights > and the repository exists. > > $ git remote -v > freebsd git@repo-dev.FreeBSD.org:doc.git (fetch) > freebsd git@repo-dev.FreeBSD.org:doc.git (push) > origin https://git.FreeBSD.org/doc.git (fetch) > origin https://git.FreeBSD.org/doc.git (push) Cross repo commit should be accepted as it is before. I suspect this is some timing issue when I was testing configuration of the staging (-dev) environment. Please try again and see if it still has issues. (I have src and ports bits, but I did push to doc repo as the first git commit :-) Best, Li-Wen From owner-freebsd-git@freebsd.org Thu Dec 24 18:24:37 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 130514CCF81 for ; Thu, 24 Dec 2020 18:24:37 +0000 (UTC) (envelope-from jbeich@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 4D1z4j017dz4rqh; Thu, 24 Dec 2020 18:24:37 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1608834277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lEgqzjnE4TzbUKM+B5vgR8A5/OPlmepZFmW/prDs79o=; b=T2aXm8X9QQO9hw/XzqwmV8RPeoSOMYWgUY3jvH/EmHfvpUwY5XJyZiN/b7o1KtruhTVLGz nUTzwqlxqrOCrMFWtgjL71d5Dp1J2DeIOvVX3KhoKY8gLpKI0WT4NADAFtSCvtbPvQs5Q7 vx3QJ1hOp/kumbj340WAy4BkS7btjn0WbD48AUddoF7NB/M2sSOGR0Gev2IUkCk+EEYzHd 04rR/6FXOL5xZHx1rsDApQj4QM8cHERjzQFjfv9w1NpgD8ateH5i1OS3tSli6DNkBkUIFk 9t+B8FpTdILaCSu3GJZz8eVhhMcR6UR6PLwcr1BSpWig3jcBNnAhW5Kt3nje4g== Received: by freefall.freebsd.org (Postfix, from userid 1354) id E992C154A1; Thu, 24 Dec 2020 18:24:36 +0000 (UTC) From: Jan Beich To: Li-Wen Hsu Cc: freebsd-git@freebsd.org Subject: Re: Cross-repo access vs. repo-dev playground References: Date: Thu, 24 Dec 2020 19:24:34 +0100 In-Reply-To: (Li-Wen Hsu's message of "Fri, 25 Dec 2020 01:42:54 +0800") Message-ID: MIME-Version: 1.0 Content-Type: text/plain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1608834277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lEgqzjnE4TzbUKM+B5vgR8A5/OPlmepZFmW/prDs79o=; b=tVTSAVKjBs6OuOdU2EQtA0DSt+wJyfhdZs4BKc7NdY9R9SEu77pSrS0Q/Fl7AsejR1TuJQ QDLAXLKEiK+6hDUUGBMpphi82n++xCEerIy2/Mc9rODeXLywZhqMAbEPTwfpUdovcglqzT lYTpfWiNO+h6cgyErZHVgECSy7ux+kggB79kfYNcuejvoMnpN5TQ9+IzdLJDwqumUFerc6 SMKF06UqhmDp19vfv3XJm+NYkmMXRRYtL0qr90lwzXNcHFZKqaERuChmasHJ1FGgFVZuVs EG3zvJefe2TTuksou/8qNiXezMHgNnSSsGmYhYe9Lkbmh6/yqLPNFaIUcFkfSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1608834277; a=rsa-sha256; cv=none; b=BrlFae//sHoKfdUeQjeOJ90FgTeQt0kurCPKbtt0PYc6QO3scZWaPnmUnDOcf8iCkLrGGb R0qALU9JddbQjuzxwsOd8+kkA64ZbgzhJYJ4u4iXiBKq+/gR5wVRLh7RAFCe1Xbe4TCxlU qH3uy4hLY6d0V2himk0yNH/umfhQ4hUV4KHeGIZ2q+hj9q5+MQLGXhGfXbdHCFi/vS4uiU TKyYQdYHBjdUv/H1AMO7xs0cikpooc6QmZSNGDZhWIToKOHW/7p622eCvNJjB85R+MPuL+ nDjG+7fgUU0jlVcQ17wfD5jhvaMcqBfbFyHWAB8U3tfs3mxViEuRdpUssYhG+g== 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: Thu, 24 Dec 2020 18:24:37 -0000 Li-Wen Hsu writes: > On Fri, Dec 25, 2020 at 1:00 AM Jan Beich wrote: > >> >> Having only ports/ bit it seems my ~/.gitconfig is correct, so >> I've pushed https://cgit-dev.freebsd.org/ports/commit/?h=57b1cfb8f79b >> but pushing to other *-dev repos fails. >> >> Am I missing something? >> >> $ cd /path/to/freebsd-doc >> $ ee share/pgpkeys/jbeich.key >> $ git commit -m "pgpkeys: update my key" !$ >> $ git push freebsd >> FATAL -- ACCESS DENIED >> Repo doc >> User jbeich >> Stage Before git was called >> Operation Repo write >> >> FATAL: W any doc jbeich DENIED by fallthru >> (or you mis-spelled the reponame) >> fatal: Could not read from remote repository. >> >> Please make sure you have the correct access rights >> and the repository exists. >> >> $ git remote -v >> freebsd git@repo-dev.FreeBSD.org:doc.git (fetch) >> freebsd git@repo-dev.FreeBSD.org:doc.git (push) >> origin https://git.FreeBSD.org/doc.git (fetch) >> origin https://git.FreeBSD.org/doc.git (push) > > Cross repo commit should be accepted as it is before. I suspect this > is some timing issue when I was testing configuration of the staging > (-dev) environment. Please try again and see if it still has issues. > (I have src and ports bits, but I did push to doc repo as the first > git commit :-) How long to wait? I've re-cloned but still hit the same error. $ ssh freefall.freebsd.org $ git clone https://git.FreeBSD.org/doc.git $ rm ~/.gitconfig $ git config --global user.email jbeich@FreeBSD.org $ git config --global user.name "Jan Beich" $ cd doc $ git remote add freebsd git@repo-dev.FreeBSD.org:doc.git $ echo '' >>share/pgpkeys/jbeich.key $ git commit -m "pgpkeys: update my key" share/pgpkeys/jbeich.key $ git push freebsd FATAL -- ACCESS DENIED Repo doc User jbeich Stage Before git was called Operation Repo write FATAL: W any doc jbeich DENIED by fallthru (or you mis-spelled the reponame) fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. From owner-freebsd-git@freebsd.org Thu Dec 24 18:38: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 1BF824CD369 for ; Thu, 24 Dec 2020 18:38:49 +0000 (UTC) (envelope-from jbeich@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 4D1zP50Hczz4t2v; Thu, 24 Dec 2020 18:38:49 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1608835129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ikWewznm4IxYpjrv5yGFupXM2/qSThyGGgbMjntkB/A=; b=oXL3TJiCLoVy5535gzfWrrC+NsqsG/HOyJavEKwp1fkGoCD9XujxF16VmvNksamOVhX9bT U8ATW85SivGXRbyS9q2KDM80bDoEM+aGLwVS1ae+OkfnJokP3peNd29hblTWbYgXt+sb1x bW7HV5xL+GIG40ObGv/Q38pGrTW9lmvjfmCV4z2a/PqdXoJ40zsPsxi97iYHxpNrTXV2lY GvUgCGhKcJiV1fZIMmGXdyyaAIxjeWCrgc7vVPD0CWuT02bNZiWYD3IiQ084ctsTrE1CkD 1WxcCPDTR390tW64IJu8apXdB/8wZfJxPBynSQS11kqN6eKOu+VyUqSN1xVQeA== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 0135515A1A; Thu, 24 Dec 2020 18:38:48 +0000 (UTC) From: Jan Beich To: Li-Wen Hsu Cc: freebsd-git@freebsd.org Subject: Re: Cross-repo access vs. repo-dev playground References: Date: Thu, 24 Dec 2020 19:38:46 +0100 In-Reply-To: (Jan Beich's message of "Thu, 24 Dec 2020 19:24:34 +0100") Message-ID: <7dp7-qcax-wny@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1608835129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ikWewznm4IxYpjrv5yGFupXM2/qSThyGGgbMjntkB/A=; b=mVfoO9vuM2/ZQ3oPce3XUPsLQSCs78nP8qftl/qGawDhW0rRYOsN1br3pmXPcspHWiTyVG TEnFlHpt5rHmH2i70tDq+7wZGGuRTz5Ig6RFK/Aoyqn/MaAqoYdpnhFq0SyiMhgOV1M2/J B5SR0N0sOcywLkPXUeKvMcvT2HMff7pGOSei9Pqw1wMgX2z9O9XNY2H99oCw3k9fpAlAga Zy99iFaOQmjKD3Yl671eYoj3lNFR15UEKrgQFFfYEw1ZzrBZSHcO1AtKgzJt8Jrt4/KpFJ XcmQAhO/waQsLox40aHpGAiYWDSKt2LoAAOdFJ6vPDMmsvJzXfO0wC2ukvVA4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1608835129; a=rsa-sha256; cv=none; b=I8kHxHzXfJ42lLEajjgo9GIs09IJPPgCmP06MXtcBjx8d5DH5sONrMJs1iKfynXGuA0WB8 ZrciUZkmnPVDlFs7x8JAbh9ruL622kgOJ6ieGD+e8vumBbZ4CqeS6zPQuTfvo8W+dGEPkz Lu3YCQTPX9eejPbBJi7n8N0Itthp5lRg1x6HxdBssKJNFsyW2Yq2PpddLll5wA+hgXMMQw z5aGTniVpDbwiP2V10j2mkdxMPi/dwxrllP533v+JsSJd9pv0ZBthMgaFIr+ruUtcm0O5y lOvR6vMdN56stKUgXbQ35C5pS0Ty3a9ILfODTqMO+i5xdxJCPDKgSo42e+qKsA== 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: Thu, 24 Dec 2020 18:38:49 -0000 Jan Beich writes: > Li-Wen Hsu writes: > >> On Fri, Dec 25, 2020 at 1:00 AM Jan Beich wrote: >> >>> >>> Having only ports/ bit it seems my ~/.gitconfig is correct, so >>> I've pushed https://cgit-dev.freebsd.org/ports/commit/?h=57b1cfb8f79b >>> but pushing to other *-dev repos fails. >>> >>> Am I missing something? >>> >>> $ cd /path/to/freebsd-doc >>> $ ee share/pgpkeys/jbeich.key >>> $ git commit -m "pgpkeys: update my key" !$ >>> $ git push freebsd >>> FATAL -- ACCESS DENIED >>> Repo doc >>> User jbeich >>> Stage Before git was called >>> Operation Repo write >>> >>> FATAL: W any doc jbeich DENIED by fallthru >>> (or you mis-spelled the reponame) >>> fatal: Could not read from remote repository. >>> >>> Please make sure you have the correct access rights >>> and the repository exists. >>> >>> $ git remote -v >>> freebsd git@repo-dev.FreeBSD.org:doc.git (fetch) >>> freebsd git@repo-dev.FreeBSD.org:doc.git (push) >>> origin https://git.FreeBSD.org/doc.git (fetch) >>> origin https://git.FreeBSD.org/doc.git (push) >> >> Cross repo commit should be accepted as it is before. I suspect this >> is some timing issue when I was testing configuration of the staging >> (-dev) environment. Please try again and see if it still has issues. >> (I have src and ports bits, but I did push to doc repo as the first >> git commit :-) > > How long to wait? I've re-cloned but still hit the same error. Nevermind. Worked fine just now, see https://cgit-dev.freebsd.org/doc/commit/?h=3fe83a040cae From owner-freebsd-git@freebsd.org Thu Dec 24 18:46:21 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 BE7F54CD8AB for ; Thu, 24 Dec 2020 18:46:21 +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 4D1zYn4xKQz4t6Q; Thu, 24 Dec 2020 18:46:21 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) (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 977084660; Thu, 24 Dec 2020 18:46:21 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f176.google.com with SMTP id w127so2830361ybw.8; Thu, 24 Dec 2020 10:46:21 -0800 (PST) X-Gm-Message-State: AOAM533Cwl/RPKz45oTHIEO7la12MUT4XQig0H+dgxOGkRUcBTp4XJOd 03AlOy8cljuR2Kxv7jX8sR6kU5fd5XAr+xv8YqI= X-Google-Smtp-Source: ABdhPJyl3Yv9wzSYscmI6e3wWX6XipX0G5M6p2ouLb4nVrpQX9LPvoA8U62gxzgUIJ9iAFJUWWzuQqI21B7XssYNUrU= X-Received: by 2002:a25:7e05:: with SMTP id z5mr24357921ybc.497.1608835581160; Thu, 24 Dec 2020 10:46:21 -0800 (PST) MIME-Version: 1.0 References: <7dp7-qcax-wny@FreeBSD.org> In-Reply-To: <7dp7-qcax-wny@FreeBSD.org> From: Li-Wen Hsu Date: Fri, 25 Dec 2020 02:46:09 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Cross-repo access vs. repo-dev playground To: Jan Beich Cc: freebsd-git@freebsd.org 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, 24 Dec 2020 18:46:21 -0000 On Fri, Dec 25, 2020 at 2:38 AM Jan Beich wrote: > > Jan Beich writes: > > > Li-Wen Hsu writes: > > > >> On Fri, Dec 25, 2020 at 1:00 AM Jan Beich wrote: > >> > >>> > >>> Having only ports/ bit it seems my ~/.gitconfig is correct, so > >>> I've pushed https://cgit-dev.freebsd.org/ports/commit/?h=57b1cfb8f79b > >>> but pushing to other *-dev repos fails. > >>> > >>> Am I missing something? > >>> > >>> $ cd /path/to/freebsd-doc > >>> $ ee share/pgpkeys/jbeich.key > >>> $ git commit -m "pgpkeys: update my key" !$ > >>> $ git push freebsd > >>> FATAL -- ACCESS DENIED > >>> Repo doc > >>> User jbeich > >>> Stage Before git was called > >>> Operation Repo write > >>> > >>> FATAL: W any doc jbeich DENIED by fallthru > >>> (or you mis-spelled the reponame) > >>> fatal: Could not read from remote repository. > >>> > >>> Please make sure you have the correct access rights > >>> and the repository exists. > >>> > >>> $ git remote -v > >>> freebsd git@repo-dev.FreeBSD.org:doc.git (fetch) > >>> freebsd git@repo-dev.FreeBSD.org:doc.git (push) > >>> origin https://git.FreeBSD.org/doc.git (fetch) > >>> origin https://git.FreeBSD.org/doc.git (push) > >> > >> Cross repo commit should be accepted as it is before. I suspect this > >> is some timing issue when I was testing configuration of the staging > >> (-dev) environment. Please try again and see if it still has issues. > >> (I have src and ports bits, but I did push to doc repo as the first > >> git commit :-) > > > > How long to wait? I've re-cloned but still hit the same error. > > Nevermind. Worked fine just now, see https://cgit-dev.freebsd.org/doc/commit/?h=3fe83a040cae Good to know it works for you. You replied faster than me. Thanks for your report and I did find another bug in the access checker. Should be fixed now. Best, Li-Wen From owner-freebsd-git@freebsd.org Sat Dec 26 03:29: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 9AFCA4D4E58 for ; Sat, 26 Dec 2020 03:29:49 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D2q7K3tXFz4m5w for ; Sat, 26 Dec 2020 03:29:49 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 855474D4F29; Sat, 26 Dec 2020 03:29:49 +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 851E74D4F28 for ; Sat, 26 Dec 2020 03:29:49 +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 4D2q7K3JcZz4lsQ for ; Sat, 26 Dec 2020 03:29:49 +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 4E1FC232C2 for ; Sat, 26 Dec 2020 03:29:49 +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) 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 4D2q7G4QXgz1cj1 for ; Sat, 26 Dec 2020 03:29:46 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4D2q7F3Gydz62kt; Sat, 26 Dec 2020 03:29:45 +0000 (UTC) From: Philip Paeps To: git@freebsd.org Subject: git log --graph in the face of vendor imports Date: Sat, 26 Dec 2020 11:29:41 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5757) Message-ID: MIME-Version: 1.0 Content-Type: text/plain; format=flowed; markup=markdown 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: Sat, 26 Dec 2020 03:29:49 -0000 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? Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Sat Dec 26 10:23:00 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 22FD04B4C19 for ; Sat, 26 Dec 2020 10:23:00 +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 4D30J40Vp7z3Mf5 for ; Sat, 26 Dec 2020 10:23:00 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 110914B4C17; Sat, 26 Dec 2020 10:23:00 +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 10D5E4B4B9D for ; Sat, 26 Dec 2020 10:23:00 +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 4D30J35wfdz3MbT; Sat, 26 Dec 2020 10:22:59 +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 0BQAMvli005619 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 26 Dec 2020 11:22:57 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 26 Dec 2020 11:22:57 +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: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D30J35wfdz3MbT X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 10:23:00 -0000 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! The history was massively streamlined to get fewer merge commits and git no longer core dumps when rendering the full thing with the proper flags. Another fun fact, we have merge commits in the repo with upwards of 6 parents or so. [alias] glog = log --graph --pretty=format:'%Cred%h %C(green)%t %Creset -%C(yellow)%d%Creset %s %Cgreen(%an, %cr, %ad)%Creset' --date=short gnlog = log --graph --pretty=format:'%Cred%h %C(green)%t %Creset %C(red)%ad %Creset-%C(yellow)%d%Creset %s %n %N %-GG' --date=short % git gnlog % git glog error: git died of signal 11 Someoneâ„¢ should debug that ... Uli From owner-freebsd-git@freebsd.org Sat Dec 26 10:52:59 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 854684B543F for ; Sat, 26 Dec 2020 10:52:59 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D30yg2XVGz3P8l for ; Sat, 26 Dec 2020 10:52:59 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 570ED4B4FFF; Sat, 26 Dec 2020 10:52:59 +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 56D654B560A for ; Sat, 26 Dec 2020 10:52:59 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) (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 4D30yg1rYRz3PBv; Sat, 26 Dec 2020 10:52:59 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-yb1-f174.google.com with SMTP id y128so5758021ybf.10; Sat, 26 Dec 2020 02:52:59 -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=bJ5JWajMeFv/fvxzPGrQLhv5sKAW2wx0HvfNjShVuws=; b=AprLmcQ1OydTcNe8RCv9aOuKzr7sMD4bv1qupLNMf+kaizxrrCsuVjI1wd39dRRgRY SpNr5f7J81gDbBqG4JuVT7rVe8LR2Whv7JjdH0zf709vTN9ieWypdKV/JCkvRcxmDAEG wxiXpTLckGD9kp6AmjO4Vexx9IaaX90K1OD3M1QacGKyb8UfRIN3wsZDx2CcCdGqvKbN Lykb1UNMbyvyCYTwYzq0IfSWO1y9yCPtB9HNTv/exco6zi2fQzbUJKJ7fNsaC/H7QXts TGzljkttzM5fRDKCGJysJ9XuKAuR4jpJWYaKwXctmgeiU/ekZ50dZmiObGEdzIPGgoRH EToA== X-Gm-Message-State: AOAM533oOVoefADSJLb+HxnLvcF/fxOyJHKb90it4WMAoIJn79Hh4yZF zkdku00rdn86y+YTux72MAc1xUaKshgFSwcpczm3ZJVy2MifSA== X-Google-Smtp-Source: ABdhPJx/k7ZN65yTD+s1Dx2CDAmIXUJLG1Xap0YT9aD+UtHD8KsU0hbhmFHpKoOZtTiIWzsC73l5XYWTdqQ22Xh311A= X-Received: by 2002:a05:6902:728:: with SMTP id l8mr52905400ybt.399.1608979977151; Sat, 26 Dec 2020 02:52:57 -0800 (PST) MIME-Version: 1.0 References: <202012251825.0BPIPntO091296@gitrepo.freebsd.org> <751dc337-b4dc-52de-f2ee-a843eb5e43c5@FreeBSD.org> <20be96cf-1cda-d914-5759-aae90169d8c0@yuripv.dev> <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org> In-Reply-To: <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Sat, 26 Dec 2020 11:52:45 +0100 Message-ID: Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): To: Stefan Esser , lwhsu@freebsd.org, git@freebsd.org Cc: Yuri Pankov , Warner Losh X-Rspamd-Queue-Id: 4D30yg1rYRz3PBv 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" 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: Sat, 26 Dec 2020 10:52:59 -0000 On Sat, Dec 26, 2020 at 9:50 AM Stefan Esser wrote: > Am 26.12.20 um 06:36 schrieb Yuri Pankov: > > Warner Losh wrote: > >> I was rather hoping we'd land around using the old commit message, as > >> is, and let the cherry-picked message at the end signify the MFC, at > >> least for simple cherry-picks. > >> > >> For squashed ones, a sensible new summary line and an appropriate commit > >> message would be good as well... Where appropriate is approximately what > >> we do today, with all the hashes that we're merging mentioned. > > > > I am following the docs (and those make sense to me), `git cherry-pick > > -x` is just enough; if it's direct commit, I'd add a note. So yes, any > > commit to stable/* is MFC, unless stated otherwise. > > I'd like to get back the branch in the subject line, not only the first > line of the commit message: > > It used to be: "svn commit: r368706 - in stable/12:", but now we only > have the git hash in the subject line and "The branch ... has been > updated ..." in the first line of the commit message. > > Filtering out commits to -STABLE/RELENG is possible via "X-Git-Refname" > (I hope this header line will be kept in exactly the current form to > not require later adjustment of the filter), but it is no longer easy > to see whether a commit affects -CURRENT by just looking at the subject > line of the commit message ... > > Regards, STefan > > I agree. Especially since you cannot filter on X-Git-Refname in Gmail :( Having the subject be: git: hash - branch-name - one-line-subject would be ideal and mimic previous behaviour better. Cheers Uli From owner-freebsd-git@freebsd.org Sat Dec 26 12:38:13 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 30AD54B8945 for ; Sat, 26 Dec 2020 12:38:13 +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 4D33J50whyz3kVV for ; Sat, 26 Dec 2020 12:38:13 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 1DFEA4B8944; Sat, 26 Dec 2020 12:38:13 +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 1DC414B88A7 for ; Sat, 26 Dec 2020 12:38:13 +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 4D33J44vN3z3kXH for ; Sat, 26 Dec 2020 12:38:12 +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 0BQCcAWO014022 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sat, 26 Dec 2020 13:38:10 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 26 Dec 2020 13:38:10 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: git@freebsd.org Subject: Please review: suggested final merge commit on the legacy repo Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D33J44vN3z3kXH 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:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 12:38:13 -0000 Hi folks, please have a look at the suggested merge commit, that merges master and main, which should allow folks that have significant work on the old hashes to: git remote add freebsd-legacy https://github.com/freebsd/freebsd-legacy.git && git fetch freebsd-legacy git merge freebsd-legacy/master (this should work mostly conflict free git merge 3cc0c0d66a065554459bd2f9b4f80cc07426464a (this is the main at the state of what legacy master is) and then they have a shared ancestry (though twice the commits). For rebase based workflows, rebasing onto legacy master should similarly work mostly conflict free, then they should be able to rebase onto 3cc0c0d66a065554459bd2f9b4f80cc07426464a sans any conflicts and finally rebase onto freebsd/main with the usual set of newly introduced conflicts. The wiki still needs updates to the final hashes now, something I'll do at some point. Ideally, we can push this final commit to master before New Years and then we can start mirroring the new main/stable/releng into GH. master will be garbage collected at some future date. I do not think doc and ports should receive similar treatments unless people can show me evidence that this is truly needed (and people can't figure this out from the provided instructions already). Cheers Uli From owner-freebsd-git@freebsd.org Sat Dec 26 18:12:20 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 0274F4BF981 for ; Sat, 26 Dec 2020 18:12:20 +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 4D3Bjb6gNmz4XWn for ; Sat, 26 Dec 2020 18:12:19 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 D813529253 for ; Sat, 26 Dec 2020 18:12:19 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f180.google.com with SMTP id h4so5926396qkk.4 for ; Sat, 26 Dec 2020 10:12:19 -0800 (PST) X-Gm-Message-State: AOAM530NggFCn1J1BxUEymgst9hMu1PORBunBG4bOqqhhq+CXrdGhhI/ lT8VsORs7vWM8ayeP3aF6MlQLwW26Hu9qb7DeFQ= X-Google-Smtp-Source: ABdhPJwIDaT8DNVLTQekZCnNlN5GdEf8Gpr0jXvTlzosMgt0uJvOpO0Pgy9NtiTw8XB1HvU3lvx2EZ0xdXS2KdEtbH0= X-Received: by 2002:a37:a342:: with SMTP id m63mr39025778qke.120.1609006339338; Sat, 26 Dec 2020 10:12:19 -0800 (PST) MIME-Version: 1.0 From: Kyle Evans Date: Sat, 26 Dec 2020 12:12:02 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: stable branch notes To: freebsd-git@freebsd.org 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: Sat, 26 Dec 2020 18:12:20 -0000 Hello! So Warner's got a git2svn exporter that will keep svn up-to-date, but will it backfill stable/12 notes (so to speak, if it's even possible) to indicate the svn revision that a git commit ended up with? I'm staring at the EN template and trying to figure out if I'll be able to use the cgit interface to fill it out or if I'd need to use svnweb for this going forward, assuming that SA/EN will continue to refer to svn commits to match the release process for those branches. Thanks, Kyle Evans From owner-freebsd-git@freebsd.org Sat Dec 26 18:26:50 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 55E4A4C005C for ; Sat, 26 Dec 2020 18:26:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 4D3C2L1sRjz4Yb3 for ; Sat, 26 Dec 2020 18:26:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x831.google.com with SMTP id c14so4576603qtn.0 for ; Sat, 26 Dec 2020 10:26:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=O3ATxPBGdyiEHrKdHerkp2OfJv4f/UeSvoT8KV+XDk4=; b=akz6Z2IxPy8Zjn4gynrK4DU9IgReYmi+IGIWrir93Aepq6od85FHjfbc22xhmfFaLS wV41dyvdAT9P7jPQUNk24VaKOctrbl5crmv6HBsysZCPtRb5PJvypTVzU3zjBXs1eWJT K1rQbzis48kQ7HA/sKfjxQkKadQs9A0A9AFeb6AYZzOhUU1rV8WLSb+7jLjNgtpKI1Cm 7JAb1RVIpOajWqW4YKfLgDMiFLgRQUoO9GF//aC5GSSc8YqaLISQFrEGgQ0TrnAkMzBh FwRmYRP6PWJ+kwBSqS54yIogNs9rd159Mn9+yZBocZCRbcSy5qWFxbm70HdHzetf4y9l 17oA== 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=O3ATxPBGdyiEHrKdHerkp2OfJv4f/UeSvoT8KV+XDk4=; b=MxUV1Msi9pcO4ldO6RcCkR5xRGvwYSdR5c2KdCT38a1ZrxEln35zUHngoknJBhV4BH jh1R9aKkuc+yw0kY6N8htxUj+Ezox8vb7N0d0t/CLeV/LGX33lPW7gzecHTc+pbBVSly jmdadPYMEGWdpmRdubQhihKVy0VpJiG6+cEBIUvxiu1en+RkpRZ4eHBjGkJB93hHjEcn M/UbGcYims3cn4w1k2mTNFOtEYHvVOvf4BayW0pNtDaWBr1MpvLBzSxPbrZASoKADIsb krGh8N2xMSS2orkp7hat3jXaKKxzcYResohveBuuDA9Xs/g8sXhZbknPlo2ETvrR7f+B B5zQ== X-Gm-Message-State: AOAM532lmKD9pIeFwTqsbJ+NhvcjYTGMT66PXqV3VZbtxnBf8Z3MnmC5 O1RDj7gJFjNCYTp/Mm7krwg0UqlrlgQ8xHGdtLuq68gpHBQKEQ== X-Google-Smtp-Source: ABdhPJy/1I9Idd4URiroB3cB1yIp8rkq1aezKrPFId2JIEy9RpX/VUCSsPVeisIkM0CYt1SiZvH6NVvx4PhPZfDu1BY= X-Received: by 2002:ac8:58d2:: with SMTP id u18mr36747587qta.235.1609007208865; Sat, 26 Dec 2020 10:26:48 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sat, 26 Dec 2020 11:26:35 -0700 Message-ID: Subject: Re: stable branch notes To: Kyle Evans Cc: freebsd-git X-Rspamd-Queue-Id: 4D3C2L1sRjz4Yb3 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" 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: Sat, 26 Dec 2020 18:26:50 -0000 On Sat, Dec 26, 2020 at 11:12 AM Kyle Evans wrote: > Hello! > > So Warner's got a git2svn exporter that will keep svn up-to-date, but > will it backfill stable/12 notes (so to speak, if it's even possible) > to indicate the svn revision that a git commit ended up with? > No. It includes the hash so you can find the hash, but it doesn't try to backfill notes. > I'm staring at the EN template and trying to figure out if I'll be > able to use the cgit interface to fill it out or if I'd need to use > svnweb for this going forward, assuming that SA/EN will continue to > refer to svn commits to match the release process for those branches. > I think we're going to have to reference both, alas, and that the 'both' might be a bit of a manual process. If it's too much of a hassle, we could have a post-post process that does the backfill, but that seemed a bridge too far in compatibility. Warner From owner-freebsd-git@freebsd.org Sat Dec 26 19:58:00 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 4E7E84C16BE for ; Sat, 26 Dec 2020 19:58:00 +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 4D3F3X1jv2z4dmj for ; Sat, 26 Dec 2020 19:58:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (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 290872A6CB for ; Sat, 26 Dec 2020 19:58:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f42.google.com with SMTP id d11so3371639qvo.11 for ; Sat, 26 Dec 2020 11:58:00 -0800 (PST) X-Gm-Message-State: AOAM533SyVY0Jbf9hcMaeb6PQfNWgl5FlwRwdLR9j0npH8TE/xVIigBL eaPwj8d90ramn9fXgEqW0ITDabyMbYkL6VsK8BM= X-Google-Smtp-Source: ABdhPJxxXpPyzXOUPfEtsf+KZ6gEs9qhj51vkV35r+04CmdgJFQOGsi4B9+2kEBkbOLBDjkv8Z+2NfMRI83LTEzYAOQ= X-Received: by 2002:a05:6214:6af:: with SMTP id s15mr40438405qvz.34.1609012679826; Sat, 26 Dec 2020 11:57:59 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Kyle Evans Date: Sat, 26 Dec 2020 13:57:49 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: stable branch notes To: Warner Losh 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: Sat, 26 Dec 2020 19:58:00 -0000 On Sat, Dec 26, 2020 at 12:26 PM Warner Losh wrote: > On Sat, Dec 26, 2020 at 11:12 AM Kyle Evans wrote: >> >> Hello! >> >> So Warner's got a git2svn exporter that will keep svn up-to-date, but >> will it backfill stable/12 notes (so to speak, if it's even possible) >> to indicate the svn revision that a git commit ended up with? > > No. It includes the hash so you can find the hash, but it doesn't try to backfill notes. > >> >> I'm staring at the EN template and trying to figure out if I'll be >> able to use the cgit interface to fill it out or if I'd need to use >> svnweb for this going forward, assuming that SA/EN will continue to >> refer to svn commits to match the release process for those branches. > > I think we're going to have to reference both, alas, and that the 'both' might be a bit of a manual process. If it's too much of a hassle, we could have a post-post process that does the backfill, but that seemed a bridge too far in compatibility. > > Warner Sure, sounds reasonable, thanks! IMO this is probably way too infrequent to bother with adding in if it's not already there, especially if the svn commit will contain the hash already. From owner-freebsd-git@freebsd.org Sat Dec 26 19:58: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 BCC904C16C1 for ; Sat, 26 Dec 2020 19:58:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3F3g4gPMz4dYP for ; Sat, 26 Dec 2020 19:58:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9E7B84C16C0; Sat, 26 Dec 2020 19:58: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 9E4A34C191F for ; Sat, 26 Dec 2020 19:58:07 +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 4D3F3g3t3bz4dms; Sat, 26 Dec 2020 19:58:07 +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 783352A5E4; Sat, 26 Dec 2020 19:58:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f178.google.com with SMTP id j17so6548380ybt.9; Sat, 26 Dec 2020 11:58:07 -0800 (PST) X-Gm-Message-State: AOAM531zjUCb2rBJvfIM2FGVm4631I37gUmE8uChdvl0Eu3D8Am+tyAg XW35U/VI2cQ4cgDAQT6yl+y7K7iW1KPzRcObBD8= X-Google-Smtp-Source: ABdhPJzKeSf8szmqWr0YwHso7Ng9i0I9JTzRSFiZjdf4KaSbKQTiN/ZlJuECWJIPu9gR2hy5wzyo36a/vtyT5GsgzDQ= X-Received: by 2002:a25:c845:: with SMTP id y66mr51236885ybf.110.1609012687084; Sat, 26 Dec 2020 11:58:07 -0800 (PST) MIME-Version: 1.0 References: <202012251825.0BPIPntO091296@gitrepo.freebsd.org> <751dc337-b4dc-52de-f2ee-a843eb5e43c5@FreeBSD.org> <20be96cf-1cda-d914-5759-aae90169d8c0@yuripv.dev> <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org> In-Reply-To: From: Li-Wen Hsu Date: Sun, 27 Dec 2020 03:57:55 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Stefan Esser , git@freebsd.org, Yuri Pankov , Warner Losh Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 19:58:07 -0000 On Sat, Dec 26, 2020 at 6:53 PM Ulrich Sp=C3=B6rlein wrot= e: > > On Sat, Dec 26, 2020 at 9:50 AM Stefan Esser wrote: >> >> Am 26.12.20 um 06:36 schrieb Yuri Pankov: >> > Warner Losh wrote: >> >> I was rather hoping we'd land around using the old commit message, as >> >> is, and let the cherry-picked message at the end signify the MFC, at >> >> least for simple cherry-picks. >> >> >> >> For squashed ones, a sensible new summary line and an appropriate com= mit >> >> message would be good as well... Where appropriate is approximately w= hat >> >> we do today, with all the hashes that we're merging mentioned. >> > >> > I am following the docs (and those make sense to me), `git cherry-pick >> > -x` is just enough; if it's direct commit, I'd add a note. So yes, an= y >> > commit to stable/* is MFC, unless stated otherwise. >> >> I'd like to get back the branch in the subject line, not only the first >> line of the commit message: >> >> It used to be: "svn commit: r368706 - in stable/12:", but now we only >> have the git hash in the subject line and "The branch ... has been >> updated ..." in the first line of the commit message. >> >> Filtering out commits to -STABLE/RELENG is possible via "X-Git-Refname" >> (I hope this header line will be kept in exactly the current form to >> not require later adjustment of the filter), This header line will be kept unless there is a very good reason. >> but it is no longer easy >> to see whether a commit affects -CURRENT by just looking at the subject >> line of the commit message ... >> >> Regards, STefan >> > > I agree. Especially since you cannot filter on X-Git-Refname in Gmail :( > > Having the subject be: git: hash - branch-name - one-line-subject > > would be ideal and mimic previous behaviour better. This has just been deployed. Hope this helps. BTW, the original "branch" of the subject in svn is actually "commondir", s= ee: https://svnweb.freebsd.org/base/svnadmin/hooks/scripts/mailer.py?revision= =3D320410&view=3Dmarkup#l509 And there is only X-SVN-Commit-Paths in header, contains list of directories modified. I think having a branch name in the header and subject does help as we now have a single list for all non-main branches. I'm not sure if having the dirlist added in header and subject, or even body may help, but if people find it's useful, I'm happy to see if it is possible to port to our git system. Best, Li-Wen From owner-freebsd-git@freebsd.org Sat Dec 26 20:24:00 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 8EE7B4C1A69 for ; Sat, 26 Dec 2020 20:24:00 +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 4D3FdX3WzZz4gMW for ; Sat, 26 Dec 2020 20:24:00 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 774B34C1A68; Sat, 26 Dec 2020 20:24:00 +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 7714E4C2068 for ; Sat, 26 Dec 2020 20:24:00 +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 4D3FdX24DTz4gS1; Sat, 26 Dec 2020 20:24:00 +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 0BQKNvvI042249 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 26 Dec 2020 21:23:57 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 26 Dec 2020 21:23:57 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Li-Wen Hsu Cc: Stefan Esser , git@freebsd.org, Yuri Pankov , Warner Losh Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): Message-ID: References: <202012251825.0BPIPntO091296@gitrepo.freebsd.org> <751dc337-b4dc-52de-f2ee-a843eb5e43c5@FreeBSD.org> <20be96cf-1cda-d914-5759-aae90169d8c0@yuripv.dev> <12fd95e4-3a29-115c-72ff-b734baeffe5b@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: User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D3FdX24DTz4gS1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 20:24:00 -0000 On Sun, 2020-12-27 at 03:57:55 +0800, Li-Wen Hsu wrote: >On Sat, Dec 26, 2020 at 6:53 PM Ulrich Spörlein wrote: >> >> On Sat, Dec 26, 2020 at 9:50 AM Stefan Esser wrote: >>> >>> Am 26.12.20 um 06:36 schrieb Yuri Pankov: >>> > Warner Losh wrote: >>> >> I was rather hoping we'd land around using the old commit message, as >>> >> is, and let the cherry-picked message at the end signify the MFC, at >>> >> least for simple cherry-picks. >>> >> >>> >> For squashed ones, a sensible new summary line and an appropriate commit >>> >> message would be good as well... Where appropriate is approximately what >>> >> we do today, with all the hashes that we're merging mentioned. >>> > >>> > I am following the docs (and those make sense to me), `git cherry-pick >>> > -x` is just enough; if it's direct commit, I'd add a note. So yes, any >>> > commit to stable/* is MFC, unless stated otherwise. >>> >>> I'd like to get back the branch in the subject line, not only the first >>> line of the commit message: >>> >>> It used to be: "svn commit: r368706 - in stable/12:", but now we only >>> have the git hash in the subject line and "The branch ... has been >>> updated ..." in the first line of the commit message. >>> >>> Filtering out commits to -STABLE/RELENG is possible via "X-Git-Refname" >>> (I hope this header line will be kept in exactly the current form to >>> not require later adjustment of the filter), > >This header line will be kept unless there is a very good reason. > >>> but it is no longer easy >>> to see whether a commit affects -CURRENT by just looking at the subject >>> line of the commit message ... >>> >>> Regards, STefan >>> >> >> I agree. Especially since you cannot filter on X-Git-Refname in Gmail :( >> >> Having the subject be: git: hash - branch-name - one-line-subject >> >> would be ideal and mimic previous behaviour better. > >This has just been deployed. Hope this helps. > >BTW, the original "branch" of the subject in svn is actually "commondir", see: > >https://svnweb.freebsd.org/base/svnadmin/hooks/scripts/mailer.py?revision=320410&view=markup#l509 > >And there is only X-SVN-Commit-Paths in header, contains list of >directories modified. > >I think having a branch name in the header and subject does help as we >now have a single list for all non-main branches. I'm not sure if >having the dirlist added in header and subject, or even body may help, >but if people find it's useful, I'm happy to see if it is possible to >port to our git system. Thank you for the quick fix! No, adding commondir isn't all that useful, in SVN it was needed as a single rev could span multiple "branches", but that's not the case in git. And we should become a little better in that first-line commit summary to obsolete further needs for commondir magic anyway. Thanks Uli