[tz] manual pages in tzdb
Alejandro Colomar
alx at kernel.org
Thu May 9 21:16:44 UTC 2024
Hi Steffen, John,
On Thu, May 09, 2024 at 10:28:23PM GMT, Steffen Nurpmeso wrote:
> John Hawkinson via tz wrote in
> <Zj0as7x9HxQcgmJ1 at louder-room.local>:
> |[ trimmed cc to tz only ]
> |
> |Can we step back a moment? I am confused by the initial request:
> |
> |Alejandro Colomar via tz <tz at iana.org> wrote on Wed, 8 May 2024
> |at 12:24:40 EDT in <vexmpmalky6xddplkpr6md6b7r664gmyt3fthmmiuxnwwiw3fu at 5\
> |5ga4tnb5zuj>:
> |
> |> I had in mind something: I would like to cherry-pick all tzdb's commits
> |> that affect manual pages into the Linux man-pages git repository,
> |> instead of just pasting here snapshots of your manual pages.
> |>
> |> For that to work, we'd need to agree on a path inside the repository (or
> |> I could manually --or with a script-- edit each commit, which would be
> |> combersome, and I'd rather avoid).
> |
> |Why is this second paragraph true?
> |
> |Why can you not cherry-pick all commits that touch a filename ending \
> |in the *.[0-9] glob (of which there are only 9)?
> |
> |That does not seem terribly onerous.
> |
> |However, a different concern may be that many commits that touch man \
> |pages also touch code, and rightly so: when code changes, documentation \
> |should change, and doing so in the same commit is proper. (Also there \
> |are non-man docuemntation files that change, such as NEWS).
> |
> |So I'm not really sure git cherry-picking at the commit level is the \
> |right thing here, although perhaps that's a simple enough way to think \
> |filtering diff hunks or whatever.
Because in the Linux man-pages repository, I have copies of (some of)
TZ's manual pages, and they're located exactly in those locations.
For git-cherry-pick(1) to work with two unrelated projects that share
some files, the shared files must also share location.
> I agree, he should possibly simply "git show" or "git archive" the
> manual files over from each commit that touched them, and then
> simply "git add" them in the target, which automatically gives you
> the diff(1) hunks. (I do this often, even automated as part of
> release processes (to dedicated release branches), as it avoids
> any possible merge conflict.)
But I don't just want to import the diffs or hunks with git(1). I want
to actually get the original commits from TZ, and import all their
metadata: timestamp, author, message, ...
It would be more or less as if the Linux man-pages was a fork of TZ; at
least as far as those pages are concerned.
If I didn't explain well, I can show some example with git(1).
Have a lovely day!
Alex
>
> --End of <Zj0as7x9HxQcgmJ1 at louder-room.local>
>
> --steffen
> |
> |Der Kragenbaer, The moon bear,
> |der holt sich munter he cheerfully and one by one
> |einen nach dem anderen runter wa.ks himself off
> |(By Robert Gernhardt)
--
<https://www.alejandro-colomar.es/>
A client is hiring kernel driver, mm, and/or crypto developers;
contact me if interested.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://mm.icann.org/pipermail/tz/attachments/20240509/124716ca/signature.asc>
More information about the tz
mailing list