From owner-freebsd-git@freebsd.org Wed Jun 10 16:22:46 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 60FC5338BB7 for ; Wed, 10 Jun 2020 16:22:46 +0000 (UTC) (envelope-from bsd-lists@BSDforge.com) Received: from udns.ultimatedns.net (static-24-113-41-81.wavecable.com [24.113.41.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "ultimatedns.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hsj16jnmz4DGM; Wed, 10 Jun 2020 16:22:45 +0000 (UTC) (envelope-from bsd-lists@BSDforge.com) Received: from udns.ultimatedns.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by udns.ultimatedns.net (8.15.2/8.15.2) with ESMTPS id 05AGN2Jf067992 (version=TLSv1.2 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Wed, 10 Jun 2020 09:23:08 -0700 (PDT) (envelope-from bsd-lists@BSDforge.com) X-Mailer: Cypht MIME-Version: 1.0 Cc: In-Reply-To: From: Chris Reply-To: bsd-lists@BSDforge.com To: Ed Maste Subject: Re: Migrating merge based project from legacy git tree Date: Wed, 10 Jun 2020 09:23:08 -0700 Message-Id: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49hsj16jnmz4DGM X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] 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:22:46 -0000 On Wed, 10 Jun 2020 12:10:16 -0400 Ed Maste emaste@freebsd=2Eorg said > Downstream FreeBSD projects will often use a merge based approach for > staying up-to-date with new FreeBSD changes=2E That is, local work is > committed to their fork, and FreeBSD updates arrive via something like > "git merge upstream/master"=2E These continue, resulting in a history of > mixed local work and upstream merges=2E >=20 > 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)=2E One of > the deliverables from the Git Working Group is a documented process > for migrating a downstream fork from "old" to "new" hashes=2E >=20 > Gleb has documented that process at > https://github=2Ecom/freebsd/git_conv/wiki/Migrating-merge-based-project-fr= om-legacy-git-tree=2E The link above has a period on the end, which sends the user to the wiki in= dex=2E Here's the link without that period :-) https://github=2Ecom/freebsd/git_conv/wiki/Migrating-merge-based-project-from= -legacy-git-tree Thanks! :-) > I would appreciate it if merged-based downstream FreeBSD consumers can > give this a try, and provide feedback=2E 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=2E >=20 > This document will move to a permanent home later in the transition proce= ss=2E --Chris