r1463 linux compilation fail

[tonibm19]

The compilation fails: http://ci.berboe.co.uk/job/MCServer%20Linux-x86-64/394/

[NiLSPACE]

oh god i didn't do something wrong right? ;O

[tonibm19]

oh god i didn't do something wrong right? ;O

Maybe is an error of the bearbin's server or something like. I will try to compile it on my server

[NiLSPACE]

Maybe is an error of the bearbin's server or something like. I will try to compile it on my server

i'm also trying it now realy weird if it doesn't becouse it worked for me.

[inhavk]

oh god i didn't do something wrong right? ;O

Maybe is an error of the bearbin's server or something like.

No. I too received an error.

[NiLSPACE]

yea i got it now to. i'l see what i can do to fix it.

---

ah ok so this is what happened: TortoiseSVN first didn't let me commit the changes and then it created a new file with the old bindings.cpp and the new(my) bindings.cpp and then compared them. and you can gues it: it was called bindings.cpp

---

Hopefully fixed in r1464

---

http://ci.berboe.co.uk/job/MCServer%20Linux-x86-64/395/

[xoft]

Yup, that's called a svn conflict and it happens when two people touch the same file in the same place at the same moment (or don't update the file they're editting).
With Bindings.cpp, it's just easier to delete the file altogether and let the AllToLua generate a new file.

[tonibm19]

Thanks for fix