I think the problem is that SVN does not update 'Makefile' and 'Makefile.fpc'. You need to delete them and you can regenerate them with 'svn update'. Try it and tell us.
Mailing lists / fpc-pascal / 2010-12
Compile 2.5.1 Ubuntu&In-Reply-To=
2 messages · 2 people ·
- Amat Coder 1
- José Mejuto 1
Reply by email Subscribe to this list Your subscription
Read-only archive. Use j and k to move between messages.
Hello FPC-Pascal,
Tuesday, December 7, 2010, 3:55:40 PM, you wrote:
AC> I think the problem is that SVN does not update 'Makefile' and 'Makefile.fpc'. AC> You need to delete them and you can regenerate them with 'svn update'. AC> Try it and tell us.
Yes, it works, thank you. I never happends to me in Windows and this is the first time in Ubuntu :-?
The problem should be that some Makefiles get changed when compiled or in another case, but the difference does not raise a "unable to merge" from SVN.
Again, thank you.
Best regards,
José