From owner-freebsd-git@freebsd.org Tue May 12 16: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 03DDB2F463E for ; Tue, 12 May 2020 16:51:44 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-yb1-f195.google.com (mail-yb1-f195.google.com [209.85.219.195]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 49M3jq1g7Bz4TXw; Tue, 12 May 2020 16:51:43 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-yb1-f195.google.com with SMTP id c2so7296197ybi.7; Tue, 12 May 2020 09:51:43 -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=W3J58QKI6HvXzHJxCg7fKS2lI7o8gl03xNXx8qb6WaY=; b=XOjyMO8wYwTF32hn+9TnB/ZRutkN8fSOnS+yU0XFc7UmjMTA48TVC2Z4g9kRfQxUpo SwyUpyjVz1OChPRfTqPsx10u72MTnNYyEDjU8KA6XwjnJor1EOzyovuhLsWiXIU9y772 RAR4eUtbqrXbyrlg8UqpIdd97S4pgHTL7WzSTUxkMjAYCTjfpzOnTugVQ5p6zUiqafQH FTsF6+rj0p+YdlqOG5J7+douexXQWVOCkXi8oGWpN0lQ9jFiATOdqBXOR2I9VUJ+lnmR T2bNVOCQ4UDH407gPplZtERiMQ2EYM18nlu851hi75qK4QUptRMUkzONfh0IXPoCmhLs e/0A== X-Gm-Message-State: AGi0Pubu7wR5RvUfHdDdrhobDHFX7Z/Rjb0Cq/TUV8gjsZuipC/SGxff t9W9XJuWh47KtL3btK5gOI8j/aSmeO/GKVVgbOhG5OYe X-Google-Smtp-Source: APiQypJyH6sjDPkYvAF98CvGFpf1lNOPdv/JCx+w3tTvy0I2jPcUNiCjA6G0lLs6ysEcUjW9NLjHik0xrrIwbrh5ca4= X-Received: by 2002:a4a:894d:: with SMTP id g13mr13056733ooi.81.1589301845308; Tue, 12 May 2020 09:44:05 -0700 (PDT) MIME-Version: 1.0 References: <20200421211755.GA93074@FreeBSD.org> In-Reply-To: <20200421211755.GA93074@FreeBSD.org> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Tue, 12 May 2020 18:43:54 +0200 Message-ID: Subject: Re: Git tags vs SVN tags and some edge cases To: Glen Barber Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 49M3jq1g7Bz4TXw 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.219.195 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [7.80 / 15.00]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; GREYLIST(0.00)[pass,body]; NEURAL_SPAM_MEDIUM(0.98)[0.981,0]; URI_COUNT_ODD(1.00)[31]; IP_SCORE(-0.17)[ip: (0.02), ipnet: 209.85.128.0/17(-0.39), asn: 15169(-0.42), country: US(-0.05)]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[195.219.85.209.list.dnswl.org : 127.0.5.0]; NEURAL_SPAM_LONG(0.99)[0.991,0]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[195.219.85.209.rep.mailspike.net : 127.0.0.17]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_SUSPICIOUS_URL(5.00)[11.0.0.1]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Spam: Yes 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: Tue, 12 May 2020 16:51:44 -0000 Am Di., 21. Apr. 2020 um 23:18 Uhr schrieb Glen Barber : > I was asked to send and email about this as something about which we > need to be aware when retaining history during the official final > conversion from SVN to Git. > > There are four known anomalies (naturally, all of which are mine) with > SVN tags that may not translate well when the conversion to Git is done. > Here follows said known anomalies and the reason for their existence: > > 1) 11.0-RELEASE and the case of the real RELEASE - 11.0-RELEASE-p1: > When the initial builds for 11.0-RELEASE were done, there was still > an outstanding issue with the freebsd-update(8) utility that I was > under the impression had already been fixed, but it had not. Since > 11.0-RELEASE was already available on the download mirrors and had > already become actively used, the original ISOs were renamed and > following the fix to the issue blocking the release, we opted to > release 11.0-RELEASE as 11.0-RELEASE-p1, retaining the original > release/11.0.0 tag and re-tagging the real official release as > release/11.0.1. > > 2) 10.0-RELEASE and the case of missing build fixes: > During the 10.0-RELEASE cycle, the release/10.0.0 tag was created > from r260664, however there were several changes to fix various parts > of the build, committed as r260788. The real 10.0-RELEASE tag was > created from r260788 to incorporate said fixes. So, this tag was > deleted and recreated. [1] [2] [3] > > 3) 9.3-RELEASE and the case of the wrong source revision: > The original 9.3-RELEASE tag, release/9.3.0, was created from r268519 > by mistake, when it should have been created from the commit that > changed the name to -RELEASE (r268512). So, this tag was deleted and > recreated. [4] [5] [6] > > 4) 8.4-RELEASE and the case of the change-in-a-tag wrong commit: > The original commit for 8.4-RELEASE included a change to > sys/conf/newvers.sh to rename from -RC3 to -RELEASE, which was wrong > (r250625). The release/8.4.0 branch was deleted in r250629 and > recreated from r251258 (not a typo) after the erroneous commit had > been discovered some time later. > > [1] > https://lists.freebsd.org/pipermail/svn-src-release/2014-January/000007.html > [2] > https://lists.freebsd.org/pipermail/svn-src-release/2014-January/000008.html > [3] > https://lists.freebsd.org/pipermail/svn-src-release/2014-January/000009.html > [4] > https://lists.freebsd.org/pipermail/svn-src-release/2014-July/000010.html > [5] > https://lists.freebsd.org/pipermail/svn-src-release/2014-July/000011.html > [6] > https://lists.freebsd.org/pipermail/svn-src-release/2014-July/000012.html > [7] > https://lists.freebsd.org/pipermail/svn-src-release/2013-May/000003.html > [8] > https://lists.freebsd.org/pipermail/svn-src-release/2013-May/000002.html > [9] > https://lists.freebsd.org/pipermail/svn-src-release/2013-June/000005.html > > Glen > Thanks for the summary Glen, the tags are being avoided by the rules and not extra tags are being produced. https://github.com/freebsd/git_conv/blob/master/freebsd-base.rules#L65-L77 (couldn't find a way to make a stable URL, so the highlighted lines are sure to drift) Cheers Uli From owner-freebsd-git@freebsd.org Thu May 14 19:46: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 32C832DC79A for ; Thu, 14 May 2020 19:46:29 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 49NMVX1PNMz3Jsn for ; Thu, 14 May 2020 19:46:27 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f65.google.com with SMTP id f4so2082216iov.11 for ; Thu, 14 May 2020 12:46:27 -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; bh=DVIvwKUkL2sQZWMY0on/MAf7ct6vk1PuYnoa4Qu6Kr4=; b=IFuGkp1+zotyGJirt/xFz9TF+YHRznz1zv3Q9n2M15JzmUaSdvQ+JdZv4/+1sPhC0h 1KnFu7ooj9BVy7BWGNcxPHUM2tPy4iafCf9Lvog7OiyX+S7ihoTyIFuor9AQSqPk4C4h 4pKjZlnt5zeiVKSyQu9hb98DaGis3u+H3eDf+Ny4na+J7Cfo5NcO1z/8YLFWEogOopp3 bptNcNLLjWrkaFEEMCc3/7w9tvLh1VyooRJGd88vJBt0AvQWBQKh3rvqYoGK7MXlfGc6 rQYkYIXqVPFsRfB/DjqQVWGnifm/WPfbttRLmdNDgmd/tK7ac1nNzvhzfPiLE/eK5QaA yhGw== X-Gm-Message-State: AOAM533RpwSWO1hmQp2hSesnx07GJTKDGj9L14RISE6D4A0P90Bbq+dF 4qjr46hGIF5G8X/vbZ31FtyNA33hajGn4O+/wNHkowMcqb4= X-Google-Smtp-Source: ABdhPJyXPQTdqiup+t79FJ2/gXmwhHbNLfgTeCHgocDUvRfa68+XHhE4AUxCK/PxIaigw/gjOKhMGM32KMvLihDvorQ= X-Received: by 2002:a6b:7c45:: with SMTP id b5mr5689042ioq.31.1589485585541; Thu, 14 May 2020 12:46:25 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 14 May 2020 15:46:12 -0400 Message-ID: Subject: Re: Experiments using git subtree to manage FreeBSD contrib/ To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49NMVX1PNMz3Jsn X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.65 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.16 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.988,0]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[65.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.17)[ip: (0.01), ipnet: 209.85.128.0/17(-0.39), asn: 15169(-0.42), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; DMARC_NA(0.00)[freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[65.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[] 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, 14 May 2020 19:46:29 -0000 On Wed, 22 Jan 2020 at 09:33, Ed Maste wrote: > > Tom Clarkson posted a patch set[3] that allows command-line control of > the subtree split process and avoid the undesired part of the commit > graph. I tried the changes, and the patched subtree split works as > we'd like. Tom Clarkson's subtree work is now submitted: https://lore.kernel.org/git/pull.493.git.1589176201.gitgitgadget@gmail.com/ > base-commit: af6b65d45ef179ed52087e80cb089f6b2349f4ec > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-493%2Ftqc%2Ftqc%2Fsubtree-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-493/tqc/tqc/subtree-v1 > Pull-Request: https://github.com/gitgitgadget/git/pull/493