From owner-freebsd-git@freebsd.org Thu Nov 14 19:39:27 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 249ED1B1742 for ; Thu, 14 Nov 2019 19:39:27 +0000 (UTC) (envelope-from delphij@gmail.com) Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (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 47DWyP62cbz47JF for ; Thu, 14 Nov 2019 19:39:25 +0000 (UTC) (envelope-from delphij@gmail.com) Received: by mail-oi1-x233.google.com with SMTP id m193so6416802oig.0 for ; Thu, 14 Nov 2019 11:39:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CjCnZLEiEeVIVTzLmiQvK0yhtyMDOw+P1E2bUDOdtMw=; b=OT0opxVXZHk2vGaCYiVDeAwBQaC8VwgtONY9tMitqn2Uri1N5EQbtWVsQaC8QLjJOp LhD8Vodov/jm8VwHQttGEbDq5dRZIcr1BUu6pbUQDisvWWmjKYFhbpUhCyjsYLxo+DlQ XMA04k6Fc37Vll7tUpmDe8oFIRjGJENCFTgdVgVCqcveSmG3tu927FFWOnHquuBFKbtr O22rLwmmgYbxcn2zgw0foMh+5YP8aGqB6DjHY7olgHmOvejtXS007CEq9+mOqke9Vk6p yF+Qvm7cE3BXiUSUytmwvUn2eQCP8G4fVoUs2rKSekIwh+xZmuGbLyFQJU4V110JY3yK N1Jg== 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=CjCnZLEiEeVIVTzLmiQvK0yhtyMDOw+P1E2bUDOdtMw=; b=coczGCkf411ygZImFWXrpqsVWMHNpQzdtVmzC8aLFn6dirlVi6BYaZ42xdNp+uaQzc hop1bJeep+4DZQ6uZakOz+QmLHTcT/nyh5GndIh7jTbH8lmVI5X/uMeyf1Hbbez0p4sT RdEvVTnyxcK67hqc4SyAvWK8r5lbp27MHy0uXTGK9SuX4jyXttdyHBCLRBFftY1p3yRo eL15poJC0zKAc2IvOsQZzRCf+mbOpPbajRn2iiE3x8AvGnjcyIUuh+uYoPh+WFTwPPLt 3yt2Y7LBoHXGVZFV/kL4l1SvI7UxOWLu7OEeqmN7K0KSR2iZ3zLTlqv5lXvT/Qr9gLaB aaPg== X-Gm-Message-State: APjAAAXwq8P9UChU8FvqHfwFg4SaVaL6rEQurLnjmiRrz+VgsSPRqOis SagYyQ262adyVcSFXksnArWlKqeaNTougHKxjIE= X-Google-Smtp-Source: APXvYqzMEUaw0vLlJpK2aG6BMpRLrZEiJFngNgU/QVZS2tT8/CjjB0eJf7QS1K6e+YP/wOGBV8Gtfqn1IDAOuiW4+H0= X-Received: by 2002:a05:6808:6c3:: with SMTP id m3mr5264305oih.56.1573760363835; Thu, 14 Nov 2019 11:39:23 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Xin LI Date: Thu, 14 Nov 2019 11:39:12 -0800 Message-ID: Subject: Re: FYI - LLVM migration to Git and GitHub has started To: Warner Losh Cc: Ilya Bakulin , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 47DWyP62cbz47JF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=OT0opxVX; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of delphij@gmail.com designates 2607:f8b0:4864:20::233 as permitted sender) smtp.mailfrom=delphij@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; IP_SCORE_FREEMAIL(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[3.3.2.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]; IP_SCORE(0.00)[ip: (-8.15), ipnet: 2607:f8b0::/32(-2.32), asn: 15169(-1.99), country: US(-0.05)]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0] 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: Thu, 14 Nov 2019 19:39:27 -0000 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).