Re: git: 5cfcccf76730 - main - Revert "Import tzdata 2026b"

Philip Paeps <philip@freebsd.org> writes:
> Because Git ate the merge commit this was meant to be and turned it
> into a mess.  I did something stupid.  I'll commit what I meant to
> commit shortly.  Just doing another build test to make sure I don't
> make a mess twice. :)

Most likely, you had to rebase your working copy before pushing, and
while rebasing merge commits is supported (with the --rebase-merges / -r
option), rebasing _subtree merges_ does not appear to work.  When `git
rebase` replays the merge, it applies it to the root instead of the
subtree, and since the files you are merging don't exist in the root, it
goes hunting for similar files elsewhere on the theory that they've been
renamed in the tree you are merging into.  Unfortunately it finds
contrib/tzcode before it finds contrib/tzdata, and proceeds to apply
part of the merge in the wrong place.

Apparently, with a new enough Git you can use the --strategy / -s option
(`-r -s subtree` or `-r -s subtree=contrib/tzdata`) to handle subtree
merges correctly when rebasing.  I only just found out about it, so I
don't know how well it works in practice.

DES
-- 
Dag-Erling Smørgrav - des@FreeBSD.org