From owner-freebsd-git@freebsd.org Wed Jun 10 13:56:45 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 49B15334DE6 for ; Wed, 10 Jun 2020 13:56:45 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) (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 49hpSX1hMTz41xX for ; Wed, 10 Jun 2020 13:56:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f180.google.com with SMTP id 18so1949741iln.9 for ; Wed, 10 Jun 2020 06:56: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:content-transfer-encoding; bh=Arlz8iHUf6lq+0jNJl0IuzolDHzVPtfM5iqN/RVxTn8=; b=JPxXlD53YnawwM3OV1XRP7/q3XZ6dkRwA/3FE/DCiWV0cOA8a+o8fCtJkaccsH0Vgz Ht3sxN2/Mhi6fedoHW1HKV1HsZGbL1DtebKeYPqhWeNGZ1f0Ppff2HCOf3EJao98tomz f4xTGniLbJBLMZFtuSIS0Z2j335CwFcv7+DJG7BpDtm33o0Sjm/D+svoNSyyd9Qj+x76 78tifFrSKLvCLRS2tcUWLZNOMgO3u7u/c+l1TB7wHvi0T+YvbWmqFq6JcTIAkJT+ZK6O T/XH5qUS1Y9SsBbBVE4nUrDbUUBdsAjnem8PgTVvHgZZ3nrAvUD7rAug/kNFPpIM95M0 pdfQ== X-Gm-Message-State: AOAM5303rto3w+GVh53UpqWWi/sbZ4U/hrsZVShRYmmtvbQISZQsVxuC iwhINbEROcOg2eZKMyLEAHj5D1xH4vbIgtNdzkV5zJLu X-Google-Smtp-Source: ABdhPJx8MzXC4YIbJ5c8TfUn5CEPNXnnTnp6vMt3PBlhIPlFr0/ixJ168QkAAAWX4xGgUWoz0inyl6kQR0AwLjlAEjw= X-Received: by 2002:a92:dccd:: with SMTP id b13mr3019070ilr.98.1591797403067; Wed, 10 Jun 2020 06:56:43 -0700 (PDT) MIME-Version: 1.0 References: <202006092232.059MWWao074759@slippy.cwsent.com> In-Reply-To: From: Ed Maste Date: Wed, 10 Jun 2020 09:56:30 -0400 Message-ID: Subject: Re: Beta git conversion available for experimentation To: Warner Losh Cc: Cy Schubert , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49hpSX1hMTz41xX 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.180 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-1.84 / 15.00]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; NEURAL_SPAM_SHORT(0.01)[0.013]; NEURAL_HAM_LONG(-0.92)[-0.917]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.180:from]; NEURAL_HAM_MEDIUM(-0.94)[-0.939]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.180:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com] 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: Wed, 10 Jun 2020 13:56:45 -0000 On Tue, 9 Jun 2020 at 18:48, Warner Losh wrote: > > On Tue, Jun 9, 2020 at 4:32 PM Cy Schubert wr= ote: >> >> Do we have any doc on managing contrib using the git model? > > We're working on our suggested best practices. We're making sure that th= e early testing we did to come up with the basics can be replicated easily = enough for it to be practical. > > There will be a doc going over all the following in detail, but here's th= e outline. > > git subtree allows one to merge in other repos into our main repo w/o use= rs of that repo needing to grab the merged in repos. We plan on making what= we call vendor branches today vendor repos. We'd then do a git subtree mer= ge from that repo as it tracks upstream. Also, I described my first experiments with git subtree earlier: https://lists.freebsd.org/pipermail/freebsd-git/2020-January/000221.html