From owner-freebsd-git@freebsd.org Thu Jul 9 11:34: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 68A1836782A for ; Thu, 9 Jul 2020 11:34:22 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2Yws6zqjz3dNv; Thu, 9 Jul 2020 11:34:21 +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.15.2/8.15.2) with ESMTPS id 069BYDAp070440 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 9 Jul 2020 13:34:13 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Thu, 9 Jul 2020 13:34:13 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: freebsd-git@freebsd.org, clusteradm@freebsd.org Subject: svnsync discrepancies again Message-ID: <20200709113413.GD96323@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 4B2Yws6zqjz3dNv 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.33 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, 09 Jul 2020 11:34:22 -0000 Hi folks comparing my own output with what cgit produces has surfaced another diff in the ports SVN metadata, specifically a 2s delta on r530303 What I have in my SVN email (!) is this: Author: sunpoet Date: Thu Apr  2 12:03:10 2020 New Revision: 530303 URL: https://svnweb.freebsd.org/changeset/ports/530303 Clicking that link, I get to this metadata instead: Author: sunpoet Date: Thu Apr 2 12:03:12 2020 UTC (3 months ago) My local svnsync copy has: % svnlook info -r 530303 $PWD sunpoet 2020-04-02 14:03:10 +0200 (Thu, 02 Apr 2020) The copy on cgit has: % svn log -vc530303 file:///$PWD ------------------------------------------------------------------------ r530303 | sunpoet | 2020-04-02 12:03:12 +0000 (Thu, 02 Apr 2020) | 4 lines >From cgit (within the cluster): % svn log -c530303 https://svn.freebsd.org/ports ------------------------------------------------------------------------ r530303 | sunpoet | 2020-04-02 12:03:12 +0000 (Thu, 02 Apr 2020) | 4 lines >From a random machine (outside the cluster): % svn log -c530303 https://svn.freebsd.org/ports ------------------------------------------------------------------------ r530303 | sunpoet | 2020-04-02 14:03:10 +0200 (Thu, 02 Apr 2020) | 4 lines Why do we have garbage on svnweb.freebsd.org and why does a machine in the cluster get pointed to that host? Cheers Uli From owner-freebsd-git@freebsd.org Thu Jul 9 16:58:27 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9625E36F76C for ; Thu, 9 Jul 2020 16:58:27 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2j6p7285z4HHh; Thu, 9 Jul 2020 16:58:26 +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.15.2/8.15.2) with ESMTPS id 069GwOw0081131 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 9 Jul 2020 18:58:24 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Thu, 9 Jul 2020 18:58:24 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Ryan Steinmetz Cc: freebsd-git@freebsd.org, clusteradm@freebsd.org Subject: Re: svnsync discrepancies again Message-ID: <20200709165824.GE96323@acme.spoerlein.net> References: <20200709142053.GA60652@exodus.zi0r.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200709142053.GA60652@exodus.zi0r.com> User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 4B2j6p7285z4HHh 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.33 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, 09 Jul 2020 16:58:27 -0000 On Thu, 2020-07-09 at 10:20:53 -0400, Ryan Steinmetz wrote: > > On (07/09/20 11:26), Ulrich Spörlein wrote: > >Hi folks > > > >comparing my own output with what cgit produces has surfaced another diff > >in the ports SVN metadata, specifically a 2s delta on r530303 > > > >What I have in my SVN email (!) is this: > >Author: sunpoet > >Date: Thu Apr 2 12:03:10 2020 > >New Revision: 530303 > >URL: https://svnweb.freebsd.org/changeset/ports/530303 > > > >Clicking that link, I get to this metadata instead: > >Author: sunpoet > >Date: Thu Apr 2 12:03:12 2020 UTC (3 months ago) > > > >My local svnsync copy has: > >% svnlook info -r 530303 $PWD > >sunpoet > >2020-04-02 14:03:10 +0200 (Thu, 02 Apr 2020) > > > >The copy on cgit has: > >% svn log -vc530303 file:///$PWD > >------------------------------------------------------------------------ > >r530303 | sunpoet | 2020-04-02 12:03:12 +0000 (Thu, 02 Apr 2020) | 4 lines > > > >From cgit (within the cluster): > >% svn log -c530303 https://svn.freebsd.org/ports > >------------------------------------------------------------------------ > >r530303 | sunpoet | 2020-04-02 12:03:12 +0000 (Thu, 02 Apr 2020) | 4 lines > > > >From a random machine (outside the cluster): > >% svn log -c530303 https://svn.freebsd.org/ports > >------------------------------------------------------------------------ > >r530303 | sunpoet | 2020-04-02 14:03:10 +0200 (Thu, 02 Apr 2020) | 4 lines > > > >Why do we have garbage on svnweb.freebsd.org and why does a machine in the > >cluster get pointed to that host? > > Not sure I'd call this "garbage" nor would I immediately assume that > we've decided to "point cluster machines at garbage" and "give the rest > of the world the good stuff." > > That being said, this is likely related to how svnsync works. It's a > two step operation where commits are replayed first, followed by the > metadata. Since this isn't atomic, there's a brief window that can > sometimes surface between these two operations. > > svnweb has its own local copy of the repos that it looks at. So do the > multiple public, geo-load balanced mirrors (svn.freebsd.org). Yes, sadly I'm intimately familiar with the shortcomings of svnsync in this regard. What I'm wondering is: - who will fix this and - where is the actual canonical source of our SVN and - how can I get access to it from both a machine inside the cluster as well as outside? That would be helpful to know. Cheers Uli From owner-freebsd-git@freebsd.org Thu Jul 9 19:47: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 AE90A35472B for ; Thu, 9 Jul 2020 19:47:06 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) (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 4B2msQ2gbjz4XNR; Thu, 9 Jul 2020 19:47:06 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f180.google.com with SMTP id t4so3097573iln.1; Thu, 09 Jul 2020 12:47:06 -0700 (PDT) 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=WemrOAPIpuNB8WMMNtO9IY+3lV0yovGzt33YzXePMP4=; b=KzWTuwXBiIGBKIvOZ5ahGxnZBq7lsYecYY7Djr3LrT8ROMGjVrkWFjvrKNjvis3fsH N/ZXEIBZY8MB9uv6UwTE+5URfqEpl+rVudyLX5QYWz89cukpnOhCb1yWeIEl1Q+xio/d 40H+UfLeFz0earj77soagzRuWy2tBIOIoqCkr5cFuIPH335ZYBHx1GlJVbQ3eZHU6R1H IM1/MxSElBZp9EL62wHgzp9YynsFyZQrxh2NqF8MGiCZEBo3IxdscTRT3W3xT3GZV2be kEgQ8ouFCZS4R1mT1ckU9ZjssYTRUKt1Rgc5HA9bIeeuo9OPq34YRk1O3tyyeMnlyxCZ mB5A== X-Gm-Message-State: AOAM532oKHwhbr4VX5SoM9ieYCt/yrObr/oa/NtvHodiQQNXY4f0o2F5 gzg3L5t8e72l1JYOeIusLF0dMFTl8a3WER0TRYMLvA== X-Google-Smtp-Source: ABdhPJzTQRtbMo4UblLsyflXhyC5H1iPYUIGg52QVjvQlX598wqFs5KUNvhrAIkM08qpGQyON/DjSHTdNHuhXpk7aAY= X-Received: by 2002:a05:6e02:4c6:: with SMTP id f6mr46533281ils.98.1594324024701; Thu, 09 Jul 2020 12:47:04 -0700 (PDT) MIME-Version: 1.0 References: <20200709142053.GA60652@exodus.zi0r.com> <20200709165824.GE96323@acme.spoerlein.net> In-Reply-To: <20200709165824.GE96323@acme.spoerlein.net> From: Ed Maste Date: Thu, 9 Jul 2020 15:46:52 -0400 Message-ID: Subject: Re: svnsync discrepancies again To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Ryan Steinmetz , freebsd-git@freebsd.org, "FreeBSD.org clusteradm" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4B2msQ2gbjz4XNR X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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, 09 Jul 2020 19:47:06 -0000 > > Not sure I'd call this "garbage" nor would I immediately assume that > > we've decided to "point cluster machines at garbage" and "give the rest > > of the world the good stuff." Garbage is perhaps unnecessarily inflammatory, so let's avoid calling it that. However, I hope we all agree that if we have multiple copies of the SVN repo they must contain the same data and metadata. We had this problem often in the past and I thought it was now "fixed" by the scripts that run svnsync? Is the issue just that we can only ever have one svnsync generation? > - where is the actual canonical source of our SVN and > - how can I get access to it from both a machine inside the cluster as > well as outside? Having access to a SVN repository that's guaranteed to have the correct data and metadata is a requirement for the svn-git migration process. so I hope someone can answer those two shortly. From owner-freebsd-git@freebsd.org Fri Jul 10 09:15: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 379293649A7 for ; Fri, 10 Jul 2020 09:15: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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B36nw5J2Qz4MrV; Fri, 10 Jul 2020 09:15: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.15.2/8.15.2) with ESMTPS id 06A9FDPh015426 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 10 Jul 2020 11:15:14 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Fri, 10 Jul 2020 11:15:13 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Ed Maste Cc: Ryan Steinmetz , freebsd-git@freebsd.org, "FreeBSD.org clusteradm" Subject: Re: svnsync discrepancies again Message-ID: <20200710091513.GG96323@acme.spoerlein.net> References: <20200709142053.GA60652@exodus.zi0r.com> <20200709165824.GE96323@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 4B36nw5J2Qz4MrV 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.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2020 09:15:17 -0000 On Thu, 2020-07-09 at 15:46:52 -0400, Ed Maste wrote: > > > Not sure I'd call this "garbage" nor would I immediately assume that > > > we've decided to "point cluster machines at garbage" and "give the rest > > > of the world the good stuff." > > Garbage is perhaps unnecessarily inflammatory, so let's avoid calling > it that. However, I hope we all agree that if we have multiple copies > of the SVN repo they must contain the same data and metadata. > > We had this problem often in the past and I thought it was now "fixed" > by the scripts that run svnsync? Is the issue just that we can only > ever have one svnsync generation? Maybe it's inflammatory, maybe it was lost in translation. Maybe I'm just really angry about the time I've wasted chasing after what ended up being svnsync's fault more than once. It has 1 job and it fails to do that 1 job consistently. That is really frustrating. I wish we would not use svnsync for the mirrors. rsync(1) is a perfectly good alternative that wouldn't randomly munge the data. I also wish we wouldn't even mirror the repo in the first place. We're turning a centralized VCS into a decentralized one, that makes no sense. The added mirrors might add some sense of security I guess, other than that they probably have wasted more time and effort than we have gained by them :/ > > > - where is the actual canonical source of our SVN and > > - how can I get access to it from both a machine inside the cluster as > > well as outside? > > Having access to a SVN repository that's guaranteed to have the > correct data and metadata is a requirement for the svn-git migration > process. so I hope someone can answer those two shortly. Yes please. You might wonder why I'm so angry because of a 2s time delta, but svnsync is also known to not copy the author correctly and with git everything get's hashed, so the result would be a totally different repo. We don't want that. Thanks Uli From owner-freebsd-git@freebsd.org Fri Jul 10 16:24: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 9ECFC36D781 for ; Fri, 10 Jul 2020 16:24:14 +0000 (UTC) (envelope-from sean@chittenden.org) Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) (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 4B3JJs6GDxz4nTg for ; Fri, 10 Jul 2020 16:24:13 +0000 (UTC) (envelope-from sean@chittenden.org) Received: by mail-lj1-x231.google.com with SMTP id b25so7129097ljp.6 for ; Fri, 10 Jul 2020 09:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chittenden.org; s=8eb15515; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wcOcGS0G15NmOgS4Bpailfi3zUEDacRxfPAjMZ6VvLQ=; b=NZ159aaWKTFT+9+SAzNay4AAwP2p37PMmWAZ0qmGsQD63iumyKn5RQTZWCfUvmTBvi q99n04/255AcJrTMJl1k1NuT/l1JeAbklps2wrI2AqdrN0YFz4rV+Lkiqo48UkTvNBbW T6rZs2gWDF4CmLiBN7Eccva7wNlxEANy+h8ZUkLt5O28hSUaUAsYBSme66llGLJHtYBX U+uZJZ/6phIklF2JAmEl6yaxxkZaJ+7Std3r7M1fDbo5qRevKyudDrHdRKrWFwdDV1Gu B2u/UxXODxh5TDe9lhU08bPCo0cllR1NLTYWgLfk5DRnvrsBTNHLdHvzdzmyyTJu7+eF sqVQ== 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=wcOcGS0G15NmOgS4Bpailfi3zUEDacRxfPAjMZ6VvLQ=; b=Wspbn2MYrxQt6vJ+ERekJESmTuPAn4bfwtRKJH2UopAvEoJCt+B86kdu87uQhT0M11 sHTjkxikNrqfbtT94bcT25ej5JlWgYG3ehxh6deafP8fQLVb7U1hV6OHNuI1Iogs/7l8 KyjnGgO1jx/NyFFZ67uOVDxhDaZuYn2QcfP+eI8IFI5yC32zeNzeAleAigNHsQUtGwHZ e8jG3wlQSnmYNRUHn7/MYL+ZK6/drNnhNZnFRo9FhFHeRnFylrZ+JIFqXVGldimKjROS CvopIo3niiqfDOHzhXyEa8AGwe55n00Y5OMy5L1o4ENeaZqPRsI1aI2AU6xNV4ubVt71 GRRw== X-Gm-Message-State: AOAM530sO9vpmaW2jj40+gaOgRkLzleXMnceWfI7P5wX7/z5twfbBDVR A4CUO2oFf+qPU5CWrQdwoM3/HBQLgjbWvU3IOOpoYg2kZ08= X-Google-Smtp-Source: ABdhPJxxwktEITOwwjPVZ81oTTRN2o4CqtUDhb+uozIFDlOJ2ynj01GAaH92yAhXSmb08eG6gLpYLIPU75nH05c1/A8= X-Received: by 2002:a05:651c:32c:: with SMTP id b12mr41332778ljp.326.1594398251994; Fri, 10 Jul 2020 09:24:11 -0700 (PDT) MIME-Version: 1.0 References: <20200709142053.GA60652@exodus.zi0r.com> <20200709165824.GE96323@acme.spoerlein.net> <20200710091513.GG96323@acme.spoerlein.net> In-Reply-To: <20200710091513.GG96323@acme.spoerlein.net> From: Sean Chittenden Date: Fri, 10 Jul 2020 09:23:55 -0700 Message-ID: Subject: Re: svnsync discrepancies again To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Ed Maste , Ryan Steinmetz , freebsd-git@freebsd.org, "FreeBSD.org clusteradm" X-Rspamd-Queue-Id: 4B3JJs6GDxz4nTg X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=chittenden.org header.s=8eb15515 header.b=NZ159aaW; dmarc=pass (policy=none) header.from=chittenden.org; spf=pass (mx1.freebsd.org: domain of sean@chittenden.org designates 2a00:1450:4864:20::231 as permitted sender) smtp.mailfrom=sean@chittenden.org X-Spamd-Result: default: False [-3.41 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.991]; R_DKIM_ALLOW(-0.20)[chittenden.org:s=8eb15515]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; NEURAL_HAM_LONG(-1.02)[-1.017]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[chittenden.org:+]; DMARC_POLICY_ALLOW(-0.50)[chittenden.org,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::231:from]; NEURAL_HAM_SHORT(-0.40)[-0.402]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2020 16:24:14 -0000 > > Maybe it's inflammatory, maybe it was lost in translation. Maybe I'm > just really angry about the time I've wasted chasing after what ended up > being svnsync's fault more than once. > > It has 1 job and it fails to do that 1 job consistently. That is really > frustrating. > So what you're saying is you're going to throw a party as soon as this conversion is complete? :~] "Good riddance to bad software used in a place of anger and hate, and not necessarily by choice." Thanks for your help and effort chasing these issues and helping push the project forward. -sc From owner-freebsd-git@freebsd.org Fri Jul 10 16:27: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 4917136D3D7 for ; Fri, 10 Jul 2020 16:27:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3JP01Bl9z4nhQ; Fri, 10 Jul 2020 16:27:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.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: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 082742E6FC; Fri, 10 Jul 2020 16:27:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f176.google.com with SMTP id a32so4883831qtb.5; Fri, 10 Jul 2020 09:27:48 -0700 (PDT) X-Gm-Message-State: AOAM532mDcZ0rdIrbrxePCVUsuNaZ+B9iy/IMjp4ojL3sBtv6K6/i+Nr mVKfv1sjd9noMlhK0R0zT+g5AAg6xRPn9MrqwB4= X-Google-Smtp-Source: ABdhPJyPhUNgpG/rFK3vwFwTdxVYN4jhfUkMoVYQSvccarXsKm+THfY2/03rEcPbQc4hF6eM7HyswkJy95NftlxcuO8= X-Received: by 2002:ac8:3637:: with SMTP id m52mr73668862qtb.53.1594398467536; Fri, 10 Jul 2020 09:27:47 -0700 (PDT) MIME-Version: 1.0 References: <20200709142053.GA60652@exodus.zi0r.com> <20200709165824.GE96323@acme.spoerlein.net> In-Reply-To: From: Kyle Evans Date: Fri, 10 Jul 2020 11:27:35 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svnsync discrepancies again To: Ed Maste Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , Ryan Steinmetz , freebsd-git@freebsd.org, "FreeBSD.org clusteradm" Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2020 16:27:48 -0000 On Thu, Jul 9, 2020 at 2:47 PM Ed Maste wrote: > [... snip ...] > > - where is the actual canonical source of our SVN and > > - how can I get access to it from both a machine inside the cluster as > > well as outside? > > Having access to a SVN repository that's guaranteed to have the > correct data and metadata is a requirement for the svn-git migration > process. so I hope someone can answer those two shortly. Alright, perhaps a silly question, but can this be done via svn+ssh directly to repo.f.o? It'd need some coordination to work at all, but that's surely the most reliable. Thanks, Kyle Evans From owner-freebsd-git@freebsd.org Fri Jul 10 21:24: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 DA7C4373F89 for ; Fri, 10 Jul 2020 21:24:16 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4B3Qz45XSMz3yCN for ; Fri, 10 Jul 2020 21:24:16 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id BC42C373F88; Fri, 10 Jul 2020 21:24:16 +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 BC0B7373865 for ; Fri, 10 Jul 2020 21:24:16 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3Qz44Y0xz3yCP for ; Fri, 10 Jul 2020 21:24:16 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1185) id 8D5F0A1D; Fri, 10 Jul 2020 21:24:16 +0000 (UTC) Date: Fri, 10 Jul 2020 21:24:16 +0000 From: Rene Ladan To: git@freebsd.org Subject: ports 2020Q3 branch not present? Message-ID: <20200710212416.GA89164@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2020 21:24:16 -0000 Hello, I noticed that ports 2020Q3 branched is not present in the git ports tree at cgit-beta.freebsd.org It was branched from subversion HEAD as r541028 on 2020-07-02 12:04:18 UTC The other quarterly branches all seem to be present. Regards, René From owner-freebsd-git@freebsd.org Sat Jul 11 00:52: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 BF2AD350AFA for ; Sat, 11 Jul 2020 00:52:48 +0000 (UTC) (envelope-from dan@langille.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4B3Wbh44XRz4BPS for ; Sat, 11 Jul 2020 00:52:48 +0000 (UTC) (envelope-from dan@langille.org) Received: by mailman.nyi.freebsd.org (Postfix) id 8B69435065D; Sat, 11 Jul 2020 00:52:48 +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 8B2FF350E8F for ; Sat, 11 Jul 2020 00:52:48 +0000 (UTC) (envelope-from dan@langille.org) Received: from clavin1.langille.org (clavin1.langille.org [162.208.116.86]) (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 "clavin.langille.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3Wbg4P6Pz4BMP for ; Sat, 11 Jul 2020 00:52:44 +0000 (UTC) (envelope-from dan@langille.org) Received: from (clavin1.int.langille.org (clavin1.int.unixathome.org [10.4.7.7]) (Authenticated sender: hidden) with ESMTPSA id 357E66FD66 for ; Sat, 11 Jul 2020 00:52:37 +0000 (UTC) From: Dan Langille Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.5\)) Subject: What happens to old repo links? Message-Id: <8B5D0824-F412-4067-B874-21F2EA6EAEE6@langille.org> Date: Fri, 10 Jul 2020 20:52:35 -0400 To: git@freebsd.org X-Mailer: Apple Mail (2.3445.9.5) X-Rspamd-Queue-Id: 4B3Wbg4P6Pz4BMP X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 162.208.116.86 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-1.37 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.96)[-0.961]; FROM_HAS_DN(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.96)[-0.957]; R_SPF_ALLOW(-0.20)[+ip4:162.208.116.64/26]; NEURAL_HAM_SHORT(-0.15)[-0.152]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:11403, ipnet:162.208.116.0/22, country:US]; SUBJECT_ENDS_QUESTION(1.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spam: Yes Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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, 11 Jul 2020 00:52:48 -0000 Hello, At present, we have links to old commits, such as: = https://svnweb.freebsd.org/ports/head/graphics/mesa-devel/Makefile?annotat= e=3D537860 In git, how will that work? How will we get to revision 537860? Similarly, for = https://svnweb.freebsd.org/ports?view=3Drevision&revision=3D537860 How will that work? Thank you. --=20 Dan Langille - BSDCan / PGCon dan@langille.org From owner-freebsd-git@freebsd.org Sat Jul 11 01:02: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 B3717351043 for ; Sat, 11 Jul 2020 01:02:45 +0000 (UTC) (envelope-from dan@langille.org) Received: from clavin2.langille.org (clavin2.langille.org [199.233.228.197]) (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 "clavin.langille.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3Wq85yQSz4BvZ for ; Sat, 11 Jul 2020 01:02:44 +0000 (UTC) (envelope-from dan@langille.org) Received: from (clavin2.int.langille.org (clavin2.int.unixathome.org [10.4.7.7]) (Authenticated sender: hidden) with ESMTPSA id 3AAAF353 for ; Sat, 11 Jul 2020 01:02:38 +0000 (UTC) From: Dan Langille Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.5\)) Subject: Multiple repos? Message-Id: <6351781B-4B3C-427D-95CB-661E052D6081@langille.org> Date: Fri, 10 Jul 2020 21:02:36 -0400 To: freebsd-git@freebsd.org X-Mailer: Apple Mail (2.3445.9.5) X-Rspamd-Queue-Id: 4B3Wq85yQSz4BvZ X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 199.233.228.197 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-1.36 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.96)[-0.958]; FROM_HAS_DN(0.00)[]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.95)[-0.954]; R_SPF_ALLOW(-0.20)[+ip4:199.233.228.194/29]; NEURAL_HAM_SHORT(-0.15)[-0.145]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.233.228.0/22, country:US]; SUBJECT_ENDS_QUESTION(1.00)[]; MID_RHS_MATCH_FROM(0.00)[] Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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, 11 Jul 2020 01:02:45 -0000 At present, I'm using https://github.com/freebsd/freebsd-ports for FreshPorts However, FreshPorts does the entire repo. I'm suddenly realizing I need multiple repos: * https://github.com/freebsd/freebsd * https://github.com/freebsd/freebsd-quarterly * https://github.com/freebsd/freebsd-doc Does this seem right? This seems to cover what is found at https://svnweb.freebsd.org * base * ports * doc -- Dan Langille - BSDCan / PGCon dan@langille.org From owner-freebsd-git@freebsd.org Sat Jul 11 09:37: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 8C21535D026 for ; Sat, 11 Jul 2020 09:37:03 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4B3lDb21C4z3RbN for ; Sat, 11 Jul 2020 09:37:03 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 432EB35D126; Sat, 11 Jul 2020 09:37:03 +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 42F6435CF4A for ; Sat, 11 Jul 2020 09:37: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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3lDZ5ngyz3Rxg; Sat, 11 Jul 2020 09:37:02 +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.15.2/8.15.2) with ESMTPS id 06B9axrQ016624 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 11 Jul 2020 11:36:59 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Sat, 11 Jul 2020 11:36:59 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Rene Ladan Cc: git@freebsd.org Subject: Re: ports 2020Q3 branch not present? Message-ID: <20200711093659.GA16439@acme.spoerlein.net> References: <20200710212416.GA89164@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200710212416.GA89164@freefall.freebsd.org> User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 4B3lDZ5ngyz3Rxg 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.33 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, 11 Jul 2020 09:37:03 -0000 On Fri, 2020-07-10 at 21:24:16 +0000, Rene Ladan wrote: > Hello, > > I noticed that ports 2020Q3 branched is not present in the git ports tree > at cgit-beta.freebsd.org > > It was branched from subversion HEAD as r541028 on 2020-07-02 12:04:18 UTC > The other quarterly branches all seem to be present. Indeed, thanks for the report! I changed the location the branches are being pushed to and messed this up, actually. Now, the big question is whether we want these branches under refs/heads so that everyone will pull them by default (rather wasteful?) or whether we stick them someplace else, so people checking them out will need to add a custom "fetch" line (like we do this for vendor branches over in src). Thoughts? I'm strongly favoring the latter. Cheers Uli From owner-freebsd-git@freebsd.org Sat Jul 11 09:41: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 15F4935CAEF for ; Sat, 11 Jul 2020 09:41:50 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4B3lL56hzGz3Ryq for ; Sat, 11 Jul 2020 09:41:49 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id E421535D307; Sat, 11 Jul 2020 09:41: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 E3DF135CF53 for ; Sat, 11 Jul 2020 09:41:49 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3lL53cLXz3S2T for ; Sat, 11 Jul 2020 09:41:49 +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.15.2/8.15.2) with ESMTPS id 06B9fkZI016779 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 11 Jul 2020 11:41:47 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Sat, 11 Jul 2020 11:41:46 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Dan Langille Cc: git@freebsd.org Subject: Re: What happens to old repo links? Message-ID: <20200711094146.GB16439@acme.spoerlein.net> References: <8B5D0824-F412-4067-B874-21F2EA6EAEE6@langille.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8B5D0824-F412-4067-B874-21F2EA6EAEE6@langille.org> User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 4B3lL53cLXz3S2T 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.33 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, 11 Jul 2020 09:41:50 -0000 On Fri, 2020-07-10 at 20:52:35 -0400, Dan Langille wrote: > Hello, > > At present, we have links to old commits, such as: https://svnweb.freebsd.org/ports/head/graphics/mesa-devel/Makefile?annotate=537860 > > In git, how will that work? How will we get to revision 537860? > > Similarly, for https://svnweb.freebsd.org/ports?view=revision&revision=537860 > > How will that work? > > Thank you. Someone will have to write a redirector that greps in the notes for the hash of the corresponding SVN revision. Note that not all SVN revs are present in git as such, as they might not make sense and have been skipped. % git log --notes --grep=revision=537860\$ master commit 69116835276115e2dbec1332f2070300e4905d76 Author: Jan Beich Date: 2020-06-04 00:49:09 +0000 graphics/mesa-devel: update to 20.1.b.1495 Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/fb62e642ae6...8252bb0ec6d Notes: svn path=/head/; revision=537860 So the redirector needs to run: % git log --format=%H --notes --grep=revision=537860\$ master 69116835276115e2dbec1332f2070300e4905d76 and 301 to https://cgit-beta.freebsd.org/ports/commit/?id=69116835276115e2dbec1332f2070300e4905d76 or https://cgit-beta.freebsd.org/ports/diff/graphics/mesa-devel/Makefile?id=69116835276115e2dbec1332f2070300e4905d76 depending on a file path being present or whatever. If a plugin in gitolite could do that translation, that would be great. hth Uli From owner-freebsd-git@freebsd.org Sat Jul 11 09:47:01 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 AE11835D63C for ; Sat, 11 Jul 2020 09:47:01 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3lS53M2Zz3Shx for ; Sat, 11 Jul 2020 09:47:01 +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.15.2/8.15.2) with ESMTPS id 06B9kxQi016962 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 11 Jul 2020 11:46:59 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Sat, 11 Jul 2020 11:46:59 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Dan Langille Cc: freebsd-git@freebsd.org Subject: Re: Multiple repos? Message-ID: <20200711094659.GC16439@acme.spoerlein.net> References: <6351781B-4B3C-427D-95CB-661E052D6081@langille.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6351781B-4B3C-427D-95CB-661E052D6081@langille.org> User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 4B3lS53M2Zz3Shx 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.33 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, 11 Jul 2020 09:47:01 -0000 On Fri, 2020-07-10 at 21:02:36 -0400, Dan Langille wrote: > At present, I'm using https://github.com/freebsd/freebsd-ports for FreshPorts > > However, FreshPorts does the entire repo. > > I'm suddenly realizing I need multiple repos: > > * https://github.com/freebsd/freebsd > * https://github.com/freebsd/freebsd-quarterly > * https://github.com/freebsd/freebsd-doc > > Does this seem right? > > This seems to cover what is found at https://svnweb.freebsd.org > > * base > * ports > * doc Hi Dan, it depends on how exactly you are using these repos, but we won't have a mono-repo with src+doc+ports+QR combined, that seems a bit impractical. I wish doc was merged into src at some stage, but it also contains the website, so that would seem odd again. Why would freshports need the quarterly reports or the doc repo though? If you're looking for the quarterly ports branches instead, they are simply branches in git, e.g. https://github.com/freebsd/freebsd-ports/tree/branches/2014Q1 but the exact location is subject to change (the question is whether we want all folks to always pull all old branches by default, because that seems wasteful) Cheers Uli From owner-freebsd-git@freebsd.org Sat Jul 11 20:58:05 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 32E4637105D for ; Sat, 11 Jul 2020 20:58:05 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4B42LP0cPZz4bPq for ; Sat, 11 Jul 2020 20:58:05 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 14EE437140C; Sat, 11 Jul 2020 20:58:05 +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 14B533712BF for ; Sat, 11 Jul 2020 20:58:05 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B42LN6vmLz4bpR; Sat, 11 Jul 2020 20:58:04 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1185) id E384716B25; Sat, 11 Jul 2020 20:58:04 +0000 (UTC) Date: Sat, 11 Jul 2020 20:58:04 +0000 From: Rene Ladan To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org, mat@freebsd.org Subject: Re: ports 2020Q3 branch not present? Message-ID: <20200711205804.GA22050@freefall.freebsd.org> References: <20200710212416.GA89164@freefall.freebsd.org> <20200711093659.GA16439@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200711093659.GA16439@acme.spoerlein.net> X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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, 11 Jul 2020 20:58:05 -0000 On Sat, Jul 11, 2020 at 11:36:59AM +0200, Ulrich Spörlein wrote: > On Fri, 2020-07-10 at 21:24:16 +0000, Rene Ladan wrote: > > Hello, > > > > I noticed that ports 2020Q3 branched is not present in the git ports tree > > at cgit-beta.freebsd.org > > > > It was branched from subversion HEAD as r541028 on 2020-07-02 12:04:18 UTC > > The other quarterly branches all seem to be present. > > Indeed, thanks for the report! I changed the location the branches are > being pushed to and messed this up, actually. > Oops :) > Now, the big question is whether we want these branches under refs/heads > so that everyone will pull them by default (rather wasteful?) or whether > we stick them someplace else, so people checking them out will need to > add a custom "fetch" line (like we do this for vendor branches over in > src). > > Thoughts? I'm strongly favoring the latter. > [adding mat@ who is the portmgr-git liaison IIRC] Hmm, so currently the quarterly (and older releng) branches are directly under the "remotes" origin, just like master itself. This makes switching between branches easy, which comes in handy for MFHs I think. Is there a way to see how much space each of the branches consume? Currently I have an idx of 141 MB and a pack of 763 MB, not much larger than a single branch in Subversion (.svn directory starting at 650 MB). Regards, René