Am 24.08.2015 um 22:37 schrieb Jonas Maebe:
On 24/08/15 21:45, Steve Hildebrandt wrote:
What I wanted to know is, in which way can I integrate the current svn
trunk in the RTTI branch, preventing headache for anyone using it.
1) check out the rtti svn branch
2) svn merge ^/trunk
-> you'll get conflicts for ncgrtti.pas, postpone conflict resolution
3) copy your rebased ncgrtti.pas over the one with conflicts
4) svn resolved compiler/ncgrtti.pas
5) svn commit
Jonas
_______________________________________________
fpc-devel maillist - fpc-devel@lists.freepascal.org
http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
Thanks and done.
Steve
_______________________________________________
fpc-devel maillist - fpc-devel@lists.freepascal.org
http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
