[fpc-pascal] Merging r.16418 to FPC 2.4.4

Marco van de Voort marcov at stack.nl
Fri Mar 4 10:34:22 CET 2011

In our previous episode, cobines said:
> Is it possible to merge rev. 16418 from trunk to FPC 2.4.4?
> http://svn.freepascal.org/cgi-bin/viewvc.cgi?view=rev&revision=16418

I've mostly avoided the subject of shared libs, so sb else will have to judge that.

However it can't be merged as such:

[marcov at atlas fixes24]$ fpcmerge 16418
Merging 16418 from fpc/trunk ( /home/marcov/fpc ) to /home/marcov/fixes24 (
/home/marcov/fixes24 )
--- Merging r16418 into '.':
U    rtl/linux/powerpc64/dllprt0.as
U    rtl/linux/i386/si_dll.inc
C    rtl/linux/x86_64/dllprt0.as
U    compiler/systems/t_linux.pas
Summary of conflicts:
  Text conflicts: 1
[marcov at atlas fixes24]$

Probably 14184 (also by Jonas)

And only after RC1, RC1's sources are being uploaded.

More information about the fpc-pascal mailing list