Date: Thu, 4 Mar 2021 21:52:12 +0100 From: Michael Grimm <trashcan@ellael.org> To: freebsd-git@freebsd.org, freebsd-questions@freebsd.org Subject: Re: ports and git, first steps Message-ID: <3EF74FAB-37C0-4289-BED5-5EBDB4DFD2DF@ellael.org> In-Reply-To: <YEFFZ18nBocAG8j4@acme.spoerlein.net> References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> <YD6XP9uqNwa9L5y%2B@acme.spoerlein.net> <B98FC9B8-216F-48CF-9FCC-18E780E13CDE@ellael.org> <YEDO2xpsjz6gMG7C@acme.spoerlein.net> <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> <YEFFZ18nBocAG8j4@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Ulrich Sp=C3=B6rlein <uqs@FreeBSD.org> wrote: >=20 > On Thu, 2021-03-04 at 14:46:13 +0100, Michael Grimm wrote: >> Ulrich Sp=C3=B6rlein <uqs@FreeBSD.org> wrote: >>> Besides, `git pull --rebase` is pretty much the only sane choice for = poudriere anyway. >>=20 >> Good to know. Now, all I need to modify is the git repository's = server name after the final migration. >=20 > Yes and no. It defaults to using the Github mirror and we will = force-push the new content there, but `git pull --rebase` will totally = barf on that, so you'll need to manually: >=20 > - git fetch --prune > - git checkout -B main origin/main > - git branch -D master >=20 > or something like that. (you need to rebase your stuff from old-master = to new-main as well). I mentioned in the beginning that I am a newbie when it comes to git. No = I know, that I didn't downplay ;-) Most probably I will start from scratch instead, because I do not have = local commits anymore. Sidenote: the most difficult issue with git versus svn are their = completely different concepts, and, as a consequence, different concepts = to achieve related workflows. It took me some time to understand, and I = do have the feeling that I do only understand about 1% of git's = functionality, now. > We could actually bake this logic into poudriere and have it do its = thing during a ports update, but it'll be rather fragile I suppose. I don't think that there are many users that use the beta git repository = in combination of poudriere, currently. But I might be mistaken. Thanks again and with kind regards, Michael
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3EF74FAB-37C0-4289-BED5-5EBDB4DFD2DF>