Re: Gitk maintainership, was Re: The health of gitk

Am 19.11.24 um 10:59 schrieb Paul Mackerras:

In the current upstream git tree, I see two commits that were applied
to a clone of my tree, then pulled into the git tree:

bb5cb23daf751790950ff9f761f8884e21c88d00
7dd272eca153058da2e8d5b9960bbbf0b4f0cbaa

I assume you can pull them into your clone of my tree using suitable
git commands (I guess you would create a branch with 7dd272eca153 as
its head and do git pull --ff from that).

There are three commits that touch the gitk-git directory in the git
tree directly:

65175d9ea26bebeb9d69977d0e75efc0e88dbced
d05b08cd52cfda627f1d865bdfe6040a2c9521b5
728b9ac0c3b93aaa4ea80280c591deb198051785

I assume you want to make the same changes in your gitk tree, so as to
avoid conflicts in future.  I expect git would merge commits in the
gitk tree making the same changes as are already in the git repo
without fuss.

There is also b117cee32259acf923c3ada52b4dd89f2ea6a454 which touches
gitk-git in the 'seen' branch of the git tree.  I don't know what you
would need to do about that, if anything.

Thanks a lot for doing all the digging, this is very helpful. I'll
publish the repository on Github later this week or over the weekend.

-- Hannes