From owner-freebsd-git@freebsd.org Fri Nov 15 00:20:18 2019 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 821AB1B6EF9 for ; Fri, 15 Nov 2019 00:20:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 47DfBS4hGtz4NN4 for ; Fri, 15 Nov 2019 00:20:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x733.google.com with SMTP id 71so6740814qkl.0 for ; Thu, 14 Nov 2019 16:20:16 -0800 (PST) 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=7WCfXsGnnhKfF6fFegQQcQbf8q04TxGNrj15BbuqAdk=; b=jwhux5FhvQSi5/M6NzuTCFPLaKKOA0UOdBj7fLdxfqc1h5JZeMMcmiTAzc9jdCOmcf QFbuCiD9EgarZWtXBGvozukUeH6hRPAU+ufzZnFQnqbtyiKitReqMN/pQzoNBqlsBgRD vz/M8J81cikK00/ZMsgsRpgIeS5OFC2/8QF57oc+1z8fwPJxlA5qM1BrBlOguslGe4h/ 6O7qLdNEhAT+UTfrQm3BeJu3n2XFDHiBpqmxkhad0W2JA89DZuxah8IrDp1AX/MjJChu gzbOKVfQP04ioo5bFS7Rbg+8DG4nIG5pAqC3Ox2F/WT4TRwKF75iKumcJhBUIC5tZGtu CxLg== 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=7WCfXsGnnhKfF6fFegQQcQbf8q04TxGNrj15BbuqAdk=; b=f+TGFbvh10DuLefhRzmkQzbLeJqQu9LKbVgwd4kZqvjnJLhgBktd7gLe4Wuq0DTpcS ni8gDbKXcqwW7WTkfRyEXKYXT/RyNZmBgz39xt4ajtVZeUh/zcIvkEW4vI7enU3hcEvG 9U3dZvWETBGxWtV1Wg+tzSH9/0+dj1Ny50uLHnz16GhO1/fshkJ90+3f6F72mwClF8po notOijIdBEU2Gw7y4UgAevOjQHzpBTfELPtUe05PAUTj4kgGjJdMnC3VhaQoMZd/yg+l PPAF2pbpx4j02tV/jLPcv0lvE42RbAO7/gXmtXjztoydEYZVLMMxmhtipwRNF2kDlPZY E7Cg== X-Gm-Message-State: APjAAAViXpKwiLPOJ+/xZl8LBPX8b4snRmEJwdX8dg0RfmJYepy7G39S Mt5CTUZF+A8zGeTZAmdyOaE41EH95QrHFIIv/nUbWQ== X-Google-Smtp-Source: APXvYqzxMsYusPa102j27lMqwiyJsbJxC+n85ozFOy/8u26mQrwnTHVFq94P2CO08M53xkC3e+ioZ7vNa1ulkrR8Ik0= X-Received: by 2002:a37:4716:: with SMTP id u22mr10181070qka.495.1573777214989; Thu, 14 Nov 2019 16:20:14 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Thu, 14 Nov 2019 17:20:04 -0700 Message-ID: Subject: Re: FYI - LLVM migration to Git and GitHub has started To: Xin LI Cc: Ilya Bakulin , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 47DfBS4hGtz4NN4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=jwhux5Fh; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::733) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.72 / 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)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[3.3.7.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]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.72)[ip: (-9.25), ipnet: 2607:f8b0::/32(-2.32), asn: 15169(-1.99), 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)[]; RCVD_COUNT_TWO(0.00)[2] 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, 15 Nov 2019 00:20:18 -0000 On Thu, Nov 14, 2019 at 12:39 PM Xin LI wrote: > > On Wed, Nov 13, 2019 at 10:29 AM Warner Losh wrote: > >> Vendor branches break. >> > > Speaking for this, I have took contrib/file as an opportunity to try out > how git merge works in FreeBSD's context (without using submodules). > Basically we would have the github.com/file/file histories stashed into > one branch, and perform two merges. > > The first one would "bootstrap" the history, by performing a git merge > with -s ours of the previously merged tag. This would require some > cleanups: the upstream's CVS exporter was broken and some RCS IDs were not > correctly updated, so technically one would have to patch the contrib/file > tree to bring the git's vision of RCS IDs, then perform a merge -X subtree > merge. > > The second one would be the actual merge (-X subtree=contrib/file). > Future imports would only need this merge. > > If the upstream was not using git, these could be pushed to a different > branch to hold it (which is pretty much what we do in subversion in its > flattened namespace under vendor/foo/dist). > Do you have the results of this published somewhere? In looking into submodules, I couldn't figure out how to layer changes on top of the submodule in any way that was approaching sane... If we used the code verbatim, as is in the upstream repo, it might be OK, but it looks like it's intended to solve different problems than our 'vendor branch' issue. Warner