[fpc-devel] Last call for 3.0.4 merges

Michael Van Canneyt michael at freepascal.org
Wed Jun 21 09:58:00 CEST 2017



On Sun, 18 Jun 2017, Michael Van Canneyt wrote:

>
>
> On Sun, 18 Jun 2017, Marco van de Voort wrote:
>
>> In our previous episode, Michael Van Canneyt said:
>>> > Some quick checks (greps for the searchterm in commitlog+ filenames)
>>> 
>>> The 'merge sets' are followed by a pair of numbers. What is the meaning of 
>>> these numbers ?
>> 
>> Active/inactive
>> 
>>> Then if I open 'fcl-pdf', I see: (inactive) Revisions in this set
>>> 33162,33163,33175,33176,33212,33215,33255,33264,33401,33428,33431,33453,33456,33468,33482,33483,33484,33485,33495,33497,33499,33535,33543,33563,33564,33566,33573,33998,34037,34060,34543,34563,34767,34778,34779,34780,34781,34804,35083,35084,35090,35094,35126,35131,35519
>>> 
>>> What does (inactive) mean ?
>> 
>> Added to the set, but disappeared from eligible after that. In other words:
>> already merged. Only active ones matter.

For fcl-base, I think

  34498,34499,34506,34509, 35518,35742

can be merged.

Michael.



More information about the fpc-devel mailing list