From owner-freebsd-git@freebsd.org Fri Mar 27 21:06:50 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 B3558261682 for ; Fri, 27 Mar 2020 21:06:50 +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 48pvYN56GFz4Wq2 for ; Fri, 27 Mar 2020 21:06:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 19B38261681; Fri, 27 Mar 2020 21:06:38 +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 14996261680 for ; Fri, 27 Mar 2020 21:06:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 48pvY33w0tz4Wkm for ; Fri, 27 Mar 2020 21:06:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x829.google.com with SMTP id t9so9831614qto.9 for ; Fri, 27 Mar 2020 14:06:31 -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=f4/AWcAuDKg7TsiN8CEVC1XT44KqHbT1qPW68yb1neQ=; b=r89xsDzJOB+QxaCe9V3qO/jxDDm7RHMsBUPR22jbmVNBFYFzEVVjsRhhlCNlGTgJyC cfodT2AmQnco+HWxQXc52hz/xF+k8AnigcbP4FtlG5vXxWaifLAjto0GUkqfKu0zmn0Z acaPy1mTgyCKv2e6cCLTUJ5XcdfjXWZhB0UdJu83jK7VXcQ1d0H1IMxW4YvShH/bGvCs fK+dZRruNCGBw6ylkYIHRs8YiD8CsgLD8my/DgiIAAPs6Kxf8mwaKZLFckHOMp1iyayw 9+X8NMRqT87/M74ETQ2AALo5clEq/1TVlC9e1CFsKOWtKBcniBQeoHZoumz51mowwp+P Ysjw== 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=f4/AWcAuDKg7TsiN8CEVC1XT44KqHbT1qPW68yb1neQ=; b=bVcD93+Wq6n08Bjsf9gp/LJjCDLgRKdM+T+h+MoQX2P2D1BAgCjcLu8AnyFnWBI1LM 24nLDKU6XI89OrHzmP3fYqokD6EaOa0KzMLylzthyeDvIeOAl3s4d2P4EzydiVU0hgPX 9Q9O8C4y65bx86fvBueW6SnRh3sP4IZulaN/ufXDTSjIZtgXnI5kPRIkxh7wWmwY5vis MPoTsIeuErWxWovX/RLkCX5fdMDIoB/+zgdzBUrgPZo0Cw6e2DF4ha1J5nNGoFhiWnkX 5s5fQ9AAWQGoqsBH/qA8iUrWwPf4zMZ6TmV05ASTeu6zIpYB+DSaNRC/NpQHM2YxsCl4 g04A== X-Gm-Message-State: ANhLgQ0xViYV+p1cmqTbQtPO/tCwP39Tb1dosB0CsWz083s9djiZPvMi Yqwa/1jrJq+Q7BDQeripUYw8kNZ7vxbHzb6tXh7758wx X-Google-Smtp-Source: ADFU+vuIp08/bLF7meTBujF8P0Xjc8AgjTjNjYxPfx/NJ18+jotrtLt/T6+hM1/r5tt6Fkwo4ofLNheGqM9WplI28/4= X-Received: by 2002:ac8:3488:: with SMTP id w8mr1252416qtb.187.1585343182187; Fri, 27 Mar 2020 14:06:22 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 27 Mar 2020 15:06:10 -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: 48pvY33w0tz4Wkm X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=r89xsDzJ; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::829) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.03 / 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)[9.2.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.03)[ip: (-9.27), 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" 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 21:06:50 -0000 On Fri, Mar 27, 2020, 1:30 PM Ed Maste wrote: > On Fri, 27 Mar 2020 at 15:12, Warner Losh wrote: > > > > 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 > subt free 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. > > We do want revisions of the contrib code in the main repo, otherwise > we lose the history and the ability to easily maintain our local > changes. > I'm sorry, that's a *HUGE* change from what we decided. And it doesn't lose the ability for us to maintain our own local changes easily... We decided, specifically that we'd export the vendor branches, vis git subtree, to their own repos that would live under our github. We'd then use git subrepo to them pull in the changes into src/contrib, et al, as a single commit with tracking information. This would keep us from being the union of all possible upstream repos (think llvm). We'd have sufficient tracking info to know the history, but it might be a little awkward to pull it all out since you'd need to download the extra repo and install git subrepo. In that scenario, they most definitely aren't merge commits in the classic sense (logically they are, and subrepo records enough details... we thought subtree might also do it too, but that was a point that was supposed to be investigated, but I'm not sure if that detail has been). We were also, IIRC (and I may not), going to bootstrap the vendor branches so any of them could be used to update from the get-go in the new git repo so we wouldn't need the 'vendor branch collapsing' stuff from svn, because we'd have already done it in svn prior to the export and because the exported repos would be sufficient. Maybe we should chat about this stuff again, but I have a very very clear memory of all of this, and thought it was a good plan despite some initial misgivings. Warner >