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 -
U rtl/haiku/Makefile.fpc
U compiler/systems/t_haiku.pas
--- Recording mergeinfo for merge of r31362 into '.':
U .
--- Merging r31364 into '.':
A rtl/haiku/i386/dllcprt0.as
--- Recording mergeinfo for merge of r31364 into '.':
G .
# revisions: 31362,31364
git-svn-id: branches/fixes_3_0@32230 -
C rtl/haiku/Makefile
--- Recording mergeinfo for merge of r31331 into '.':
U .
Summary of conflicts:
Text conflicts: 1
Summary of conflicts:
Text conflicts: 1
# revisions: 31331
git-svn-id: branches/fixes_3_0@32228 -
U rtl/haiku/ptypes.inc
U rtl/unix/cwstring.pp
--- Recording mergeinfo for merge of r31427 into '.':
U .
# revisions: 31427
git-svn-id: branches/fixes_3_0@32217 -
* arm-android: Use kuser_cmpxchg for Interlocked* functions when RTL is compiled for the ARMv5t CPU.
........
* arm-android: Compile for ARMv5T by default to be compatible with all versions of Android.
........
git-svn-id: branches/fixes_3_0@32080 -
fix InterlockedCompareExchange on ARM-Linux: kuser_cmpxchg destroys r3, which needs to be restored, if we have to loop
........
git-svn-id: branches/fixes_3_0@32079 -
