[Lazarus] SVN update conflicts

[Mattias Gaertner]

On Tue, 20 Mar 2012 11:37:49 +0100
Hans-Peter Diettrich <DrDiettrich1 at aol.com> wrote:

> Vincent Snijders schrieb:
> > Op 20 maart 2012 03:17 heeft Hans-Peter Diettrich
> > <DrDiettrich1 at aol.com> het volgende geschreven:
> >> Updating to rev. 36173 results in a number of conflicts in various Makefile,
> >> Makefile.compiled and Makefile.fpc, in components/ and packager/
> >> subdirectories.
> >>
> >> What's wrong?
> >>
> >> How to fix that mess? (using TortoiseSVN)
> > 
> > Revert.
> > 
> > Update.
> 
> Thanks, that helped. Will I have to do the same in the future, before 
> every update, or was it a glitch?

Something changed your makefiles. I don't know what.

 
> What's the reason for versioning e.g. Makefile.compiled?

The Makefile.compiled is used by "make" to create the
pkgname.compiled files. This way the IDE knows how a package was
compiled and knows if it needs to recompile the package.

Mattias