From owner-freebsd-ports@freebsd.org Mon Apr 5 21:46:05 2021 Return-Path: Delivered-To: freebsd-ports@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0083D5C86CB for ; Mon, 5 Apr 2021 21:46:05 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FDkk4030bz3mZt; Mon, 5 Apr 2021 21:46:03 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id A9DA13C0199; Mon, 5 Apr 2021 21:45:57 +0000 (UTC) Date: Mon, 5 Apr 2021 21:45:57 +0000 From: Brooks Davis To: Eric Turgeon Cc: FreeBSD Subject: Re: Any plan to fix ports git main history compatibility with old GitHub master? Message-ID: <20210405214557.GJ71823@spindle.one-eyed-alien.net> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3xoW37o/FfUZJwQG" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4FDkk4030bz3mZt X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-2.66 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[199.48.129.229:from]; FREEFALL_USER(0.00)[brooks]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[199.48.129.229:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.76)[-0.762]; RCPT_COUNT_TWO(0.00)[2]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; R_SPF_NA(0.00)[no SPF record]; SUBJECT_ENDS_QUESTION(1.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; MAILMAN_DEST(0.00)[freebsd-ports] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Apr 2021 21:46:05 -0000 --3xoW37o/FfUZJwQG Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > 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 =66rom 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/a= rticles/committers-guide/_index.adoc#562-migrating-from-github-fork -- Brooks --3xoW37o/FfUZJwQG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJga4UVAAoJEKzQXbSebgfALaIH/1Db8Y9DgqJYMhwLJAoa26yv 81n2PiAY1nO3BojGM1iW7YH5s60SqnikxDU4L+kZKzBZ7ZWKgLFFcVfEU/8KSVQt sPYgeeGDZ2DZlHxLu7I9GvdG8ZhBXiGUogLXEQUUFkyKjwVqCvJT6KOTeA/MPS+X kqwQGtilenvTI+QN79V0idycGMiAezkjddZSPo9uhdquFVYDVJoSTuf/Yx7yTTdE 3fVb6O6/NF8GDLfOGTrWmDUnE1LO6OQLArKZDyfrbOi2L8BzCFa3Rl8a3nxAjl2v vUXfJXq8dVdMy7Pe0zH7tGPmXGx7+Kv9w0YkrNJdojEIOB7jwCR4MaqlAh1RYh8= =bMmU -----END PGP SIGNATURE----- --3xoW37o/FfUZJwQG--