ports and git, first steps

Michael Grimm trashcan at ellael.org
Thu Mar 4 20:52:24 UTC 2021


Ulrich Spörlein <uqs at FreeBSD.org> wrote:
> 
> On Thu, 2021-03-04 at 14:46:13 +0100, Michael Grimm wrote:
>> Ulrich Spörlein <uqs at FreeBSD.org> wrote:

>>> Besides, `git pull --rebase` is pretty much the only sane choice for poudriere anyway.
>> 
>> Good to know. Now, all I need to modify is the git repository's server name after the final migration.
> 
> 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:
> 
> - git fetch --prune
> - git checkout -B main origin/main
> - git branch -D master
> 
> 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




More information about the freebsd-questions mailing list