Date: Wed, 10 Jun 2020 09:23:08 -0700 From: Chris <bsd-lists@BSDforge.com> To: Ed Maste <emaste@freebsd.org> Cc: <freebsd-git@freebsd.org> Subject: Re: Migrating merge based project from legacy git tree Message-ID: <ac80ecf431e77a86c24ff8bee18042f9@udns.ultimatedns.net> In-Reply-To: <CAPyFy2C5nMvc1roBm5eJ5-sgzYX1hkc8jrSXf0M6w7OteqBVvA@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
On Wed, 10 Jun 2020 12:10:16 -0400 Ed Maste emaste@freebsd.org said > 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. The link above has a period on the end, which sends the user to the wiki index. Here's the link without that period :-) https://github.com/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. 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. --Chrishelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ac80ecf431e77a86c24ff8bee18042f9>