Migrating a merge based project to new tree

[Shawn Webb]

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].
> 
> I did a final merge from legacy repository and made sure top commits on both
> branches point to the same tree:
> 
> # git show -s --format=%T f4d0bc6aa6b9
> 98db7229803a5c93e3132bc661201f204487eee9
> # git show -s --format=%T f262e04c92d7
> 98db7229803a5c93e3132bc661201f204487eee9
> 
> When I try to merge new one git refuses to merge due to unrelated histories.
> Should I use --allow-unrelated-histories parameter?
> 
> [1] https://github.com/freebsd/git_conv/wiki/Migrating-merge-based-project-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,

-- 
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/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-git/attachments/20201223/888d0926/attachment.sig>