From owner-freebsd-git@freebsd.org Fri Mar 27 19:17:59 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 0EE5A27ED12 for ; Fri, 27 Mar 2020 19:17:58 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48ps7g0XJJz3LKr for ; Fri, 27 Mar 2020 19:17:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 8C4A527EBAA; Fri, 27 Mar 2020 19:12:12 +0000 (UTC) Delivered-To: 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 6789827EBA8 for ; Fri, 27 Mar 2020 19:12:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 48ps0z4KZWz3JRr for ; Fri, 27 Mar 2020 19:12:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x836.google.com with SMTP id f20so9560472qtq.6 for ; Fri, 27 Mar 2020 12:12:03 -0700 (PDT) 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=eDmAjLDr8xQZyCIs6zp4v3IkSjyNE8CGC7Gp85jRoh0=; b=mEA3mfLf+ePqx/Cs53i6oakZkB9nwgMpFng3bRJ4z8FB6SulPjQlYp49vef8pnJMaB +33VJV6eeLFYPfhL5/wICoOXsC6jpu8iNalfSRHY8/KlCkUKchGP4gV5LP5EOGZCaAJZ ccNLXNz5EsdjF87UdR+HZaRL97FANa6z5JjG7DC7DvM4zszbhyr8dOp4dRVORTby9SMo qIkd0OyPGmzxJGqVPSwwrgiBaem4VRdk8hgbapPM2+2YgtCLW4GQfzxc4JA/tnB1m1Dv wP00oxajb7xiUXuiE/XpruPLPK50aXN7VgOVLT5woi7IkEJz5F27/djRx0wlb2k/CQaf krgw== 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=eDmAjLDr8xQZyCIs6zp4v3IkSjyNE8CGC7Gp85jRoh0=; b=ZjPyBq3fiq1iaEzNEbaLSitELdi7m7WpDgbmUzkg+EMGChczWkX824lSrrKhmPzDF+ Q1vX1MVObKz+7VYsX5YCW5SOXOVB6iHK9dUIG1P4xrwzFiaVghGwW9e078mTGtndFfOu Qk0zmAZSsCJOEkhNtGsGDL1Vs3pUO+zqRQmghWlI7vc9ciVdBBfM2HcUCauF0rordG1q hhsBMBfslb8k5wtRCPc8TI1bUzUzQPLh/nMFgUctiifKbSCvUOB1lfGHRAQw0P+LENVi XVxZqTNWw+jBz0O9OXAbaA45QKF1CRLvu/cQTiVJUw6AZJqaJSnomfOhLfG5bCVdE63I I8LQ== X-Gm-Message-State: ANhLgQ1r43FJV63ZY2i2pm0+mdWtgzyHv8hWoa4daPVRjmi5vnGAycrH v+c3wEsjYCJ/rYVux5wnV/kpfVTnp9OazEcUNqnSDg== X-Google-Smtp-Source: ADFU+vtuF3tchma6E2y0qc4x/YJ4zdkIEGhRudB39JhptNk9b4+yFhPiA0+lOqGHCVHnVAZb7JNncx9s5RXTKojCdDk= X-Received: by 2002:ac8:3488:: with SMTP id w8mr768358qtb.187.1585336315135; Fri, 27 Mar 2020 12:11:55 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 27 Mar 2020 13:11:42 -0600 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org X-Rspamd-Queue-Id: 48ps0z4KZWz3JRr X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=mEA3mfLf; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::836) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[6.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.00)[ip: (-9.13), ipnet: 2607:f8b0::/32(-0.37), asn: 15169(-0.47), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_CC(0.00)[gmail.com] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 27 Mar 2020 19:17:59 -0000 On Wed, Mar 25, 2020, 8:36 PM Ed Maste wrote: > On Wed, 25 Mar 2020 at 22:06, Warner Losh wrote: > > > > On Wed, Mar 25, 2020, 1:33 PM Ed Maste wrote: > >> > >> On Wed, 11 Mar 2020 at 05:20, Ulrich Sp=C3=B6rlein > wrote: > >> > > >> > This is intentional, please see > https://github.com/freebsd/svn2git/blob/1a0b3e0230e1b2430e5d8eb91ac99aeff= 5a1614d/src/svn.cpp#L883 > >> > > >> > Only projects and user branches are represented as merges to master, > as they usually have a full tree. This seemed to match the git model bett= er > (as opposed to the SVN model). > >> > >> IMO we do want vendor code updates recorded as merges. This is already > >> happening today for certain updates (svn merge -c updates I > >> believe). For example my most recent ELF Tool Chain vendor update: > >> > https://github.com/freebsd/freebsd/commit/ca8624403626d5a4e13f5006026ca6b= a40c12ac5 > > > > How do we both do subtree to not not have the vendor repos commingled > inbour tree and do this? > > I'm not sure I understand what you mean here, but there's no problem > for us to have the original snapshotted history just as we do with > merges from svn vendor branches today. > The vendor repos we wanted to do would be complete on their own. We don't want the revisions of those repos in the main repo. A merge commit would make us have them in the main repo. Then again, maybe this eliminates subtree if we can't do that. It was why we were looking at the other one: it creates a repo that is independent of the merged in repo and it requires no extra modules for our users to install. Warner >