From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 4BD95385780C for ; Wed, 20 Jan 2021 13:49:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4BD95385780C Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-79-xWzXGT41MLWv2P1VVlzRiw-1; Wed, 20 Jan 2021 08:49:03 -0500 X-MC-Unique: xWzXGT41MLWv2P1VVlzRiw-1 Received: by mail-qv1-f70.google.com with SMTP id l3so23144778qvr.10 for ; Wed, 20 Jan 2021 05:49:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=+d51ymMuYoC/Cs7sAnVsq53qGyePMPyUovcX/Am1ioE=; b=hNvfxN/evrDaLSlCazuggM2m9voYS1I/noZKUSHpCsaiMmpOBeskfX5x0KnLB2RdP1 +bww5A9fCdqXAg5ozt02CPsVRUyJK1elsIj8VHtpFYYMreRbYEgnFT7RQ8FdZ8MqxtbL 0HZWVOGrVk35FYxOggs4Cj0sfByG9+ijVQuScjzcDF+Id29QlswSVDJ3kt4vs6RazXlo Xc9H3iSoGT/4ZxGMlRzDSHy1eiJBYUL9OmEmr/vfuTKhc9x3DqRn2s3eBQvPeozTnkUW OLeD8V/c6edW0YCFR3kb/SeRT2Q/bLA+lE7YktQ5g3SZJl1kzwloxq/CAOFrRR+lpc2j 1H/A== X-Gm-Message-State: AOAM531pVozPIZuYMUPkEcz40igVt+rYbSz6jb5VEl09DWjoh4jMZbFc +C0DUYVz+70ydwasOVSkufTGDnPf/1gcmQbHEE8JnYMyHn61tzXaQ7Flt6bnYSj1+MOffXVFbTc NAmqqpq2jlgd4eQrjjbf/JHNXYm+lO//uUy6ok6wT4m9zwioZPJ3wZBb3XcpH/5OapuSnXA== X-Received: by 2002:a37:4a82:: with SMTP id x124mr9496541qka.458.1611150542715; Wed, 20 Jan 2021 05:49:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJzI0nLNXgtBpKqv5eXZLYag5p+Rq05hqQ06BSVm8XOgBltigX0Xr+Snb92wqURIeU7B6nonng== X-Received: by 2002:a37:4a82:: with SMTP id x124mr9496515qka.458.1611150542412; Wed, 20 Jan 2021 05:49:02 -0800 (PST) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id o10sm1171263qtg.37.2021.01.20.05.49.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Jan 2021 05:49:01 -0800 (PST) Subject: Re: Rename "master" branch to "main"? To: Joseph Myers , libc-alpha References: <20210114092156.GK6938@vapier> <5727ea36-898b-6127-bcde-d6bfe2540c23@redhat.com> <20210114214223.GM6938@vapier> From: Carlos O'Donell Organization: Red Hat Message-ID: <3a4f5a34-3711-19ea-2b06-75b3a98c6246@redhat.com> Date: Wed, 20 Jan 2021 08:49:00 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210114214223.GM6938@vapier> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2021 13:49:06 -0000 On 1/14/21 4:42 PM, Mike Frysinger wrote: > On 14 Jan 2021 15:56, Carlos O'Donell wrote: >> On 1/14/21 12:54 PM, Joseph Myers wrote: >>> On Thu, 14 Jan 2021, Mike Frysinger via Libc-alpha wrote: >>>> On 30 Jun 2020 14:10, Carlos O'Donell via Libc-alpha wrote: >>>>> As we approach the release boundary for 2.32 we come to a natural point >>>>> where we can rename our development and release branch. >>>>> >>>>> My proposal would be to rename the development and current release branch: >>>>> >>>>> * master -> main >>>> >>>> this seems to have stalled. we should do this! >>> >>> Please see my previous comments. Anyone making such a change needs to >>> review the git hooks, hook configuration (e.g. >>> refs/meta/config:project.config), hooks-bin scripts such as >>> email-to-bugzilla-filtered and post-receive, and wiki and other >>> documentation to identify *all* changes needed where master or branches >>> containing the string "master" are special-cased or otherwise mentioned. >>> The hooks and hook configuration updates need to be ready in advance of >>> such a change. >> >> Correct. >> >> I am going to look into this in the next 6 months. >> >> The work needs to be done with someone who has access to sourceware to >> make and review such changes in the scripts and merge the changes upstream >> with the official AdaCore hooks. > > it wasn't clear to me if we thought we had consensus on the issue which > is why i wanted to kick the nest again. it sounds like we do, so now > we can start on the messy process of actually changing things. > > it does sound like all of the things to do before we can roll it out > are in the hooks. if we can deploy a redirect, the docs don't have to > be done right away, and it'll give us more flexibility with a "soft" > release. > > based on the tasks at hand, sounds like a wiki page would be best for > keeping track of everything to do ? i don't think bugzilla is good > for checklists & adding/removing items, and creating multiple bugs > feels more like overhead than useful time. I agree. A wiki page checklist of things to check/review would be good. Mostly I think it's just a lot of work and nobody has objected to someone doing the work. It just has to be done well and with a high quality solution, rather than something that is an abrupt change that requires a lot of downstream fixing. Having said that, I don't know how to do a redirect to keep old branches working (though I've seen it done in Fedora when we wholesale moved from /foo to /rpms/foo). -- Cheers, Carlos.