Paul Eggert <eggert@cs.ucla.edu> writes:
I took a quick look at the postgres copy of zic.c and have a couple of thoughts.
First, most of the changes are indenting or comment reformatting and whatnot, which makes it hard to see what's going on. Do you know offhand whether there are any functional changes that tzcode should buy back?
No; I would have submitted patches to tzcode if I thought so. Most of the delta comes from (1) running the code through our formatter "pgindent" or (2) wanting to rely on our autoconf/meson infrastructure instead of a bunch of #if tests to make configuration choices. I suppose that (1) is not really essential, as we do have the mechanism to exclude certain files from pgindent. But everybody who looks at Postgres code is pretty used to our rules and tends to find stuff formatted otherwise to be hard to read --- beauty is in the eye of the beholder. (2) is a deliberate policy choice to reduce portability headaches.
Second, I don't envy you the job of merging tzcode's zic.c changes into postgres.
It's not fun, but what I typically do is apply pgindent to upstream tzcode and then diff against what we have, so it's not as bad as you probably think. regards, tom lane