From owner-freebsd-git@freebsd.org Sun Jul 12 14:14: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 303DF364A76 for ; Sun, 12 Jul 2020 14:14:57 +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 4B4TLm6ylJz4Zhp for ; Sun, 12 Jul 2020 14:14:56 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id ECAEE36489C; Sun, 12 Jul 2020 14:14:56 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB36936491A for ; Sun, 12 Jul 2020 14:14:56 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.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 4B4TLm0z40z4ZfS; Sun, 12 Jul 2020 14:14:55 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-oi1-f174.google.com with SMTP id k22so8893905oib.0; Sun, 12 Jul 2020 07:14:55 -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=cWF6PCLhCWAMgxf6eOuEXJ3AmgAFaJz8wZ4nk9mFcEs=; b=dXAL1L8sHgDhKw/IgLn2FKW+e+v/kruDi2O+OriDfZX95YCydQiC8pxxNEG2BIRQ5t VikkJivUYnSrV9rVNEaKrMwDdW7MycoWCBiHVDMPV+XvKaiYWkmMyLC0EYrlLaEqp03R g3T172sYyres3EabbsNpi/10Kt0gv8pOtIYL1TYbUYpjnb/F3oB2mD1+ujA/V0Snf1MM dxA9fdVreSFZm+EUirhRG4EmHT9QDwRxc43JgXdy2DT5uO90hTVpZ7baZRheDUUhsouP yYnLC44uK4ahLy7VVLWAU+xECgr47MoNEgNPW+E9RYy5yIiVCje1CtuW742BA0haEO8w 3mYg== X-Gm-Message-State: AOAM532knKpjfT5r+uRY1DQsAxZns8+iEsyD0Mru3zqzdbqrBBh37B+a awYtIgC592Fs70VsirEoxf2KhSg2+3a+c65AeOXxwA== X-Google-Smtp-Source: ABdhPJx6ZWZST5YT1qFjLRm/rxMEvcCSE7R2qHvB/zMHi9h2Tl9J0det9jSYqGuWq1auvZjx8xyuWNFiCaS6L3wJ+rk= X-Received: by 2002:aca:f4d2:: with SMTP id s201mr10499704oih.42.1594563294892; Sun, 12 Jul 2020 07:14:54 -0700 (PDT) MIME-Version: 1.0 References: <20200710212416.GA89164@freefall.freebsd.org> <20200711093659.GA16439@acme.spoerlein.net> <20200711205804.GA22050@freefall.freebsd.org> In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Sun, 12 Jul 2020 16:14:43 +0200 Message-ID: Subject: Re: ports 2020Q3 branch not present? To: Warner Losh Cc: Rene Ladan , git@freebsd.org, mat@freebsd.org X-Rspamd-Queue-Id: 4B4TLm0z40z4ZfS X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.167.174 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-0.00 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; R_MIXED_CHARSET(0.62)[subject]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_LONG(-0.80)[-0.797]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.43)[-0.426]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.174:from]; NEURAL_HAM_MEDIUM(-0.41)[-0.405]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.174:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] 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: Sun, 12 Jul 2020 14:14:57 -0000 On Sun, Jul 12, 2020 at 6:35 AM Warner Losh wrote: > On Sat, Jul 11, 2020 at 2:58 PM Rene Ladan wrote: > >> 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. >> > > They are just like the stable branches in the src tree (or somewhat > similar), so I think they should be the same, and pulled by default. While > they are quarterly, the traffic on them is smaller than a typical stable > branch in src, so it's not a huge amount of extra revisions. > > The only way to find the size is to pull with and without them and observe > the difference. > > portmgr should weigh in on where these branches should end up. Currently I'm dumping them in refs/heads/20xxQy (not pushed yet, needs a fix), because having them called refs/heads/branches/2020Q1 is a bit weird as the "branches" is rather redundant. Cheers Uli