[fpc-devel] Preparing 3.2.4, call for merge request and regressions

[Marco van de Voort]

Op 25-10-2021 om 13:06 schreef LacaK via fpc-devel:
> The base output  is starting to work somewhat. 
> http://www.stack.nl/~marcov/mergelogs32/restset.html
> Marco, can I see what commits were already merged ? (and what not - 
> iow what is candidate for merging)

I don't really maintain lists of what was merged, only what was 
candidate for merge(*)

Basically, it just finds all eligible revs using the "merging" repo 
script, and then sorts that over categories, with a "rest" category for 
not yet categorized revs, and a "all" category for all revs. Which revs 
are in which categories is maintained by a simple ini file.

All category files are in html (more dense easier to read) and in .txt 
(easier to grep) format.

The main index lists all categories: 
http://www.stack.nl/~marcov/mergelogs32/

with the "rest" set being the last one. You are most probably interested 
in the "Database" subcategory:

http://www.stack.nl/~marcov/mergelogs32/fcl-db.html

http://www.stack.nl/~marcov/mergelogs32/fcl-db.txt

These are _NOT_ yet complete, some fixes to database headers are not in 
them yet. I still have a lot of the revisions from july till now to 
categorize.

but beware,  such files consists out two parts. Revisions that are 
eligible (first part), and revisions that were eligible and categorized, 
but have been merged meanwhile (second part after "(inactive) Revisions 
in this set" header).

I can do three levels of grep on this. Only on the "rest" set, which is 
the common mode, to see which new files in some category (e.g. "fcl-db/" 
) there are.

To resolve conflicts I can also search on all eligible revisions with 
the option to exclude some revision sets that contain very large files 
(very large branches merged in, and makefile regen end up there, because 
they touch many files and often grep while being non relevant.

(*) In theory, you could find out by checking what is eligible of the 
last release branch, and subtracting the eligible of the fixes branch 
from it, but I don't know yet how to do that in git.  It is also not 
perfect, there will be some pollution with e.g. version update commits.