From owner-freebsd-git@freebsd.org Wed Jun 10 16:10:30 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 E4F6C338B68 for ; Wed, 10 Jun 2020 16:10:30 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) (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 49hsQt0LHfz4Chm for ; Wed, 10 Jun 2020 16:10:29 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f45.google.com with SMTP id o5so2815683iow.8 for ; Wed, 10 Jun 2020 09:10:29 -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:from:date:message-id:subject:to; bh=vD+nFDfe9rAUdgerw6hN7LeYQQYAm+ZI7vXcbeZmd2c=; b=Z5zxpfJLejHPffIM3A9SMF69NMaDDKKBKj7P9HqcTK4jmgz/HuZVlHTJvyXZJDIkmw g4/DWNdrDMA2hTlZsbPOv049iblu62dWOoN9gKAggDBP7AnwiNL0+exrQwaNvVHMDuMY MLdfn48ECz2c6g6i5c3jJFKRsp3YEOSHmSVogumaUeKH8NGHiBbkQBf23q02L2GapTU6 kniEtCXg6NI2c+4LCt4UvYPksOB/Hga51ptzC8ybA7aWLqrAMZ0rmlI2/mxw4roBgT/0 uMUmaAG9Egy+h+Ke7qDRkEpyvo4twnkbmA5l+Uz7OpwtFpyHmh+mKZwa/lMA42/+Zd0i nCdA== X-Gm-Message-State: AOAM533hT2JpY+kUXi9B1Ud/6PzoPB18cdxyFwXyuk9IIumkfoqfOPbP ho4UN4bS1MPpEsPmyja6qnZ3ZmJl6tOHKs2BtgIo+6YT X-Google-Smtp-Source: ABdhPJzZwNP1RH45/R9QIm7jNx+B1rG3RAyaBvMfJXSAun6FtWzepFMaefp6NGd3+xSy0OfTmjW01pgS4OckqlUCGMQ= X-Received: by 2002:a05:6602:25d3:: with SMTP id d19mr4082376iop.15.1591805428219; Wed, 10 Jun 2020 09:10:28 -0700 (PDT) MIME-Version: 1.0 From: Ed Maste Date: Wed, 10 Jun 2020 12:10:16 -0400 Message-ID: Subject: Migrating merge based project from legacy git tree To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49hsQt0LHfz4Chm 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.45 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [0.39 / 15.00]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; NEURAL_SPAM_MEDIUM(0.17)[0.170]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.26)[-0.264]; DMARC_NA(0.00)[freebsd.org]; NEURAL_SPAM_SHORT(0.48)[0.480]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.45:from]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.45: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]; TO_DOM_EQ_FROM_DOM(0.00)[] 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 16:10:31 -0000 Downstream FreeBSD projects will often use a merge based approach for staying up-to-date with new FreeBSD changes. That is, local work is committed to their fork, and FreeBSD updates arrive via something like "git merge upstream/master". These continue, resulting in a history of mixed local work and upstream merges. With FreeBSD's transition to a Git repository the Git hashes will change from the current GitHub mirror, in order to correct some issues with the existing svn2git conversion that would otherwise cause grief (in particular, related to contrib/ code management/updates). One of the deliverables from the Git Working Group is a documented process for migrating a downstream fork from "old" to "new" hashes. Gleb has documented that process at https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree. I would appreciate it if merged-based downstream FreeBSD consumers can give this a try, and provide feedback. Note that the hashes in the beta repository will change at least once before it is finalized, so try this on an experimental basis for now. This document will move to a permanent home later in the transition process.