From owner-freebsd-current@freebsd.org Tue Nov 17 05:32:51 2020 Return-Path: Delivered-To: freebsd-current@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 D86D62D0799 for ; Tue, 17 Nov 2020 05:32:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 4CZvjG4Tbmz3h7Q for ; Tue, 17 Nov 2020 05:32:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x736.google.com with SMTP id 199so19403844qkg.9 for ; Mon, 16 Nov 2020 21:32:50 -0800 (PST) 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:cc; bh=zQSV3C5RwnBjQ3pX9GlLzDAMxoxagrzZtVY8/AR3UhQ=; b=faOV7MdWGip6EAOiiAzKBmd3gl04sbBh/KKv6bKyOQM5SFX8EhKPgUQmPQ14M3oAcD bZia5dqNYtFI8GZh04D6BICnaItCAj7Ko+/tvijqgVwJl7JlGb1ZGES0Kw4eb5Xuf4Qq jZ518JL92F0MPrZre8ZMD+8SqTRbIXJjryxHHQstdZ0g7qqcO+r2GoPbkHMI8o8F32yo CMc9KzKROwws/WBj/m2A8I5Afep2Xkv9a9Riuv4Fpad42TCbEBySzHSOGmGwOnam6YDA jkeh48fd6Zw6z8C8m2V/5ymIAII1jRPAEt++SCK4Fm3Ysvh7LSU6EDLCdOaXse6VTU7Y kA8g== X-Gm-Message-State: AOAM5320/0Z8uVKciEBct81Jo73GREFi8m+Wqyl2RKFuNtO1pFPvTTK2 LGDk6lEam+4DhFCJ16orD+ycaGsOguoZla2sXlXSnwTSryqLvw== X-Google-Smtp-Source: ABdhPJz5Qh4aR6t/EV0raoiOkKuhp8e2uXW8+ZqGcXqxcuGYu+L8GsPbRV7ejqSFjP9O1CLu3YNFTzQz+RzOMo/HVsI= X-Received: by 2002:a37:78c:: with SMTP id 134mr18674229qkh.359.1605591169279; Mon, 16 Nov 2020 21:32:49 -0800 (PST) MIME-Version: 1.0 References: <5fb33a11.1c69fb81.2d2a6.f92eSMTPIN_ADDED_MISSING@mx.google.com> <5fb35900.1c69fb81.7679c.a50eSMTPIN_ADDED_MISSING@mx.google.com> In-Reply-To: <5fb35900.1c69fb81.7679c.a50eSMTPIN_ADDED_MISSING@mx.google.com> From: Warner Losh Date: Mon, 16 Nov 2020 22:32:38 -0700 Message-ID: Subject: Re: in -current is svn still canonical? Cc: FreeBSD Current X-Rspamd-Queue-Id: 4CZvjG4Tbmz3h7Q X-Spamd-Bar: + X-Spamd-Result: default: False [1.63 / 15.00]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; MISSING_TO(2.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::736:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::736:from:127.0.2.255]; NEURAL_SPAM_SHORT(0.63)[0.630]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::736:from]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2020 05:32:51 -0000 On Mon, Nov 16, 2020 at 10:00 PM Thomas Mueller wrote: > > Subversion is the source of truth for FreeBSD today. > > > In the near future, likely early next month, we'll move our operations > over > > to git. Git will be the source of truth after the flag day. All developer > > operations will be in git: committing to current, and MFCing will all be > > done with git. As an aide to users that started the FreeBSD stable/11 and > > stable/12 branches, however, we'll be exporting the commits to the git > > branch stable/11 and stable/12 to subversion. The subversion tree will > > otherwise be read-only after this date. > > > The doc tree will likely convert at the same time that the src tree moves > > over. There will likely be a lag for the ports tree. It's unclear if they > > will switch at the same time as the src tree, or if there will be a > > few-months-long lag. > > > Warner > > Thanks for the information, but if you feel the need to send me a > not-quite-CC, please don't send me the multipart/alternative version when > you send the plain-text version to the list. > > I hate multipart/alternative! > I must apologize. Sadly, I use gmail, so I have no control over how it decides to encode things, sadly. I've tried in the past, and alas, nothing I've tried works for any length of time. Please forgive me whatever unspeakable MIME atrocities it sends on my behalf. I've removed you from the cc line in the hopes that the FreeBSD mail server cleans things up to be more to your liking. > When git becomes the source of truth on FreeBSD after the flag day, will > it be necessary to git-clone the whole tree from scratch, or will there be > a conversion tool to switch the svn download to proper git format? > For the supported stable branches, you'll be able to download via subversion and switch over at any time before the end of project support for the branch. However, when you make the switch to git (either due to the flag day and tracking -current, or jumping from svn on a stable branch), there's no tool to convert the subversion checked out tree to a git tree. The needed information needed to create the git tree isn't easily available from the subversion checkout, so you'll need to do a git clone. If bandwidth is a problem, you can do a shallow clone that omits all the history and just grabs the branch of interest. Git is a bit more link efficient than subversion, which is helpful. Git also has ways to help you share one local repo across checked out versions, which can also help if you have to track multiple branches. > The doc tree is much smaller than the src tree, while the ports tree is > much bigger than the src tree. Is that the reason for the few-months-long > lag switching the ports trree to git? > There's a couple of things that make it trickier. The ports tree does quarterly branches. So there's a window around the quarterly branch when it's easiest to make the switch. In addition, the character of the files in the ports tree differs from src. Unlike subversion, git infers copies, moves, etc. The mostly similar nature of the ports tree is likely to cause git grief when ports are copied, resurrected from the attic, etc. The ports folks are still figuring out how to best use git to track the history they need to track without creating undue issues. It's not clear if that will all be sorted out before the next window in December, or if they will have to defer until March. This is why I hedged a bit as to the exact time, since it's not been nailed down yet. So it's not so much the size, as the difference in makeup and character between the two trees. The doc tree is, as you point out, much smaller, less active and its needs are more modest and largely mirror the src tree, so it can be done quickly at any time. Warner