Date: Mon, 28 Dec 2020 10:16:07 -0800 From: Gleb Smirnoff <glebius@freebsd.org> To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= <uqs@freebsd.org> Cc: git@freebsd.org Subject: Re: Please review: suggested final merge commit on the legacy repo Message-ID: <X%2Bog55zjbzZAjJ20@FreeBSD.org> In-Reply-To: <X%2Bjx1x0CdwUuaM4h@acme.spoerlein.net> References: <X%2Bcusqr/0cxQ1p13@acme.spoerlein.net> <X%2BjBaXEATM4ejaut@FreeBSD.org> <X%2Bjx1x0CdwUuaM4h@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Ulrich, your commit also looks good to me. On Sun, Dec 27, 2020 at 09:43:03PM +0100, Ulrich Spörlein wrote: U> Thanks Gleb, U> U> I think the "centering" on the first line needs to go, it might confuse U> people's git log output. U> U> Furthermore, we're advocating for "freebsd" as the origin name, not U> "FreeBSD". Even more, we don't want folks to rename their remote, as U> we'll be re-using the GH remote, so they need to explictly add a legacy U> one, no? U> U> I did a test run of merge-based and rebase-based histories earlier today U> and jotted down my notes in U> https://github.com/freebsd/git_conv/wiki/Rebase---Merge-experiments , U> though there's nothing in there you don't already know. U> U> We should probably also make it clear that going forward, one should try U> to branch from a fresh main, and not schlepp around every commit twice U> :( U> U> I'll update the wiki page with the recommendation in a bit. I also U> wonder if we really should make this a merge commit, or a regular U> commit. From my notes above, it's actually rather easy to merge in U> legacy-master, then main-as-of-3cc0c0d66a06 and then main. The first U> step needs to be done anyway, the 2nd is guaranteed to be conflict free U> and the third step is just another regular merge-from-head. And people U> that merge in stable/X need to do this anyway. U> U> Also missing is a way for them to reach out for more help, the link to U> the wiki might give some folks ideas, but I think we can be more U> explicit here. U> U> I've inlined the short set of commands required that should work for U> main and stable (and have tested some of them, though I'm less sure U> about the various upstream magic that happens with git rebase, as one U> can elect to not provide half the refs) U> U> Please see the latest commit on https://github.com/uqs/freebsd U> U> Thanks U> Uli U> U> > U> >-- U> >Gleb Smirnoff U> U> >commit 11f284b67940bcacb2f618858b901e9254ef5992 U> >Merge: 9e4440ca5ba7 3cc0c0d66a06 U> >Author: Gleb Smirnoff <glebius@FreeBSD.org> U> >AuthorDate: Wed Dec 23 22:44:48 2020 -0800 U> >Commit: Gleb Smirnoff <glebius@FreeBSD.org> U> >CommitDate: Sun Dec 27 09:15:53 2020 -0800 U> > U> > !!! IMPORTANT ANNOUNCEMENT !!! U> > U> > This commit is the last commit to the legacy FreeBSD github mirror, that U> > used to import data from official FreeBSD subversion and resided at U> > https://github.com/freebsd/freebsd.git. U> > U> > The new FreeBSD github mirror imports data from official FreeBSD git. The U> > history in the new git tree is different to the legacy one. Thus, if you U> > were using the legacy tree to base your work on, you need to migrate. U> > U> > This commit merges the legacy tree and the new tree together. This will U> > allow you to migrate without rebasing. Once you pulled in this commit U> > and merged it to your tree, you need to switch to the new remote and U> > from now on merge from it. The following example assumes your current U> > remote for FreeBSD is named 'FreeBSD': U> > U> > % git remote rename FreeBSD legacy U> > % git remote add FreeBSD anongit@git.freebsd.org:src.git U> > % git fetch legacy/master U> > % git rev-parse legacy/master # shall return this commit! U> > % git merge legacy/master # the last merge from legacy U> > % git remote delete legacy U> > % git fetch FreeBSD/main U> > % git merge FreeBSD/main # the way to merge from now on U> > % git gc # you may want to run this once after the first merge U> > U> > Please consult with U> > U> > https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-from-legacy-git-tree U> > U> > for any changes for the above instructions in the future. U> > U> -- Gleb Smirnoff
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X%2Bog55zjbzZAjJ20>