Build Modules

BlitzMax Forums/MaxGUI Module/Build Modules

tonyg

(Posted 2008) [#1]

Following cause an error from cocoamaxgui.bmx when building modules

<<<<<<< .mine
ModuleInfo "History: Swapped tabber icon drawing code (so that it works)."
=======
ModuleInfo "History: Improved handling of text-areas in NSState to avoid crash."
ModuleInfo "History: Swapped tabber icon drawing code (so that it works)."
>>>>>>> .r33

Commenting them out works OK.

Dreamora

(Posted 2008) [#2]

That is no error.
What you have there is a conflict message from SVN.
the part before ====== was what your modified version had there, the part after is the one that is from the Revision 33 version of maxgui

SebHoll

(Posted 2008) [#3]

Please see this post regarding SVN conflicts...

tonyg

(Posted 2008) [#4]

This problem occurs if you have edited the files which your SVN client is trying to update

OK, I can see this isn't a bug but I haven't done the above. So, I guess, before 'updating' MaxGUI I need to delete it first. Is that right?

SebHoll

(Posted 2008) [#5]

OK, I can see this isn't a bug but I haven't done the above. So, I guess, before 'updating' MaxGUI I need to delete it first. Is that right?

If you haven't edited the files (even by accident), then your SVN client may have got confused and marked the files as having changed when they haven't. In which case, if you delete and checkout the files concerned, it shouldn't happen again.

What SVN client are you using? Command-line? TortoiseSVN?

tonyg

(Posted 2008) [#6]

TortoiseSVN.
I'll delete the contents of the MaxGUI.mod directory and try again.