U packages/fcl-js/src/jsbase.pp
U packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40191 into '.':
U .
--- Merging r40195 into '.':
U packages/fcl-web/examples/simpleserver/simpleserver.pas
--- Recording mergeinfo for merge of r40195 into '.':
G .
--- Merging r40203 into '.':
U packages/fcl-js/src/jsscanner.pp
--- Recording mergeinfo for merge of r40203 into '.':
G .
--- Merging r40364 into '.':
U packages/fcl-web/src/base/fphttpstatus.pas
U packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r40364 into '.':
G .
--- Merging r40366 into '.':
G packages/fcl-web/examples/simpleserver/simpleserver.pas
U packages/fcl-web/examples/simpleserver/simpleserver.lpi
--- Recording mergeinfo for merge of r40366 into '.':
G .
--- Merging r40393 into '.':
U packages/fcl-web/src/base/httproute.pp
--- Recording mergeinfo for merge of r40393 into '.':
G .
--- Merging r40395 into '.':
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r40395 into '.':
G .
--- Merging r40592 into '.':
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40592 into '.':
G .
--- Merging r40707 into '.':
U packages/fcl-js/tests/tcwriter.pp
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40707 into '.':
G .
# revisions: 40191,40195,40203,40364,40366,40393,40395,40592,40707
git-svn-id: branches/fixes_3_2@40719 -
U packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40076 into '.':
U .
--- Merging r40081 into '.':
U packages/pastojs/tests/tcmodules.pas
U packages/pastojs/src/fppas2js.pp
U packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r40081 into '.':
G .
--- Merging r40083 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40083 into '.':
G .
--- Merging r40084 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40084 into '.':
G .
--- Merging r40085 into '.':
U packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40085 into '.':
G .
--- Merging r40101 into '.':
U packages/pastojs/src/pas2jsfileutils.pp
U packages/pastojs/src/pas2jsfileutilsnodejs.inc
--- Recording mergeinfo for merge of r40101 into '.':
G .
--- Merging r40105 into '.':
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40105 into '.':
G .
--- Merging r40106 into '.':
G packages/pastojs/src/pas2jsfileutils.pp
--- Recording mergeinfo for merge of r40106 into '.':
G .
--- Merging r40107 into '.':
U packages/pastojs/src/pas2jspparser.pp
--- Recording mergeinfo for merge of r40107 into '.':
G .
--- Merging r40116 into '.':
U utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40116 into '.':
G .
--- Merging r40126 into '.':
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40126 into '.':
G .
--- Merging r40127 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40127 into '.':
G .
--- Merging r40133 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40133 into '.':
G .
--- Merging r40135 into '.':
U packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r40135 into '.':
G .
--- Merging r40138 into '.':
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40138 into '.':
G .
--- Merging r40139 into '.':
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40139 into '.':
G .
--- Merging r40140 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40140 into '.':
G .
--- Merging r40143 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40143 into '.':
G .
--- Merging r40146 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40146 into '.':
G .
--- Merging r40148 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r40148 into '.':
G .
--- Merging r40151 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40151 into '.':
G .
--- Merging r40152 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40152 into '.':
G .
--- Merging r40164 into '.':
U utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40164 into '.':
G .
--- Merging r40168 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40168 into '.':
G .
--- Merging r40175 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40175 into '.':
G .
--- Merging r40177 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40177 into '.':
G .
--- Merging r40192 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40192 into '.':
G .
--- Merging r40193 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40193 into '.':
G .
--- Merging r40194 into '.':
U packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40194 into '.':
G .
--- Merging r40204 into '.':
U packages/fcl-passrc/src/pasuseanalyzer.pas
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40204 into '.':
G .
--- Merging r40209 into '.':
G packages/pastojs/src/pas2jslogger.pp
--- Recording mergeinfo for merge of r40209 into '.':
G .
--- Merging r40210 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40210 into '.':
G .
--- Merging r40211 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40211 into '.':
G .
--- Merging r40241 into '.':
U utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40241 into '.':
G .
--- Merging r40243 into '.':
G utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40243 into '.':
G .
--- Merging r40245 into '.':
U utils/pas2js/pas2js.cfg
--- Recording mergeinfo for merge of r40245 into '.':
G .
--- Merging r40258 into '.':
G utils/pas2js/pas2js.lpi
--- Recording mergeinfo for merge of r40258 into '.':
G .
--- Merging r40259 into '.':
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40259 into '.':
G .
--- Merging r40263 into '.':
U packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40263 into '.':
G .
--- Merging r40279 into '.':
U packages/pastojs/tests/tcfiler.pas
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/pas2jspparser.pp
G packages/pastojs/src/fppas2js.pp
U packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40279 into '.':
G .
--- Merging r40290 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40290 into '.':
G .
--- Merging r40302 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r40302 into '.':
G .
--- Merging r40304 into '.':
U packages/fcl-passrc/src/paswrite.pp
--- Recording mergeinfo for merge of r40304 into '.':
G .
--- Merging r40305 into '.':
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40305 into '.':
G .
--- Merging r40342 into '.':
G packages/fcl-passrc/src/pparser.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r40342 into '.':
G .
--- Merging r40343 into '.':
U packages/pastojs/src/pas2jsfiler.pp
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40343 into '.':
G .
--- Merging r40351 into '.':
U packages/fcl-js/src/jswriter.pp
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jsfileutilsunix.inc
G packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/fppas2js.pp
U packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40351 into '.':
G .
--- Merging r40352 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jsfileutilsnodejs.inc
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40352 into '.':
G .
--- Merging r40353 into '.':
U utils/pas2js/pas2jslib.lpi
--- Recording mergeinfo for merge of r40353 into '.':
G .
--- Merging r40354 into '.':
U packages/pastojs/fpmake.pp
--- Recording mergeinfo for merge of r40354 into '.':
G .
--- Merging r40355 into '.':
G packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40355 into '.':
G .
--- Merging r40356 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jsfileutils.pp
U utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40356 into '.':
G .
--- Merging r40372 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
G utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40372 into '.':
G .
--- Merging r40423 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40423 into '.':
G .
--- Merging r40424 into '.':
G packages/pastojs/src/pas2jscompiler.pp
--- Recording mergeinfo for merge of r40424 into '.':
G .
--- Merging r40426 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40426 into '.':
G .
--- Merging r40427 into '.':
G packages/pastojs/fpmake.pp
G packages/pastojs/src/pas2jscompiler.pp
A packages/pastojs/src/pas2jspcucompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40427 into '.':
G .
--- Merging r40428 into '.':
U packages/pastojs/tests/tcunitsearch.pas
U packages/pastojs/tests/testpas2js.lpi
--- Recording mergeinfo for merge of r40428 into '.':
G .
--- Merging r40429 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40429 into '.':
G .
--- Merging r40430 into '.':
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jspcucompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40430 into '.':
G .
--- Merging r40439 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jspcucompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40439 into '.':
G .
--- Merging r40440 into '.':
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40440 into '.':
G .
--- Merging r40441 into '.':
G packages/pastojs/src/pas2jspcucompiler.pp
--- Recording mergeinfo for merge of r40441 into '.':
G .
# revisions: 40076,40081,40083,40084,40085,40101,40105,40106,40107,40116,40126,40127,40133,40135,40138,40139,40140,40143,40146,40148,40151,40152,40164,40168,40175,40177,40192,40193,40194,40204,40209,40210,40211,40241,40243,40245,40258,40259,40263,40279,40290,40302,40304,40305,40342,40343,40351,40352,40353,40354,40355,40356,40372,40423,40424,40426,40427,40428,40429,40430,40439,40440,40441
git-svn-id: branches/fixes_3_2@40718 -
G packages/fcl-passrc/tests/tcresolver.pas
G packages/pastojs/tests/tcprecompile.pas
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jsfiler.pp
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r39851 into '.':
G .
--- Merging r39853 into '.':
U packages/fcl-js/src/jsbase.pp
--- Recording mergeinfo for merge of r39853 into '.':
G .
--- Merging r39854 into '.':
U packages/fcl-js/src/jswriter.pp
U packages/pastojs/tests/tcsrcmap.pas
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r39854 into '.':
G .
--- Merging r39855 into '.':
U packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r39855 into '.':
G .
--- Merging r39856 into '.':
U packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39856 into '.':
G .
--- Merging r39857 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r39857 into '.':
G .
--- Merging r39898 into '.':
G packages/fcl-js/src/jsbase.pp
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r39898 into '.':
G .
--- Merging r39899 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39899 into '.':
G .
--- Merging r39904 into '.':
U packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r39904 into '.':
G .
--- Merging r39906 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39906 into '.':
G .
--- Merging r39908 into '.':
U packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r39908 into '.':
G .
--- Merging r39919 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
U packages/fcl-passrc/tests/tcuseanalyzer.pas
U packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r39919 into '.':
G .
--- Merging r39921 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r39921 into '.':
G .
--- Merging r39926 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39926 into '.':
G .
--- Merging r39928 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r39928 into '.':
G .
--- Merging r39929 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r39929 into '.':
G .
--- Merging r39932 into '.':
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/tests/tcuseanalyzer.pas
--- Recording mergeinfo for merge of r39932 into '.':
G .
--- Merging r39937 into '.':
G packages/fcl-passrc/tests/tcuseanalyzer.pas
G packages/fcl-passrc/src/pasuseanalyzer.pas
--- Recording mergeinfo for merge of r39937 into '.':
G .
--- Merging r39939 into '.':
U packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r39939 into '.':
G .
--- Merging r39940 into '.':
U packages/fcl-passrc/src/pasresolveeval.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pparser.pp
U packages/pastojs/tests/tcfiler.pas
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/src/pas2jsfiler.pp
--- Recording mergeinfo for merge of r39940 into '.':
G .
--- Merging r39942 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r39942 into '.':
G .
--- Merging r39944 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r39944 into '.':
G .
--- Merging r39946 into '.':
G packages/fcl-passrc/src/pasresolveeval.pas
--- Recording mergeinfo for merge of r39946 into '.':
G .
--- Merging r39966 into '.':
G utils/pas2js/dist/rtl.js
--- Recording mergeinfo for merge of r39966 into '.':
G .
--- Merging r39968 into '.':
G packages/fcl-passrc/src/pasresolveeval.pas
--- Recording mergeinfo for merge of r39968 into '.':
G .
--- Merging r39974 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39974 into '.':
G .
--- Merging r39975 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r39975 into '.':
G .
--- Merging r39976 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r39976 into '.':
G .
--- Merging r39977 into '.':
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r39977 into '.':
G .
--- Merging r39979 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r39979 into '.':
G .
--- Merging r39985 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/pastojs/src/fppas2js.pp
--- Recording mergeinfo for merge of r39985 into '.':
G .
--- Merging r40013 into '.':
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40013 into '.':
G .
--- Merging r40018 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolveeval.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40018 into '.':
G .
--- Merging r40029 into '.':
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40029 into '.':
G .
--- Merging r40030 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/tests/tcresolver.pas
--- Recording mergeinfo for merge of r40030 into '.':
G .
--- Merging r40032 into '.':
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40032 into '.':
G .
--- Merging r40034 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40034 into '.':
G .
--- Merging r40036 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/fcl-js/src/jsbase.pp
--- Recording mergeinfo for merge of r40036 into '.':
G .
--- Merging r40037 into '.':
A utils/pas2js/nodepas2js.pp
A utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40037 into '.':
G .
--- Merging r40039 into '.':
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40039 into '.':
G .
--- Merging r40040 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pscanner.pp
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40040 into '.':
G .
--- Merging r40041 into '.':
G packages/pastojs/src/pas2jslogger.pp
U packages/pastojs/src/pas2jsfileutils.pp
U packages/pastojs/src/pas2jsfilecache.pp
U packages/pastojs/src/pas2js_defines.inc
U packages/pastojs/src/pas2jsfileutilswin.inc
G packages/pastojs/src/pas2jscompiler.pp
A packages/pastojs/src/pas2jsfileutilsnodejs.inc
U packages/pastojs/src/pas2jsfileutilsunix.inc
--- Recording mergeinfo for merge of r40041 into '.':
G .
--- Merging r40042 into '.':
U utils/pas2js/pas2js.pp
U utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40042 into '.':
G .
--- Merging r40043 into '.':
G packages/pastojs/src/pas2jsfileutils.pp
--- Recording mergeinfo for merge of r40043 into '.':
G .
--- Merging r40044 into '.':
U packages/pastojs/src/pas2jspparser.pp
G packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/pas2jsfileutils.pp
G utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40044 into '.':
G .
--- Merging r40045 into '.':
G utils/pas2js/nodepas2js.pp
U packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r40045 into '.':
G .
--- Merging r40046 into '.':
G packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40046 into '.':
G .
--- Merging r40047 into '.':
G packages/pastojs/src/pas2jsfileutilswin.inc
--- Recording mergeinfo for merge of r40047 into '.':
G .
--- Merging r40048 into '.':
G packages/fcl-js/src/jssrcmap.pas
G utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40048 into '.':
G .
--- Merging r40049 into '.':
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/src/pas2jsfiler.pp
G packages/pastojs/src/pas2jsfilecache.pp
U packages/pastojs/src/fppjssrcmap.pp
G packages/pastojs/src/pas2js_defines.inc
G utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40049 into '.':
G .
--- Merging r40051 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
--- Recording mergeinfo for merge of r40051 into '.':
G .
--- Merging r40053 into '.':
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/fppjssrcmap.pp
--- Recording mergeinfo for merge of r40053 into '.':
G .
--- Merging r40055 into '.':
G packages/fcl-json/src/fpjson.pp
U packages/fcl-json/tests/testjsondata.pp
--- Recording mergeinfo for merge of r40055 into '.':
G .
--- Merging r40058 into '.':
U packages/fcl-json/tests/testjsonparser.pp
U packages/fcl-json/tests/testjson.pp
U packages/fcl-json/tests/testjson.lpi
G packages/fcl-json/tests/testjsondata.pp
G packages/fcl-json/src/fpjson.pp
G packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r40058 into '.':
G .
--- Merging r40061 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40061 into '.':
G .
--- Merging r40062 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/src/pas2jscompiler.pp
G packages/pastojs/src/pas2jspparser.pp
G packages/pastojs/src/pas2jsfileutils.pp
G packages/pastojs/tests/tcmodules.pas
G packages/pastojs/tests/tcfiler.pas
G utils/pas2js/nodepas2js.pp
U utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40062 into '.':
G .
--- Merging r40064 into '.':
G packages/pastojs/src/pas2jscompiler.pp
U packages/pastojs/src/pas2jsfileutilsnodejs.inc
G packages/pastojs/src/pas2jsfileutils.pp
G packages/fcl-json/src/fpjson.pp
G utils/pas2js/docs/translation.html
--- Recording mergeinfo for merge of r40064 into '.':
G .
--- Merging r40067 into '.':
G packages/pastojs/src/pas2jsfileutilsnodejs.inc
G packages/pastojs/src/pas2jslogger.pp
G packages/pastojs/src/pas2jsfileutils.pp
--- Recording mergeinfo for merge of r40067 into '.':
G .
--- Merging r40072 into '.':
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/pas2jscompiler.pp
G packages/fcl-json/src/fpjson.pp
G packages/fcl-js/src/jswriter.pp
G packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r40072 into '.':
G .
--- Merging r40075 into '.':
G packages/fcl-json/src/fpjson.pp
G packages/pastojs/src/pas2jscompiler.pp
G utils/pas2js/nodepas2js.pp
--- Recording mergeinfo for merge of r40075 into '.':
G .
--- Merging r40077 into '.':
G packages/fcl-js/src/jssrcmap.pas
G packages/fcl-js/src/jswriter.pp
--- Recording mergeinfo for merge of r40077 into '.':
G .
--- Merging r40080 into '.':
G packages/fcl-js/src/jswriter.pp
U packages/fcl-js/src/jsscanner.pp
--- Recording mergeinfo for merge of r40080 into '.':
G .
--- Merging r40082 into '.':
G packages/fcl-passrc/tests/tcresolver.pas
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasresolveeval.pas
--- Recording mergeinfo for merge of r40082 into '.':
G .
--- Merging r40098 into '.':
G utils/pas2js/nodepas2js.pp
U utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40098 into '.':
G .
--- Merging r40099 into '.':
G packages/fcl-js/src/jssrcmap.pas
--- Recording mergeinfo for merge of r40099 into '.':
G .
--- Merging r40100 into '.':
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40100 into '.':
G .
--- Merging r40108 into '.':
G utils/pas2js/nodepas2js.lpi
G packages/pastojs/src/pas2jsfilecache.pp
--- Recording mergeinfo for merge of r40108 into '.':
G .
--- Merging r40125 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40125 into '.':
G .
--- Merging r40129 into '.':
G packages/pastojs/src/fppas2js.pp
G packages/pastojs/tests/tcmodules.pas
G packages/fcl-passrc/src/pparser.pp
--- Recording mergeinfo for merge of r40129 into '.':
G .
--- Merging r40136 into '.':
G packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r40136 into '.':
G .
--- Merging r40137 into '.':
G packages/fcl-passrc/src/pasresolver.pp
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40137 into '.':
G .
--- Merging r40144 into '.':
G packages/fcl-passrc/src/pasresolveeval.pas
G utils/pas2js/nodepas2js.lpi
--- Recording mergeinfo for merge of r40144 into '.':
G .
--- Merging r40150 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40150 into '.':
G .
--- Merging r40165 into '.':
G packages/fcl-passrc/src/pasuseanalyzer.pas
G packages/fcl-passrc/src/pastree.pp
--- Recording mergeinfo for merge of r40165 into '.':
G .
--- Merging r40166 into '.':
G packages/fcl-passrc/src/pasresolver.pp
--- Recording mergeinfo for merge of r40166 into '.':
G .
--- Merging r40171 into '.':
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40171 into '.':
G .
--- Merging r40173 into '.':
G packages/pastojs/src/pas2jsfilecache.pp
G packages/pastojs/src/pas2jscompiler.pp
G packages/fcl-passrc/src/pscanner.pp
--- Recording mergeinfo for merge of r40173 into '.':
G .
# revisions: 39851,39853,39854,39855,39856,39857,39898,39899,39904,39906,39908,39919,39921,39926,39928,39929,39932,39937,39939,39940,39942,39944,39946,39966,39968,39974,39975,39976,39977,39979,39985,40013,40018,40029,40030,40032,40034,40036,40037,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40051,40053,40055,40058,40061,40062,40064,40067,40072,40075,40077,40080,40082,40098,40099,40100,40108,40125,40129,40136,40137,40144,40150,40165,40166,40171,40173
git-svn-id: branches/fixes_3_2@40709 -
------------------------------------------------------------------------
r39725 | pierre | 2018-09-10 13:28:33 +0000 (Mon, 10 Sep 2018) | 1 line
Add branches for 3.2.0, 3.2.1 and 3.3.1 versions
------------------------------------------------------------------------
--- Merging r39725 into '.':
U tests/utils/testsuite/utests.pp
--- Recording mergeinfo for merge of r39725 into '.':
U .
------------------------------------------------------------------------
r39733 | pierre | 2018-09-11 08:16:56 +0000 (Tue, 11 Sep 2018) | 1 line
sparc64-linux objects recompiled with GCC 7.3.0
------------------------------------------------------------------------
--- Merging r39733 into '.':
U tests/test/cg/obj/readme.txt
U tests/test/cg/obj/linux/sparc64/ctest.o
U tests/test/cg/obj/linux/sparc64/cpptcl1.o
U tests/test/cg/obj/linux/sparc64/cpptcl2.o
U tests/test/cg/obj/linux/sparc64/tcext3.o
U tests/test/cg/obj/linux/sparc64/tcext4.o
U tests/test/cg/obj/linux/sparc64/tcext5.o
U tests/test/cg/obj/linux/sparc64/tcext6.o
--- Recording mergeinfo for merge of r39733 into '.':
G .
------------------------------------------------------------------------
r39808 | pierre | 2018-09-26 09:29:33 +0000 (Wed, 26 Sep 2018) | 1 line
Disable libraries not compiling for jvm-java or jvm-android targets
------------------------------------------------------------------------
--- Merging r39808 into '.':
U packages/fppkg/fpmake.pp
U packages/fcl-base/fpmake.pp
U packages/rtl-extra/fpmake.pp
U packages/hermes/fpmake.pp
U packages/fcl-extra/fpmake.pp
U packages/fcl-db/fpmake.pp
U packages/unzip/fpmake.pp
U packages/odbc/fpmake.pp
U packages/gdbm/fpmake.pp
U packages/pthreads/fpmake.pp
U packages/fcl-json/fpmake.pp
U packages/pcap/fpmake.pp
U packages/numlib/fpmake.pp
U packages/rtl-generics/fpmake.pp
U packages/zlib/fpmake.pp
U packages/paszlib/fpmake.pp
U packages/webidl/fpmake.pp
U packages/regexpr/fpmake.pp
U packages/libgd/fpmake.pp
U packages/fcl-net/fpmake.pp
U packages/fcl-res/fpmake.pp
U packages/libpng/fpmake.pp
U packages/dblib/fpmake.pp
U packages/tcl/fpmake.pp
U packages/openssl/fpmake.pp
U packages/ibase/fpmake.pp
U packages/bzip2/fpmake.pp
U packages/fcl-sdo/fpmake.pp
U packages/fcl-sound/fpmake.pp
U packages/fcl-passrc/fpmake.pp
U packages/fcl-stl/fpmake.pp
U packages/libmicrohttpd/fpmake.pp
U packages/mysql/fpmake.pp
U packages/postgres/fpmake.pp
U packages/httpd22/fpmake.pp
U packages/httpd24/fpmake.pp
U packages/rtl-console/fpmake.pp
U packages/sqlite/fpmake.pp
U packages/fftw/fpmake.pp
U packages/fcl-pdf/fpmake.pp
U packages/rtl-objpas/fpmake.pp
U packages/fcl-image/fpmake.pp
U packages/pasjpeg/fpmake.pp
U packages/chm/fpmake.pp
U packages/fcl-registry/fpmake.pp
U packages/libtar/fpmake.pp
U packages/symbolic/fpmake.pp
U packages/libenet/fpmake.pp
U packages/imagemagick/fpmake.pp
U packages/fcl-xml/fpmake.pp
U packages/oracle/fpmake.pp
U packages/fcl-fpcunit/fpmake.pp
U packages/fcl-js/fpmake.pp
U packages/fcl-async/fpmake.pp
U packages/fcl-process/fpmake.pp
U packages/pastojs/fpmake.pp
U packages/hash/fpmake.pp
U packages/rtl-unicode/fpmake.pp
U packages/fpmkunit/fpmake.pp
--- Recording mergeinfo for merge of r39808 into '.':
G .
------------------------------------------------------------------------
r40027 | pierre | 2018-10-24 21:37:54 +0000 (Wed, 24 Oct 2018) | 1 line
Fix compilation of RTL for watcom target
------------------------------------------------------------------------
--- Merging r40027 into '.':
U compiler/x86/agx86int.pas
--- Recording mergeinfo for merge of r40027 into '.':
G .
------------------------------------------------------------------------
r40028 | pierre | 2018-10-25 06:39:42 +0000 (Thu, 25 Oct 2018) | 1 line
Try to fix compilation error after commit #40027
------------------------------------------------------------------------
--- Merging r40028 into '.':
G compiler/x86/agx86int.pas
--- Recording mergeinfo for merge of r40028 into '.':
G .
------------------------------------------------------------------------
r40102 | pierre | 2018-10-31 09:07:57 +0000 (Wed, 31 Oct 2018) | 1 line
Replace aint (which is a compiler specific type) by ptruint type, which is defined in system unit
------------------------------------------------------------------------
--- Merging r40102 into '.':
U tests/test/tarray5.pp
--- Recording mergeinfo for merge of r40102 into '.':
G .
------------------------------------------------------------------------
r40103 | pierre | 2018-10-31 09:59:45 +0000 (Wed, 31 Oct 2018) | 1 line
Use pdword to avoid range check erro in tentryfile.getdword method
------------------------------------------------------------------------
--- Merging r40103 into '.':
U compiler/entfile.pas
--- Recording mergeinfo for merge of r40103 into '.':
G .
------------------------------------------------------------------------
r40104 | pierre | 2018-10-31 10:21:51 +0000 (Wed, 31 Oct 2018) | 1 line
Use longint type instead of AWord for Initial parameter in CalcExecutionWeigths (to avoid range error for avr compiler)
------------------------------------------------------------------------
@@
begin
Result:=fen_false;
n.allocoptinfo;
<<<<<<< MINE (select with 'mc') (367)
Weight:=PAWord(arg)^;
||||||| ORIGINAL (367)
Weight:=max(PAWord(arg)^,1);
=======
Weight:=max(plongint(arg)^,1);
>>>>>>> THEIRS (select with 'tc') (367)
case n.nodetype of
casen:
begin
--- Merging r40104 into '.':
C compiler/optutils.pas
--- Recording mergeinfo for merge of r40104 into '.':
G .
Summary of conflicts:
Text conflicts: 1
------------------------------------------------------------------------
r40110 | pierre | 2018-10-31 14:51:23 +0000 (Wed, 31 Oct 2018) | 1 line
Avoid range check error in MaskLength evaluation
------------------------------------------------------------------------
--- Merging r40110 into '.':
U compiler/x86/aoptx86.pas
--- Recording mergeinfo for merge of r40110 into '.':
G .
------------------------------------------------------------------------
r40111 | pierre | 2018-10-31 15:47:53 +0000 (Wed, 31 Oct 2018) | 1 line
Complement commit 40104, by changing type of executionweight in toptinfo record and adapt pass_2 code
------------------------------------------------------------------------
--- Merging r40111 into '.':
U compiler/pass_2.pas
U compiler/optbase.pas
--- Recording mergeinfo for merge of r40111 into '.':
G .
------------------------------------------------------------------------
r40112 | pierre | 2018-10-31 15:48:32 +0000 (Wed, 31 Oct 2018) | 1 line
Disable range check completely in arm/cgcpu unit
------------------------------------------------------------------------
--- Merging r40112 into '.':
U compiler/arm/cgcpu.pas
--- Recording mergeinfo for merge of r40112 into '.':
G .
------------------------------------------------------------------------
r40113 | pierre | 2018-10-31 15:49:14 +0000 (Wed, 31 Oct 2018) | 1 line
Avoid overflow in code
------------------------------------------------------------------------
--- Merging r40113 into '.':
U compiler/symdef.pas
--- Recording mergeinfo for merge of r40113 into '.':
G .
------------------------------------------------------------------------
r40114 | pierre | 2018-10-31 15:50:26 +0000 (Wed, 31 Oct 2018) | 1 line
Add explicit rtlclean/rtl targets in fullcycle rule if DOWPOCYCLE is set
------------------------------------------------------------------------
--- Merging r40114 into '.':
U compiler/Makefile.fpc
U compiler/Makefile
--- Recording mergeinfo for merge of r40114 into '.':
G .
------------------------------------------------------------------------
r40120 | pierre | 2018-10-31 23:15:22 +0000 (Wed, 31 Oct 2018) | 1 line
Change RemoveCurrentP parameter type to tai, because GetNextInstruction does not always return a taicpu, adapt code in avr/aoptcpu unit
------------------------------------------------------------------------
--- Merging r40120 into '.':
U compiler/aoptobj.pas
U compiler/avr/aoptcpu.pas
--- Recording mergeinfo for merge of r40120 into '.':
G .
------------------------------------------------------------------------
r40121 | pierre | 2018-10-31 23:16:51 +0000 (Wed, 31 Oct 2018) | 1 line
Add check about tloadnode.symtableentry type before typecast
------------------------------------------------------------------------
--- Merging r40121 into '.':
U compiler/ncal.pas
--- Recording mergeinfo for merge of r40121 into '.':
G .
------------------------------------------------------------------------
r40122 | pierre | 2018-10-31 23:18:09 +0000 (Wed, 31 Oct 2018) | 1 line
Fix typecast in FindRegDeAlloc call
------------------------------------------------------------------------
--- Merging r40122 into '.':
U compiler/arm/aoptcpu.pas
--- Recording mergeinfo for merge of r40122 into '.':
G .
------------------------------------------------------------------------
r40123 | pierre | 2018-10-31 23:19:39 +0000 (Wed, 31 Oct 2018) | 1 line
Remove unneeded typecasts in TryTOptimizeMove
------------------------------------------------------------------------
--- Merging r40123 into '.':
U compiler/m68k/aoptcpu.pas
--- Recording mergeinfo for merge of r40123 into '.':
G .
------------------------------------------------------------------------
r40124 | pierre | 2018-10-31 23:20:29 +0000 (Wed, 31 Oct 2018) | 1 line
Add global range check disable for i8086 cgcpu and x86 nx86add units
------------------------------------------------------------------------
--- Merging r40124 into '.':
U compiler/i8086/cgcpu.pas
U compiler/x86/nx86add.pas
--- Recording mergeinfo for merge of r40124 into '.':
G .
------------------------------------------------------------------------
r40131 | pierre | 2018-11-01 07:01:02 +0000 (Thu, 01 Nov 2018) | 1 line
Remove another wrong typecast when testing that a tai is an instruction
------------------------------------------------------------------------
--- Merging r40131 into '.':
G compiler/m68k/aoptcpu.pas
--- Recording mergeinfo for merge of r40131 into '.':
G .
------------------------------------------------------------------------
r40236 | pierre | 2018-11-06 07:40:31 +0000 (Tue, 06 Nov 2018) | 1 line
Really change extension of hs1 local variable in get_exepath
------------------------------------------------------------------------
--- Merging r40236 into '.':
U compiler/globals.pas
--- Recording mergeinfo for merge of r40236 into '.':
G .
------------------------------------------------------------------------
r40237 | pierre | 2018-11-06 07:41:15 +0000 (Tue, 06 Nov 2018) | 1 line
Disable range checking in rax86int unit
------------------------------------------------------------------------
--- Merging r40237 into '.':
U compiler/x86/rax86int.pas
--- Recording mergeinfo for merge of r40237 into '.':
G .
------------------------------------------------------------------------
r40278 | pierre | 2018-11-08 20:19:54 +0000 (Thu, 08 Nov 2018) | 1 line
Downgrade EXTDEBUG warning to note about zero size temp, as it is used for empty sets
------------------------------------------------------------------------
--- Merging r40278 into '.':
U compiler/tgobj.pas
--- Recording mergeinfo for merge of r40278 into '.':
G .
git-svn-id: branches/fixes_3_2@40624 -
