Date: Wed, 23 Dec 2020 09:15:17 -0500 From: Shawn Webb <shawn.webb@hardenedbsd.org> To: Renato Botelho <garga@FreeBSD.org> Cc: freebsd-git@freebsd.org Subject: Re: Migrating a merge based project to new tree Message-ID: <20201223141517.xk66q3fboch6fwhj@mutt-hbsd> In-Reply-To: <fe17e435-0fdb-7529-c04d-2088139d1f14@FreeBSD.org> References: <fe17e435-0fdb-7529-c04d-2088139d1f14@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--fonvmsktny6wvm6c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 23, 2020 at 09:35:11AM -0300, Renato Botelho wrote: > I'm working to migrate a downstream stable/12 based tree to the new git > repository following instructions from [1]. >=20 > I did a final merge from legacy repository and made sure top commits on b= oth > branches point to the same tree: >=20 > # git show -s --format=3D%T f4d0bc6aa6b9 > 98db7229803a5c93e3132bc661201f204487eee9 > # git show -s --format=3D%T f262e04c92d7 > 98db7229803a5c93e3132bc661201f204487eee9 >=20 > When I try to merge new one git refuses to merge due to unrelated histori= es. > Should I use --allow-unrelated-histories parameter? >=20 > [1] https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-projec= t-from-legacy-git-tree HardenedBSD's in the same boat. We're toying around with different methods of fixing our repo right now. When I used --allow-unrelated-histories, git noted merge conflicts on every single file HardenedBSD has touched over the last 7.5 years. I tacked on "-X ours" and that made git happy. However, I'm unsure git always did the right thing. I'm working to verify that this week along with trying the other documented methods. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --fonvmsktny6wvm6c Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl/jUPIACgkQ/y5nonf4 4fp3Iw//TZAwsaUMI2B5rvmTPh7rjfwwp4hnw3xHrk1tMDNcqPlh4h1O5MFlP1uq CyGWX/JkLha0uWTLSPV40v8HCX3hddFY7CL/jfSZUY2IKSB2qoiwZl68J83X48pu TmBP1DgK83w5xioyPby/TQF6KyXoO9oZogjhTAcLA+pxmFKqh+ZkhbpENhnAfIcs Khyv5XId3veLPwJ0hM0NEh4JqKlkI00gn2jpUNT/QV7dzYSrSPZmygsluT9Q+AQy ASN6jizBt4rV5J96WNAxZH4FobGH6lawpCq/aY6Ede6X6+34AZ8uLCQwx4+kI99L xywrRNGuM8hem9EAzpvaIuA7sldHMjnscMt2+4c3HfP+QPl9LnMv6NX0rGh7f2Qp UBCHiH70f/fu40t+0nMYgXb5n/Q1mmKbuv/KJafqcEqCGZJWOkLdX0xNkNgnzr+R v0TORVAWrJ7leVwcjGe1qLwlBnWErdA9kKAWowujsZbDkOaWa+gnab8SBnAflKmd awwaQ+Q29yD2GXBt32Sihm7/YOKeqAW4Yr+D7S7MqGk92yeoN3H0Y0Pwq9vE8nNk uHhN4OAhiAbE7hclxpYGXgGFJV5FZnVp39W0aSppsfTez2nn+bcQa8Sv2eDOqMc/ IpcIouYQAm/u/ZWMEKlyYUm1KH55c0C0wVuloDhtsFS/+s9Gm8w= =uXE5 -----END PGP SIGNATURE----- --fonvmsktny6wvm6c--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201223141517.xk66q3fboch6fwhj>