From owner-freebsd-stable@freebsd.org Wed Dec 23 16:58:23 2020 Return-Path: Delivered-To: freebsd-stable@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 B0D7F4C49ED for ; Wed, 23 Dec 2020 16:58:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 4D1KCf66Vkz3QW6 for ; Wed, 23 Dec 2020 16:58:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2a.google.com with SMTP id bd6so38808qvb.9 for ; Wed, 23 Dec 2020 08:58:22 -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=XBlfh13lQPoUv1fPqXP65w4/14nny66wIZboI+33OQo=; b=dsVtYsnbN9BxBvoZItvOZzp3wbTk1HHX/4udK/EbFi2DV+PL7vpxZkXkqFjAfrH3Pm A/y2B1uxuQQM2dHMpz6eub+a0dlNsL3+f/YE98GyiiAw7o+IVNi0xfb9ox4sZSC3jxey /Wreli9hj2y428wOjdJEfZt/e+W6svo/a24tIwhHuKXsuTbNL+rT8a1CmDcRQx54Xawo siBdaAt8RmzRhiPvTFNtEIWaGXnxOpfKw9QFonQ1LoZiSaU5s91VZpUTp0UnSp3APG/6 b2ouplrTibxOfN5iuN7P1BP/Z+vWIJp40HPqwOLpUG/C/C9jX4jTZoFqf5zdffODr+Tm B1pw== 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=XBlfh13lQPoUv1fPqXP65w4/14nny66wIZboI+33OQo=; b=Y1shAA5UhZHSZsXis9RkFKJEndamJSNwmPoVJuy7HoVUoG/ELL6NhFhRiAOS4aJJ+r +Mj2AbExlnXtatCpjf5yN1L7jmWk5NZPlQJy50BLLD8FhHpHX/VwEuN1EhQylfPKyzkL mwkre6S3xS4q/ec2noihZl/V+7EPg/DbE6s7MKTX+OLQqqHq0nUcjmDqo4AQKVBHl1Ys Hj90ShuG9EB31efJXyIw9AUl6US3RedXfeFY/V2Lw2M3z5FR3AV4C+2wKOUViKopMZKB 7kO20ihsV+PKJi/iptcyJrCF0gr7Ig7YwO+KrBN/Mw7pnFYH6ip28kQcJqHUQspo/ulI sDxg== X-Gm-Message-State: AOAM532smswWPcwySlgmvm2E1vpwaUQzDXbIuJcZ0iHBZdJc0BdovtNQ m4DF8Jz1eFWu5SY7xij9laV8tzBv2b0ENhPMtrXlRgpCDgYv3Q== X-Google-Smtp-Source: ABdhPJzKb1pa4tUf6I92dc0D9PHSnqg5FpxaSnnbSlUZ3oRUCQXNlY+A34Uh8KfXGUL17+8VyLpcZGaZzvVRbEDBJjc= X-Received: by 2002:a0c:b347:: with SMTP id a7mr22952839qvf.23.1608742701951; Wed, 23 Dec 2020 08:58:21 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 23 Dec 2020 09:58:10 -0700 Message-ID: Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: Marek Zarychta Cc: FreeBSD Current , FreeBSD-STABLE Mailing List X-Rspamd-Queue-Id: 4D1KCf66Vkz3QW6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=dsVtYsnb; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f2a:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2a:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f2a:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2020 16:58:23 -0000 On Wed, Dec 23, 2020 at 3:35 AM Marek Zarychta < zarychtam@plan-b.pwste.edu.pl> wrote: > W dniu 17.12.2020 o 01:46, Warner Losh pisze: > > Greetings, > > > > The FreeBSD project will be moving it's source repo from subversion to > git > > starting this this weekend. The docs repo was moved 2 weeks ago. The > ports > > repo will move at the end of March, 2021 due to timing issues. > > > > The short version is that we're switching the version control we're > using. > > This switch will preserve much of the current FreeBSD development > workflow. > > After the switch, the subversion repo will become almost read-only. All > > future work will be done in git, however as a transition aide we'll be > > replaying the MFCs to stable/11, stable/12 and the related releng > branches > > for the life of those branches. > > > > For more detailed information, please see > > https://github.com/bsdimp/freebsd-git-docs/ for the current > documentation. > > > > Please see https://wiki.freebsd.org/git for the latest detailed schedule > > (please note that this schedule is subject to change). > > > > Warner > > _______________________________________________ > > freebsd-current@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-current > > To unsubscribe, send any mail to " > freebsd-current-unsubscribe@freebsd.org" > > > > Will the project utilize gitatributes(5) to support ident as $Id:$ in > git repository? > There are no plans. $Id$, as implemented in git, records the wrong information. Rather than a commit hash, it's the blob object hash which can be hard to puzzle out. It would cause way more confusion were we to use it. Plus, when I did experiments with it, it was slow and difficult to work with. Given these issues, we've opted to not use it. Plus there's no documented way to change $Id$ to $FreeBSD$ in an easy way, and the filtering stuff looked extra fragile. > In file header, we have now only $FreeBSD$ since svn tags disappeared > after the transition. Adding ident tags to certain files which are > updated by mergemaster(8) or etcupdated(8) would be appreciated. > mergemaster and etcupdate can cope without them. Warner