I already sent this message but publication is delayed for some reason - excuses in advance if the post will be repeated
After updating the Support folder, I am getting error messages in some of my routines which use ui.rb. But the errors seem produced by the lines in ui.rb like <<<<<<< .mine and ======= and similar ones. Strange thing, it seems like the errors are not related to my routines: a typical example:
/tmp/temp_textmate.LJOoCE:4:in `require': /Library/Application Support/TextMate/Support/lib/ui.rb:92: syntax error, unexpected tLSHFT, expecting kEND (SyntaxError) <<<<<<< .mine ^
Any help appreciated Piero
This looks to me as though you've made local changes to ui.rb and when you updated svn placed the file in a conficted state. You need to resolve the conflicts or go with the most recent revision in the repository.
Cheers, Simon
I already sent this message but publication is delayed for some reason - excuses in advance if the post will be repeated
After updating the Support folder, I am getting error messages in some of my routines which use ui.rb. But the errors seem produced by the lines in ui.rb like <<<<<<< .mine and ======= and similar ones. Strange thing, it seems like the errors are not related to my routines: a typical example:
/tmp/temp_textmate.LJOoCE:4:in `require': /Library/Application Support/TextMate/Support/lib/ui.rb:92: syntax error, unexpected tLSHFT, expecting kEND (SyntaxError) <<<<<<< .mine ^
Any help appreciated Piero
Ok so I found a workaround: I commented out all lines starting with <<<<< and ===== inside ui.rb and everything works fine.
Is this some sort of svn malfunctioning? how did those lines get into (my copy of) ui.rb? sorry if this is obvious to svn wizards (but in that case, please drop me a word)
Piero
Ok so I found a workaround: I commented out all lines starting with <<<<< and ===== inside ui.rb and everything works fine.
you're like if commenting those lines is enough…
Is this some sort of svn malfunctioning? how did those lines get into (my copy of) ui.rb? sorry if this is obvious to svn wizards (but in that case, please drop me a word)
As Simon said before this is the way svn works (I have more experience with cvs, but the notation seems quite similar).
svn noted that your local copy of ui.rb has been modified (by you usually) and it was not able to merge your changes with those in the remote repository.
The marks (<<<<<...) you see are the way svn uses to mark witch parts of the file you have to manually merge.
If you are sure you didn't make any relevant change to the ui.rb you could delete it from your local copy and then do a svn update again… at that point svn will retrieve a pristine copy of ui.rb from the remote repository.
Edoardo
Piero,
This is not a malfunction of SVN. Those lines appear when you do an update, in case of conflict. This conflict comes from the fact that you did modifications to the file ui.rb and that someone also did modifications to this file, in the SVN server (i.e. committed his modifications), on the same line(s). In this case, SVN do not know how to merge the two batch of modifications and tells you that by putting those lines, to present the different versions (local and in the SVN server) and by putting a "C" in front of the file name when the running the svn update command.
The best way to fix this, when you don't care about your local changes, is to run svn revert ui.rb. If you do care about your modifications, you have to manually merge the different versions of the conflicting lines and run a svn resolved.
Best regards, Mathieu
___________________________________________
Mathieu Godart
Skype: mathieu_godart MSN: mathieu_godart@hotmail.com
ASIC Integration Manager Coolsand Technologies ___________________________________________
Le 3 déc. 08 à 08:04, Edoardo Galvagno a écrit :
you're like if commenting those lines is enough…
oops! typo… I meant "you're lucky…" don't know what happened, maybe it was just too late…
Edoardo
textmate mailing list textmate@lists.macromates.com http://lists.macromates.com/listinfo/textmate
-
Edoardo Galvagno -
Mathieu Godart -
Piero D'Ancona -
Piero D\'Ancona
-
simon＠helvector.org