On 02.12.2012 15:05, Mark Morgan Lloyd wrote:
Mattias Gaertner wrote:
On Sun, 02 Dec 2012 11:46:54 +0000
Mark Morgan Lloyd <[email protected]> wrote:
I've just had a slight problem compiling Lazarus where FPC was
reporting this:
main.pp(5001,1) Fatal: Syntax error, "BEGIN" expected but "shl" found
The reason was that I'd not spotted that Subversion had inserted a
like like
<<<<< Mine:
preceding a function. Is this something that the compiler could
detect and warn about?
It seems it just did?
What error message do you expect?
Something that recognises that a message like <<<<<<< .mine originates
from the project's chosen VCS, and that <<<<<<< is distinct from shl.
This is the same as the discussion about whether FPC could support "#"
at the first line for shebanging for instantfpc. In short: in will not
happen. It's your own responsibility to keep versioned files conflict
free and yes, I had this problem myself already as well.
Regards,
Sven
_______________________________________________
fpc-devel maillist - [email protected]
http://lists.freepascal.org/mailman/listinfo/fpc-devel
