Re: [fpc-devel] Last call for 3.0.4 merges
Can you merge r35878 as well please? It is a small fix for TAssert.AssertEquals with strings. Thanks, Denis On 17/06/2017 20:31, Marco van de Voort wrote: While I have not done much the last month, I did keep up with most of the merging so most requests have been honoured, and I plan to branch mid next week or even monday if there is not much response. If I missed some, or there are important new ones, there is still a few days time, waiting for the win32/64 findfirst fix. Note that compiler/language merges need approval and an estimate of mergability from a compiler devel. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Last call for 3.0.4 merges
In our previous episode, Marco van de Voort said: > > So all new revs enter the "to be merged not in other sets" category, and > when I do queries I get lists of revs that go into the query categories. so e.g. newer fcl-base revs might still be in the to be merged category. The categorization is all manual. (since if you do it in an automated way, revs that touch many directories like makefile or fpmake related end up in random categories) ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Last call for 3.0.4 merges
In our previous episode, Michael Van Canneyt said: > > You may want to add this info as a 'legend' to the pages, because it is not > readily obvious > (well, not to me anyway). Maybe also put the inactive ones at the end... I added a line, but the most important thing to understand is that the revision sets are revisions that I "isolated" from the "merged not in other sets" category. So all new revs enter the "to be merged not in other sets" category, and when I do queries I get lists of revs that go into the query categories. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Last call for 3.0.4 merges
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. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Last call for 3.0.4 merges
On Sun, 18 Jun 2017, Marco van de Voort wrote: In our previous episode, Michael Van Canneyt said: > time, waiting for the win32/64 findfirst fix. This is now fixed, rev. 36510. I will still check the svn log of rtl/packages for any fixes that may be merged. Unless you have somewhere an up-to-date list of possible candidates ? The usual weblocation? http://www.stack.nl/~marcov/mergelogs26 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 ? 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 ? Concerning the eligble below, everything can be merged. fcl-image: everything can be merged. fcl-web: everything can be merged. fpdoc: everything can be merged. I will check out fcl-base. Michael. fcl-pdf eligible: 33713,34002,34008,34615,35278,35833,36395 fcl-passrc eligible: 29399,29950,29974,30891,31177,31318,31527,31857,34002,34008,35833,36006,36020,36069,36084,36117,36121,36125,36126,36127,36129,36130,36131,36140,36154,36155,36160,36161,36171,36177,36178,36179,36181,36182,36183,36184,36185,36186,36187,36188,36189,36190,36192,36205,36213,36216,36217,36218,36219,36220,36221,36222,36223,36224,36225,36226,36228,36234,36237,36238,36241,36246,36248,36318,36320,36321,36376,36395,36397,36453,36458 pas2js: 29399,29950,29974,30891,31177,31318,31525,31527,34002,34008,35833,36035,36037,36085,36118,36154,36156,36172,36236,36242,36247,36319,36391,36459,36460 etc etc. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Last call for 3.0.4 merges
In our previous episode, Michael Van Canneyt said: > > time, waiting for the win32/64 findfirst fix. > > This is now fixed, rev. 36510. > > I will still check the svn log of rtl/packages for any fixes that may be > merged. > > Unless you have somewhere an up-to-date list of possible candidates ? The usual weblocation? http://www.stack.nl/~marcov/mergelogs26 Some quick checks (greps for the searchterm in commitlog+ filenames) fcl-pdf eligible: 33713,34002,34008,34615,35278,35833,36395 fcl-passrc eligible: 29399,29950,29974,30891,31177,31318,31527,31857,34002,34008,35833,36006,36020,36069,36084,36117,36121,36125,36126,36127,36129,36130,36131,36140,36154,36155,36160,36161,36171,36177,36178,36179,36181,36182,36183,36184,36185,36186,36187,36188,36189,36190,36192,36205,36213,36216,36217,36218,36219,36220,36221,36222,36223,36224,36225,36226,36228,36234,36237,36238,36241,36246,36248,36318,36320,36321,36376,36395,36397,36453,36458 pas2js: 29399,29950,29974,30891,31177,31318,31525,31527,34002,34008,35833,36035,36037,36085,36118,36154,36156,36172,36236,36242,36247,36319,36391,36459,36460 etc etc. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Last call for 3.0.4 merges
Op 18-06-17 om 09:34 schreef Michael Van Canneyt: Below a really long list. They are patches that happened after tag of 3.0.2, so they suppose that all earlier patches to fcl-pdf, fcl-js, pas2js, fcl-passrc have been merged already (which, I think, should be the case). Everything related to fcl-js: Which reminds me... We use fcl-passrc to use pascalscript to validate form-input on websites. We evaluate the scripts on the server-side, but also direct on the client. With a very simple pascalscript to js converter. But it doesn't work with trunk anymore, at least, it doesn't parse the statement 'false;', together with 'true;' anymore. Which is used a lot in our system. (For example for the 'required'-statements.) Is this intentional? Regards, Joost. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Last call for 3.0.4 merges
On Sat, 17 Jun 2017, Marco van de Voort wrote: While I have not done much the last month, I did keep up with most of the merging so most requests have been honoured, and I plan to branch mid next week or even monday if there is not much response. If I missed some, or there are important new ones, there is still a few days time, waiting for the win32/64 findfirst fix. This is now fixed, rev. 36510. I will still check the svn log of rtl/packages for any fixes that may be merged. Unless you have somewhere an up-to-date list of possible candidates ? Michael. ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Re: [fpc-devel] Last call for 3.0.4 merges
On Sat, 17 Jun 2017, Marco van de Voort wrote: While I have not done much the last month, I did keep up with most of the merging so most requests have been honoured, and I plan to branch mid next week or even monday if there is not much response. If I missed some, or there are important new ones, there is still a few days time, waiting for the win32/64 findfirst fix. Note that compiler/language merges need approval and an estimate of mergability from a compiler devel. Below a really long list. They are patches that happened after tag of 3.0.2, so they suppose that all earlier patches to fcl-pdf, fcl-js, pas2js, fcl-passrc have been merged already (which, I think, should be the case). Output from svn log, so I assume it is somehow scriptable. Michael. Everything related fcl-pdf: r35519 r36354 r36355 r36356 r36357 r36358 Everything related to fcl-js: r35402 r35416 r35428 r35471 r35490 r35502 r35576 r35577 r35633 r35640 r35651 r35789 r36235 r36471 r36492 r36493 r36494 Everything related to fcl-passrc: r35391 r35402 r35415 r35428 r35468 r35469 r35470 r35487 r35488 r35489 r35503 r35522 r35524 r35562 r35571 r35578 r35579 r35580 r35581 r35582 r35584 r35586 r35588 r35591 r35593 r35597 r35612 r35613 r35614 r35616 r35617 r35621 r35625 r35631 r35633 r35635 r35636 r35637 r35638 r35639 r35641 r35642 r35648 r35652 r35667 r35680 r35681 r35682 r35691 r35692 r35694 r35695 r35697 r35702 r35703 r35708 r35709 r35710 r35713 r35715 r35718 r35719 r35720 r35728 r35731 r35735 r35737 r35782 r35790 r35791 r35793 r35794 r35798 r35801 r35806 r35808 r35810 r35827 r35829 r35839 r35842 r35844 r35846 r35851 r35853 r35859 r35863 r35865 r35866 r35868 r35870 r35872 r35874 r35876 r35883 r35884 r35887 r35889 r35895 r35896 r35897 r35898 r35902 r35904 r35909 r35910 r35912 r35914 r35915 r35916 r35917 r35923 r35926 r35928 r35931 r35933 r35938 r35940 r35947 r35948 r35949 r35950 r35951 r35960 r35963 r35964 r35966 r36006 r36069 r36084 r36117 r36121 r36125 r36126 r36127 r36129 r36130 r36131 r36140 r36154 r36155 r36160 r36161 r36171 r36177 r36178 r36179 r36181 r36182 r36183 r36184 r36185 r36186 r36187 r36188 r36189 r36190 r36192 r36205 r36213 r36216 r36217 r36218 r36219 r36220 r36221 r36222 r36223 r36224 r36225 r36226 r36228 r36234 r36237 r36238 r36241 r36246 r36248 r36318 r36320 r36376 r36397 r36453 r36458 pas2js related: r35402 r35417 r35428 r35472 r35491 r35504 r35574 r35583 r35585 r35587 r35615 r35631 r35633 r35643 r35653 r35668 r35683 r35693 r35696 r35697 r35704 r35705 r35706 r35711 r35714 r35716 r35718 r35719 r35729 r35732 r35736 r35738 r35795 r35799 r35802 r35803 r35804 r35805 r35809 r35811 r35828 r35840 r35843 r35845 r35847 r35852 r35854 r35860 r35862 r35864 r35867 r35869 r35871 r35873 r35875 r35888 r35903 r35905 r35908 r35911 r35917 r35919 r35920 r35927 r35932 r35939 r36007 r36035 r36037 r36070 r36085 r36118 r36154 r36156 r36172 r36236 r36242 r36247 r36319 r36459 r36460 ___ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
