From owner-freebsd-current@freebsd.org Sat Sep 19 17:42:45 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 AE9AD3E9CDA for ; Sat, 19 Sep 2020 17:42:45 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 4Btyhh5XCsz4Gyd for ; Sat, 19 Sep 2020 17:42:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf29.google.com with SMTP id ef16so4945447qvb.8 for ; Sat, 19 Sep 2020 10:42:44 -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=UskghZU2oteW3ntWyIvQSjGRRnum4IrjT2L96OuCT04=; b=q4l3FuYmMTm4Nfe9U/iTemMbvtnK0OEwdRgp8iAHv8C+igYsfDyo0R1X7kh+T+2x12 CU83ugS/9him2l7UJM3Mb0vQLbzF7rxogXLzghUsRtDjt5MCbmifJwDt0FLsPOH5AGVn ElhBZ6vrti+eMH5AFyDX8u3mVrjLf66VPm9eQo9eZ7OLVXMxQ76WgWbb6kwKFfpuFF4f paFTVCZBFdLulAUQB+Pcj3fQrZj+8Dkvv4LLA0d+Cky16GCl9WxFSfWvsLms7lDE+fYj 59fTAzq+F9hYlr4nZoTQu9/sQmW2mLhiUtN/cSgNHCgUUUW5hReEi13Fydc+uURd94PM QZuw== X-Gm-Message-State: AOAM530f0gX+XoMfg270QdxCDeiezsJXwod7GSsWtHrR5diqA+NYQpTL t8cNP97opvgIUx2pOnEzFRi1pBZsiH+wzio0CmiVEg== X-Google-Smtp-Source: ABdhPJwW98svEUwTPhnsS5gybHn/TzJVH0WbS6Wd6KYVuz29/SnKitZqzHZUewkZ1pdFjfaZVSIaNXlqaHOWi1DiX/Q= X-Received: by 2002:a0c:a482:: with SMTP id x2mr22665251qvx.56.1600537363477; Sat, 19 Sep 2020 10:42:43 -0700 (PDT) MIME-Version: 1.0 References: <20200902045939.GA15897@eureka.lemis.com> <20200902060117.GG53210@home.opsec.eu> <20200902063136.GA47543@troutmask.apl.washington.edu> <20200902164706.GA49777@troutmask.apl.washington.edu> <5c89b4d27281f5dfffc3252a90013b0ac6c763d7.camel@freebsd.org> <5c832482-b2bc-47e4-8762-8f5a886d5f11@www.fastmail.com> <68585ca4-5ca4-40d3-b2f4-67ff3b35b6ae@www.fastmail.com> <0be2ae57d1c58e2091f4cc4484731df0@bsdforge.com> <967D73EA-880E-413D-B748-62A406C46524@FreeBSD.org> <9f89dc553e7d7b0884c2862329bdfeae@bsdforge.com> In-Reply-To: From: Warner Losh Date: Sat, 19 Sep 2020 11:42:31 -0600 Message-ID: Subject: Re: Plans for git To: Bakul Shah Cc: Zaphod Beeblebrox , Chris , Kristof Provost , FreeBSD Current X-Rspamd-Queue-Id: 4Btyhh5XCsz4Gyd X-Spamd-Bar: - X-Spamd-Result: default: False [-1.95 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_MEDIUM(-0.94)[-0.939]; NEURAL_HAM_LONG(-1.03)[-1.027]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f29:from]; NEURAL_SPAM_SHORT(0.02)[0.020]; 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:~]; 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-current]; FREEMAIL_CC(0.00)[gmail.com,bsdforge.com,freebsd.org] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 19 Sep 2020 17:42:45 -0000 On Sat, Sep 19, 2020, 10:05 AM Bakul Shah wrote: > On Sep 18, 2020, at 11:21 PM, Warner Losh wrote: > > > > These are the main ones. The three down sides are lack of $FreeBSD$ > support > > and tags in general. > > Can a git hook be used for this? > No. Not really. There is an extension to git to mark and unmark the tree. However, the markings aren't useful enough to even pursue that. > > > Yes. I've started doing a series of short videos explaining the change, > why > > we are doing it and what to do in the new world order. I'll be doing blog > > entries as well as turning that material into handbook entries. I have > some > > of those written. > > > > Does this help? > > It would be useful to describe the development model (e.g. how major/minor > features get added etc), how to maintain multiple local branches (e.g. > release branch or -current) or working on more than one feature at a time > etc. > > Do you plan to move to something like the github review process? > > When is the cutover supposed to occur? > I'll have all that in a newer blog. But here is a quick summary. We hope to do the final cut over next month. We hit a snag with some inconsistencies in the svn mirrors we need to chase down, plus that give me some more time to document things better. Initially, just the tool changes to match today's workflow. However, that's just the first step to allow us to improve the work flow incrementally as different aspects of it get community buy in... The cgit-beta.FreeBSD.org and github trees are not identical the last > time I looked (mainly in meta data). Any reason for not keeping them > identical? I switched from the github tree to the cgit-beta tree. > Yes. The checked out trees are identical. But the hashes and some revs differ slightly. There are simply so many mistakes in the github export that we decided the pain of fixing was smaller than having to deal with them forever. I'll try to write up all the details for this as well. Warner FWIW, I have used sccs, rcs, cvs, subversion, mercurial, git & a few more. > I have used git exclusively for the last few years. I felt more comfortable > with git once I understood the on-disk storage model. The Pro Git book is > pretty good for that & more. > > Thanks, > Bakul