Any plan to fix ports git main history compatibility with old GitHub master?

Brooks Davis brooks at freebsd.org
Mon Apr 5 21:46:05 UTC 2021


On Mon, Apr 05, 2021 at 05:33:08PM -0300, Eric Turgeon wrote:
> Today when trying to sync the GhostBSD ports tree with the FreeBSD ports
> tree, I found out the main branch history is not compatible with the old
> GitHub master.
> 
> Any plan to migrate to main with hold git history as we had with
> freebsd-src?

The main branch will contain a commit which is identical to the last
commit of the old master branch (except for the hash).  If the GhostBSD
repo is merged up to that point, you can then merge the matching commit
from main and proceed with using main as the source for future merges.

If you have outstanding WIPs the process of updating them to the new history
should be about the same as the one for source:
https://github.com/freebsd/freebsd-doc/blob/main/documentation/content/en/articles/committers-guide/_index.adoc#562-migrating-from-github-fork

-- Brooks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 455 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20210405/439d073a/attachment.sig>


More information about the freebsd-ports mailing list