In our previous episode, Tony Whyman said:
Can someone please tell me where 2.6.1 comes from and what its status
is? The FPC website still has 2.6.0 as the official release. On the
other hand, some of the Lazarus snapshots include 2.6.1., but only for
Windows targets.
See the "faq" on he website, it has a graph about versioning. It is the current version in the current fixes branch.
One thing I do need to confirm is which of the FCL changes in 2.7.1
appear in 2.6.1. I have a particular issue with a type change in the DB
unit where TBookmark changes from a pointer to a TByte, and I need to
track the version number change in units that depend on this.
r21037
See also
http://www.stack.nl/~marcov/mergelogs26/database.html
(click on revisions to expand the file tree, click on red "notes" to expand that section)
Note that this overview (and its major index on
http://www.stack.nl/~marcov/mergelogs26 ) isn't 100% correct.
In rare cases, changes get merged, (partially) unmerged and/or manually altered (*) due to discussion, which isn't completely visible in the eligible merge history.
In this (tbookmark) case that has happened, and thus comparing source of the various branches is the only 100% safe way.
(*) separate, non merge commits to the fixes branch