A packages/fcl-base/src/advancedipc.pp
U packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r31885 into '.':
U .
--- Merging r31890 into '.':
U packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31890 into '.':
G .
--- Merging r31925 into '.':
G packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31925 into '.':
G .
--- Merging r31939 into '.':
A packages/fcl-base/examples/testipc_client.pp
A packages/fcl-base/examples/testipc_server.pp
--- Recording mergeinfo for merge of r31939 into '.':
G .
--- Merging r31940 into '.':
G packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31940 into '.':
G .
--- Merging r31955 into '.':
G packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31955 into '.':
G .
--- Merging r32287 into '.':
A packages/fcl-base/examples/sitest.pp
G packages/fcl-base/fpmake.pp
A packages/fcl-base/src/singleinstance.pp
U packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32287 into '.':
G .
--- Merging r32288 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32288 into '.':
G .
--- Merging r32289 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32289 into '.':
G .
--- Merging r32291 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32291 into '.':
G .
--- Merging r32321 into '.':
U packages/fcl-base/src/contnrs.pp
--- Recording mergeinfo for merge of r32321 into '.':
G .
--- Merging r32767 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32767 into '.':
G .
--- Merging r32770 into '.':
G packages/fcl-base/src/custapp.pp
G packages/fcl-base/src/advancedipc.pp
U packages/fcl-base/src/singleinstance.pp
U packages/fcl-base/examples/sitest.pp
--- Recording mergeinfo for merge of r32770 into '.':
G .
--- Merging r32772 into '.':
G packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r32772 into '.':
G .
--- Merging r32773 into '.':
G packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r32773 into '.':
G .
--- Merging r33052 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r33052 into '.':
G .
# revisions: 31885,31890,31925,31939,31940,31955,32287,32288,32289,32291,32321,32767,32770,32772,32773,33052
git-svn-id: branches/fixes_3_0@33398 -
U packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31291 into '.':
U .
--- Merging r31292 into '.':
U packages/fcl-json/src/jsonscanner.pp
U packages/fcl-json/src/jsonparser.pp
U packages/fcl-json/tests/testjson.lpi
U packages/fcl-json/tests/testjsonconf.lpi
U packages/fcl-json/tests/testjsonparser.pp
--- Recording mergeinfo for merge of r31292 into '.':
G .
--- Merging r31293 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31293 into '.':
G .
--- Merging r31435 into '.':
U packages/fcl-json/tests/jsonconftest.pp
U packages/fcl-json/tests/testjsonconf.pp
U packages/fcl-json/src/fpjson.pp
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31435 into '.':
G .
--- Merging r31436 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31436 into '.':
G .
--- Merging r32001 into '.':
G packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r32001 into '.':
G .
--- Merging r32349 into '.':
U packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r32349 into '.':
G .
--- Merging r32350 into '.':
U packages/fcl-web/src/base/custcgi.pp
--- Recording mergeinfo for merge of r32350 into '.':
G .
--- Merging r32724 into '.':
U packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r32724 into '.':
G .
--- Merging r32731 into '.':
G packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r32731 into '.':
G .
--- Merging r32762 into '.':
U packages/fcl-json/src/fpjsonrtti.pp
--- Recording mergeinfo for merge of r32762 into '.':
G .
--- Merging r32774 into '.':
G packages/fcl-json/src/fpjson.pp
G packages/fcl-json/src/jsonconf.pp
G packages/fcl-json/src/fpjsonrtti.pp
G packages/fcl-json/src/jsonscanner.pp
G packages/fcl-json/src/jsonparser.pp
G packages/fcl-json/tests/testjsonparser.pp
G packages/fcl-json/tests/testjson.lpi
G packages/fcl-json/tests/jsonconftest.pp
--- Recording mergeinfo for merge of r32774 into '.':
G .
--- Merging r32875 into '.':
G packages/fcl-json/src/jsonscanner.pp
G packages/fcl-json/src/jsonparser.pp
G packages/fcl-json/tests/testjsonparser.pp
--- Recording mergeinfo for merge of r32875 into '.':
G .
--- Merging r32876 into '.':
U packages/fcl-json/tests/testjsonrtti.pp
G packages/fcl-json/tests/testjson.lpi
A packages/fcl-json/tests/testcomps.pp
U packages/fcl-json/tests/testjson.pp
G packages/fcl-json/src/fpjsonrtti.pp
--- Recording mergeinfo for merge of r32876 into '.':
G .
--- Merging r32943 into '.':
A packages/fcl-web/src/base/custapache24.pp
U packages/fcl-web/src/base/fpapache.pp
A packages/fcl-web/src/base/custapache.pp
U packages/fcl-web/src/base/fpapache24.pp
U packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r32943 into '.':
G .
--- Merging r32944 into '.':
G packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r32944 into '.':
G .
--- Merging r33032 into '.':
U packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r33032 into '.':
G .
--- Merging r33124 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r33124 into '.':
G .
--- Merging r33168 into '.':
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r33168 into '.':
G .
--- Merging r33293 into '.':
U packages/fcl-web/src/base/restbase.pp
--- Recording mergeinfo for merge of r33293 into '.':
G .
--- Merging r33310 into '.':
U packages/fcl-json/tests/testjsondata.pp
G packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r33310 into '.':
G .
--- Merging r33364 into '.':
G packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r33364 into '.':
G .
# revisions: 31291,31292,31293,31435,31436,32001,32349,32350,32724,32731,32762,32774,32875,32876,32943,32944,33032,33124,33168,33293,33310,33364
git-svn-id: branches/fixes_3_0@33396 -
U packages/fcl-net/src/cnetdb.pp
U packages/fcl-net/fpmake.pp
--- Recording mergeinfo for merge of r32726 into '.':
U .
--- Merging r33094 into '.':
U packages/fcl-net/src/ssockets.pp
--- Recording mergeinfo for merge of r33094 into '.':
G .
--- Merging r33166 into '.':
G packages/fcl-net/src/ssockets.pp
--- Recording mergeinfo for merge of r33166 into '.':
G .
--- Merging r33332 into '.':
G packages/fcl-net/src/cnetdb.pp
--- Recording mergeinfo for merge of r33332 into '.':
G .
# revisions: 32726,33094,33166,33332
git-svn-id: branches/fixes_3_0@33395 -
U rtl/haiku/sysos.inc
U rtl/bsd/sysos.inc
U rtl/solaris/sysos.inc
U rtl/linux/sysos.inc
--- Recording mergeinfo for merge of r33262 into '.':
U .
--- Merging r33263 into '.':
U rtl/aix/sysos.inc
--- Recording mergeinfo for merge of r33263 into '.':
G .
--- Merging r33291 into '.':
U packages/fcl-image/src/fpwritebmp.pp
U packages/fcl-image/src/fpreadbmp.pp
--- Recording mergeinfo for merge of r33291 into '.':
G .
--- Merging r33295 into '.':
U packages/librsvg/fpmake.pp
--- Recording mergeinfo for merge of r33295 into '.':
G .
# revisions: 33262,33263,33291,33295
git-svn-id: branches/fixes_3_0@33391 -
U packages/winunits-base/src/richedit.pp
--- Recording mergeinfo for merge of r33315 into '.':
U .
--- Merging r33338 into '.':
G packages/winunits-base/src/richedit.pp
--- Recording mergeinfo for merge of r33338 into '.':
G .
# revisions: 33315,33338
git-svn-id: branches/fixes_3_0@33390 -
U rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r32257 into '.':
U .
--- Merging r32258 into '.':
U packages/rtl-extra/src/unix/sockets.pp
U packages/rtl-extra/src/win/sockets.pp
U packages/rtl-extra/src/os2commn/sockets.pp
--- Recording mergeinfo for merge of r32258 into '.':
G .
# revisions: 32257,32258
git-svn-id: branches/fixes_3_0@33389 -
U packages/rtl-extra/src/inc/socketsh.inc
--- Recording mergeinfo for merge of r31452 into '.':
U .
# revisions: 31452
git-svn-id: branches/fixes_3_0@33388 -
U packages/winunits-base/src/activex.pp
--- Recording mergeinfo for merge of r31283 into '.':
U .
# revisions: 31283
git-svn-id: branches/fixes_3_0@33386 -
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r32812 into '.':
U .
--- Merging r32938 into '.':
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r32938 into '.':
G .
--- Merging r32941 into '.':
G packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r32941 into '.':
G .
--- Merging r33127 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33127 into '.':
G .
--- Merging r33150 into '.':
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/tests/testspecifictbufdataset.pas
--- Recording mergeinfo for merge of r33150 into '.':
G .
--- Merging r33169 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
A packages/fcl-db/src/base/sqltypes.pp
U packages/fcl-db/src/datadict/fpddsqldb.pp
U packages/fcl-db/src/datadict/fpdatadict.pp
U packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r33169 into '.':
G .
--- Merging r33172 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33172 into '.':
G .
--- Merging r33174 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33174 into '.':
G .
# revisions: 32812,32938,32941,33127,33150,33169,33172,33174
git-svn-id: branches/fixes_3_0@33374 -
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r32931 into '.':
U .
--- Merging r32964 into '.':
U packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32964 into '.':
G .
--- Merging r33049 into '.':
U packages/fcl-db/src/base/dsparams.inc
--- Recording mergeinfo for merge of r33049 into '.':
G .
--- Merging r33078 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33078 into '.':
G .
--- Merging r33079 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33079 into '.':
G .
--- Merging r33080 into '.':
U packages/fcl-db/tests/sqldbtoolsunit.pas
--- Recording mergeinfo for merge of r33080 into '.':
G .
--- Merging r33085 into '.':
U packages/fcl-db/src/base/dataset.inc
U packages/fcl-db/src/dbase/dbf.pas
--- Recording mergeinfo for merge of r33085 into '.':
G .
--- Merging r33086 into '.':
U packages/fcl-db/src/dbase/dbf_common.inc
--- Recording mergeinfo for merge of r33086 into '.':
G .
--- Merging r33087 into '.':
U packages/fcl-db/src/datadict/fpddsqldb.pp
--- Recording mergeinfo for merge of r33087 into '.':
G .
# revisions: 32931,32964,33049,33078,33079,33080,33085,33086,33087
git-svn-id: branches/fixes_3_0@33372 -
U packages/fcl-db/fpmake.pp
U packages/fcl-db/src/datadict/fpddregstd.pp
A packages/fcl-db/src/datadict/fpddmssql.pp
U packages/fcl-db/src/datadict/buildd.lpi
--- Recording mergeinfo for merge of r32831 into '.':
U .
--- Merging r32843 into '.':
G packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r32843 into '.':
G .
--- Merging r32851 into '.':
U packages/fcl-db/src/datadict/fpddsqldb.pp
U packages/fcl-db/src/datadict/fpddmssql.pp
--- Recording mergeinfo for merge of r32851 into '.':
G .
--- Merging r32853 into '.':
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r32853 into '.':
G .
--- Merging r32854 into '.':
U packages/fcl-db/tests/testdbbasics.pas
--- Recording mergeinfo for merge of r32854 into '.':
G .
# revisions: 32831,32843,32851,32853,32854,3293
git-svn-id: branches/fixes_3_0@33370 -
U packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r32093 into '.':
U .
--- Merging r32131 into '.':
U packages/fcl-db/tests/testdbbasics.pas
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/sdf/sdfdata.pp
U packages/fcl-db/src/memds/memds.pp
--- Recording mergeinfo for merge of r32131 into '.':
G .
--- Merging r32359 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32359 into '.':
G .
--- Merging r32558 into '.':
U packages/fcl-db/src/base/bufdataset_parser.pp
--- Recording mergeinfo for merge of r32558 into '.':
G .
--- Merging r32566 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32566 into '.':
G .
--- Merging r32729 into '.':
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Recording mergeinfo for merge of r32729 into '.':
G .
--- Merging r32753 into '.':
U packages/fcl-db/src/sqlite/sqliteds.pas
U packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r32753 into '.':
G .
--- Merging r32754 into '.':
G packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r32754 into '.':
G .
--- Merging r32755 into '.':
G packages/fcl-db/src/sqlite/sqliteds.pas
--- Recording mergeinfo for merge of r32755 into '.':
G .
--- Merging r32796 into '.':
U packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r32796 into '.':
G .
--- Merging r32800 into '.':
U packages/fcl-db/src/base/sqlscript.pp
--- Recording mergeinfo for merge of r32800 into '.':
G .
--- Merging r32801 into '.':
U packages/fcl-db/tests/dbtestframework.pas
U packages/fcl-db/tests/testsqlscript.pas
--- Recording mergeinfo for merge of r32801 into '.':
G .
--- Merging r32807 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r32807 into '.':
G .
--- Merging r32808 into '.':
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r32808 into '.':
G .
--- Merging r32810 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32810 into '.':
G .
# revisions: 32093,32131,32359,32558,32566,32729,32753,32754,32755,32796,32800,32801,32807,32808,32810
git-svn-id: branches/fixes_3_0@33368 -
U packages/fcl-db/src/sqlite/customsqliteds.pas
U packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r31837 into '.':
U .
--- Merging r31838 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31838 into '.':
G .
--- Merging r31839 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31839 into '.':
G .
--- Merging r31840 into '.':
U packages/fcl-db/src/sqlite/sqliteds.pas
--- Recording mergeinfo for merge of r31840 into '.':
G .
--- Merging r31841 into '.':
U packages/fcl-db/src/sqlite/fillds.pas
U packages/fcl-db/src/sqlite/concurrencyds.pas
U packages/fcl-db/src/sqlite/testds.pas
U packages/fcl-db/src/sqlite/browseds.pas
U packages/fcl-db/src/sqlite/createds.pas
--- Recording mergeinfo for merge of r31841 into '.':
G .
--- Merging r31844 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31844 into '.':
G .
--- Merging r31845 into '.':
G packages/fcl-db/src/sqlite/fillds.pas
--- Recording mergeinfo for merge of r31845 into '.':
G .
--- Merging r31853 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
G packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r31853 into '.':
G .
--- Merging r31876 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31876 into '.':
G .
--- Merging r31877 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31877 into '.':
G .
--- Merging r32034 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r32034 into '.':
G .
# revisions: 31837,31838,31839,31840,31841,31844,31845,31853,31876,31877,32034
git-svn-id: branches/fixes_3_0@33367 -
A packages/mysql/examples/testdb5.pp
C packages/mysql/examples/Makefile
U packages/mysql/examples/Makefile.fpc
--- Recording mergeinfo for merge of r31310 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31310
git-svn-id: branches/fixes_3_0@33366 -
U packages/gmp/src/gmp.pas
--- Recording mergeinfo for merge of r32449 into '.':
U .
--- Merging r32452 into '.':
U packages/winunits-base/src/shlobj.pp
--- Recording mergeinfo for merge of r32452 into '.':
G .
--- Merging r32490 into '.':
U packages/paszlib/src/gzio.pas
--- Recording mergeinfo for merge of r32490 into '.':
G .
# revisions: 32449,32452,32490
git-svn-id: branches/fixes_3_0@33365 -
U packages/fcl-process/src/unix/process.inc
--- Recording mergeinfo for merge of r32254 into '.':
U .
# revisions: 32254
git-svn-id: branches/fixes_3_0@33358 -
U packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32850 into '.':
U .
--- Merging r32963 into '.':
G packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32963 into '.':
G .
# revisions: 32850,32963
git-svn-id: branches/fixes_3_0@33357 -
U packages/fcl-base/src/inifiles.pp
--- Recording mergeinfo for merge of r32768 into '.':
U .
--- Merging r32769 into '.':
A packages/fcl-base/examples/inifmt.pp
--- Recording mergeinfo for merge of r32769 into '.':
G .
--- Merging r32961 into '.':
G packages/fcl-base/src/inifiles.pp
U packages/fcl-base/examples/README.txt
A packages/fcl-base/examples/testini.pp
--- Recording mergeinfo for merge of r32961 into '.':
G .
# revisions: 32768,32769,32961
git-svn-id: branches/fixes_3_0@33352 -
U packages/fcl-base/src/streamex.pp
--- Recording mergeinfo for merge of r33041 into '.':
U .
# revisions: 33041
git-svn-id: branches/fixes_3_0@33351 -
U packages/fcl-base/src/streamex.pp
--- Recording mergeinfo for merge of r32797 into '.':
U .
# revisions: 32797
git-svn-id: branches/fixes_3_0@33350 -
U packages/fcl-base/src/uriparser.pp
--- Recording mergeinfo for merge of r31305 into '.':
U .
# revisions: 31305
git-svn-id: branches/fixes_3_0@33349 -
U compiler/symdef.pas
--- Recording mergeinfo for merge of r30168 into '.':
U .
--- Merging r33164 into '.':
A tests/webtbs/tw29547.pp
--- Recording mergeinfo for merge of r33164 into '.':
G .
git-svn-id: branches/fixes_3_0@33165 -
U rtl/inc/system.fpd
--- Recording mergeinfo for merge of r31358 into '.':
U .
--- Merging r31361 into '.':
U tests/webtbs/tw1255.pp
--- Recording mergeinfo for merge of r31361 into '.':
G .
# revisions: 31358,31361
git-svn-id: branches/fixes_3_0@33102 -
when it's used for bootstrapping then the changed code isn't used (it's only
used when linking to dynamic libraries without linking to libc)
--- Merging r33045 into '.':
U rtl/linux/powerpc64/prt0.as
--- Recording mergeinfo for merge of r33045 into '.':
U .
git-svn-id: branches/fixes_3_0@33046 -
A tests/webtbs/tw28475.pp
U compiler/ncnv.pas
--- Merging r31193 into '.':
U compiler/optcse.pas
A tests/webtbs/tw27210.pp
--- Merging r31263 into '.':
U compiler/options.pas
--- Merging r31335 into '.':
U compiler/dbgdwarf.pas
--- Merging r31466 into '.':
U compiler/arm/narmset.pas
--- Merging r31488 into '.':
U rtl/inc/astrings.inc
--- Merging r31572 into '.':
U compiler/arm/aasmcpu.pas
--- Merging r31608 into '.':
U compiler/x86/nx86cal.pas
--- Merging r31680 into '.':
U packages/chm/src/chmcmd.lpr
--- Merging r31851 into '.':
U rtl/jvm/math.inc
--- Merging r31956 into '.':
U tests/tbs/tb0320.pp
--- Merging r31976 into '.':
U rtl/linux/x86_64/cprt0.as
--- Merging r31980 into '.':
U compiler/systems/t_linux.pas
--- Merging r32043 into '.':
U compiler/cclasses.pas
--- Merging r32066 into '.':
G rtl/inc/astrings.inc
A tests/webtbs/tw28850.pp
--- Merging r32168 into '.':
U rtl/unix/cthreads.pp
--- Merging r32244 into '.':
U packages/fpmkunit/src/fpmkunit.pp
--- Merging r32259 into '.':
U compiler/x86/agx86int.pas
--- Merging r32338 into '.':
G compiler/ncnv.pas
--- Merging r32342 into '.':
G compiler/ncnv.pas
--- Merging r32368 into '.':
A tests/webtbs/tw29040.pp
U compiler/x86/rax86int.pas
--- Merging r32399 into '.':
U packages/fcl-res/src/machodefaulttarget.inc
--- Merging r32410 into '.':
U compiler/ncgset.pas
--- Merging r32454 into '.':
U compiler/jvm/pjvm.pas
U tests/test/jvm/testall.bat
A tests/test/jvm/tprocvaranon.pp
U tests/test/jvm/testall.sh
--- Merging r32517 into '.':
U compiler/nutils.pas
U compiler/pexpr.pas
A tests/webtbs/tw29030.pp
--- Merging r32527 into '.':
U rtl/linux/powerpc64/gprt0.as
U rtl/linux/powerpc64/cprt0.as
--- Merging r32528 into '.':
U rtl/linux/powerpc64/prt0.as
--- Merging r32549 into '.':
U compiler/jvm/njvmcon.pas
U compiler/jvm/njvmcnv.pascd ..
--- Merging r32584 into '.':
U compiler/utils/ppuutils/ppudump.pp
--- Merging r32599 into '.':
U compiler/paramgr.pas
git-svn-id: branches/fixes_3_0@32671 -
U compiler/ncgvmt.pas
--- Merging r30217 into '.':
U compiler/comprsrc.pas
--- Merging r30261 into '.':
A tests/webtbs/tw27691.pp
U compiler/pmodules.pas
--- Merging r30265 into '.':
U compiler/fmodule.pas
G compiler/pmodules.pas
--- Merging r30272 into '.':
A tests/webtbs/tw27517.pp
U compiler/pexpr.pas
--- Merging r30427 into '.':
U compiler/x86/cpubase.pas
--- Merging r30465 into '.':
U compiler/utils/ppuutils/ppudump.pp
--- Merging r30487 into '.':
U rtl/inc/cgenstr.inc
--- Merging r30502 into '.':
U compiler/x86/nx86inl.pas
U compiler/arm/narminl.pas
U compiler/ppcgen/ngppcinl.pas
A tests/webtbs/tw27811.pp
--- Merging r30656 into '.':
U compiler/psub.pas
--- Merging r30765 into '.':
U compiler/arm/narmcnv.pas
U compiler/sparc/ncpucnv.pas
U compiler/m68k/n68kcnv.pas
U compiler/mips/ncpucnv.pas
U compiler/ppcgen/ngppccnv.pas
C compiler/aarch64/ncpucnv.pas
A tests/webtbs/tw28007.pp
git-svn-id: branches/fixes_3_0@32665 -
U compiler/aasmbase.pas
--- Recording mergeinfo for merge of r29471 into '.':
U .
--- Merging r30220 into '.':
U tests/utils/dotest.pp
--- Recording mergeinfo for merge of r30220 into '.':
G .
git-svn-id: branches/fixes_3_0@32631 -
A tests/webtbs/tw27256.pp
U compiler/ncal.pas
U compiler/nadd.pas
--- Merging r29495 into '.':
G compiler/ncal.pas
--- Merging r29584 into '.':
U compiler/utils/ppuutils/ppudump.pp
U compiler/psub.pas
U compiler/globtype.pas
G compiler/ncal.pas
--- Merging r29585 into '.':
U rtl/unix/oscdecl.inc
U rtl/unix/oscdeclh.inc
U rtl/linux/osmacro.inc
--- Merging r29586 into '.':
U tests/utils/dotest.pp
--- Merging r29616 into '.':
A tests/webtbs/tw26534a.pp
A tests/webtbs/tw26534b.pp
A tests/webtbs/tw24796.pp
G compiler/ncal.pas
--- Merging r29641 into '.':
U compiler/optdfa.pas
--- Merging r29686 into '.':
A tests/test/tobjc42.pp
A tests/test/uobjc42.pp
U compiler/symdef.pas
--- Merging r29792 into '.':
U compiler/finput.pas
--- Merging r29793 into '.':
A tests/webtbs/tw14347.pp
git-svn-id: branches/fixes_3_0@32621 -
U packages/fppkg/src/fpmkunitsrc.inc
--- Recording mergeinfo for merge of r32274 into '.':
U .
# revisions: 32274
git-svn-id: branches/fixes_3_0@32295 -
U packages/fppkg/src/pkgmessages.pp
U packages/fppkg/src/pkgcommands.pp
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r32224 into '.':
U .
# revisions: 3222
git-svn-id: branches/fixes_3_0@32273 -
U rtl/inc/ustrings.inc
A tests/webtbs/tw28593.pp
--- Recording mergeinfo for merge of r31480 into '.':
U .
# revisions: 31480
git-svn-id: branches/fixes_3_0@32261 -
A tests/webtbs/tw28934.pp
C compiler/widestr.pas
--- Recording mergeinfo for merge of r32202 into '.':
U .
Summary of conflicts:
Text conflicts: 1
Summary of conflicts:
Text conflicts: 1
# revisions: 32202
git-svn-id: branches/fixes_3_0@32260 -
U packages/hash/fpmake.pp
--- Recording mergeinfo for merge of r32143 into '.':
U .
--- Merging r32144 into '.':
U packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r32144 into '.':
G .
--- Merging r32145 into '.':
U packages/fcl-registry/fpmake.pp
--- Recording mergeinfo for merge of r32145 into '.':
G .
--- Merging r32146 into '.':
U packages/gtk2/fpmake.pp
--- Recording mergeinfo for merge of r32146 into '.':
G .
--- Merging r32147 into '.':
U packages/winunits-jedi/fpmake.pp
--- Recording mergeinfo for merge of r32147 into '.':
G .
# revisions: 32143,32144,32145,32146,32147
git-svn-id: branches/fixes_3_0@32243 -
U packages/svgalib/fpmake.pp
U packages/libndsfpc/fpmake.pp
U packages/regexpr/fpmake.pp
U packages/libogcfpc/fpmake.pp
U packages/postgres/fpmake.pp
U packages/os2units/fpmake.pp
U packages/libxml/fpmake.pp
U packages/libcurl/fpmake.pp
U packages/gtk2/fpmake.pp
U packages/odbc/fpmake.pp
U packages/syslog/fpmake.pp
U packages/libgd/fpmake.pp
U packages/ibase/fpmake.pp
U packages/fpmkunit/src/fpmkunit.pp
U packages/opengles/fpmake.pp
U packages/fcl-base/fpmake.pp
U packages/gmp/fpmake.pp
U packages/uuid/fpmake.pp
U packages/libgbafpc/fpmake.pp
U packages/ptc/fpmake.pp
U ide/fpmake.pp
--- Recording mergeinfo for merge of r32142 into '.':
U .
# revisions: 32142
git-svn-id: branches/fixes_3_0@32242 -
U packages/gdbint/fpmake.pp
--- Recording mergeinfo for merge of r32124 into '.':
U .
--- Merging r32126 into '.':
U packages/gtk2/fpmake.pp
--- Recording mergeinfo for merge of r32126 into '.':
G .
--- Merging r32127 into '.':
U packages/imagemagick/fpmake.pp
--- Recording mergeinfo for merge of r32127 into '.':
G .
--- Merging r32128 into '.':
U packages/rtl-unicode/fpmake.pp
--- Recording mergeinfo for merge of r32128 into '.':
G .
--- Merging r32129 into '.':
U packages/fcl-sdo/fpmake.pp
--- Recording mergeinfo for merge of r32129 into '.':
G .
--- Merging r32138 into '.':
U packages/fppkg/fpmake.pp
--- Recording mergeinfo for merge of r32138 into '.':
G .
--- Merging r32139 into '.':
U packages/libxml/fpmake.pp
--- Recording mergeinfo for merge of r32139 into '.':
G .
# revisions: 32124,32126,32127,32128,32129,32138,32139
git-svn-id: branches/fixes_3_0@32241 -
U packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r32118 into '.':
U .
# revisions: 32118
git-svn-id: branches/fixes_3_0@32240 -
U packages/rtl-objpas/fpmake.pp
--- Recording mergeinfo for merge of r32074 into '.':
U .
--- Merging r32119 into '.':
U packages/aspell/fpmake.pp
--- Recording mergeinfo for merge of r32119 into '.':
G .
--- Merging r32120 into '.':
U packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r32120 into '.':
G .
--- Merging r32121 into '.':
U packages/chm/fpmake.pp
--- Recording mergeinfo for merge of r32121 into '.':
G .
--- Merging r32123 into '.':
U packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r32123 into '.':
G .
# revisions: 32074,32119,32120,32121,32123
git-svn-id: branches/fixes_3_0@32239 -
