Hi. I just updated my bundles and Support folder from SVN and Blogging bundle stops working... If i write `cat` and press tab to fetch categories i get this error:
/tmp/temp_textmate.BuBXl2:8:in `require': /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/blogging.rb:400: syntax error, unexpected tLSHFT, expecting kEND (SyntaxError) <<<<<<< .mine ^ /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/blogging.rb:410: syntax error, unexpected tEQQ, expecting kEND ======= ^ /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/blogging.rb:420: syntax error, unexpected tRSHFT, expecting kEND
> .r8583
^ from /tmp/temp_textmate.BuBXl2:8
All i know about Ruby - its name. Ruby ;) Maybe someone can help?
you seem to have a conflict in your blogging.rb file. did you modify it by hand?
Am 03.12.2007 um 12:20 schrieb Alexey Blinov:
Hi. I just updated my bundles and Support folder from SVN and Blogging bundle stops working... If i write `cat` and press tab to fetch categories i get this error:
/tmp/temp_textmate.BuBXl2:8:in `require': /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/blogging.rb: 400: syntax error, unexpected tLSHFT, expecting kEND (SyntaxError) <<<<<<< .mine ^ /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/blogging.rb: 410: syntax error, unexpected tEQQ, expecting kEND ======= ^ /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/blogging.rb: 420: syntax error, unexpected tRSHFT, expecting kEND
>> .r8583
^ from /tmp/temp_textmate.BuBXl2:8
All i know about Ruby - its name. Ruby ;) Maybe someone can help?
For new threads USE THIS: textmate@lists.macromates.com (threading gets destroyed and the universe will collapse if you don't) http://lists.macromates.com/mailman/listinfo/textmate
On Dec 3, 2007 2:27 PM, Oktay Acikalin ok@ryotic.de wrote:
you seem to have a conflict in your blogging.rb file. did you modify it by hand?
Nope. Just do `svn up ...` and than try to create new post (was an idea ;) )
Am 03.12.2007 um 12:48 schrieb Alexey Blinov:
On Dec 3, 2007 2:27 PM, Oktay Acikalin ok@ryotic.de wrote:
you seem to have a conflict in your blogging.rb file. did you modify it by hand?
Nope. Just do `svn up ...` and than try to create new post (was an idea ;) )
please take your terminal, go to the /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/ Support/lib/ folder and do "svn stat". what does it say?
$ cd /Library/Application\ Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/ $ svn stat ? blogging.rb.mine ? blogging.rb.r8583 ? blogging.rb.r8548 C blogging.rb
is it couse the prob?
On Dec 3, 2007 2:57 PM, Oktay Acikalin ok@ryotic.de wrote:
Am 03.12.2007 um 12:48 schrieb Alexey Blinov:
On Dec 3, 2007 2:27 PM, Oktay Acikalin ok@ryotic.de wrote:
you seem to have a conflict in your blogging.rb file. did you modify it by hand?
Nope. Just do `svn up ...` and than try to create new post (was an idea ;) )
please take your terminal, go to the /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/ Support/lib/ folder and do "svn stat". what does it say?
For new threads USE THIS: textmate@lists.macromates.com (threading gets destroyed and the universe will collapse if you don't) http://lists.macromates.com/mailman/listinfo/textmate
omg... yeah i think i know... it was... i edit blogging blogging.rb to fetch post slug back to post... OK. sorry ;) But i didn't saw svn tell me about conflict...
On Dec 3, 2007 3:28 PM, Alexey Blinov nilcolor@gmail.com wrote:
$ cd /Library/Application\ Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/ $ svn stat ? blogging.rb.mine ? blogging.rb.r8583 ? blogging.rb.r8548 C blogging.rb
is it couse the prob?
On Dec 3, 2007 2:57 PM, Oktay Acikalin ok@ryotic.de wrote:
Am 03.12.2007 um 12:48 schrieb Alexey Blinov:
On Dec 3, 2007 2:27 PM, Oktay Acikalin ok@ryotic.de wrote:
you seem to have a conflict in your blogging.rb file. did you modify it by hand?
Nope. Just do `svn up ...` and than try to create new post (was an idea ;) )
please take your terminal, go to the /Library/Application Support/TextMate/Bundles/Blogging.tmbundle/ Support/lib/ folder and do "svn stat". what does it say?
For new threads USE THIS: textmate@lists.macromates.com (threading gets destroyed and the universe will collapse if you don't) http://lists.macromates.com/mailman/listinfo/textmate
Am 03.12.2007 um 13:30 schrieb Alexey Blinov:
omg... yeah i think i know... it was... i edit blogging blogging.rb to fetch post slug back to post... OK. sorry ;) But i didn't saw svn tell me about conflict...
:) i often see that at our office too :). just try to always do an svn stat after an update to be sure..
Thanks for help ;)
On Dec 3, 2007 3:55 PM, Oktay Acikalin ok@ryotic.de wrote:
Am 03.12.2007 um 13:30 schrieb Alexey Blinov:
omg... yeah i think i know... it was... i edit blogging blogging.rb to fetch post slug back to post... OK. sorry ;) But i didn't saw svn tell me about conflict...
:) i often see that at our office too :). just try to always do an svn stat after an update to be sure..
For new threads USE THIS: textmate@lists.macromates.com (threading gets destroyed and the universe will collapse if you don't) http://lists.macromates.com/mailman/listinfo/textmate
On 3 Dec 2007, at 13:28, Alexey Blinov wrote:
$ cd /Library/Application\ Support/TextMate/Bundles/Blogging.tmbundle/Support/lib/ $ svn stat ? blogging.rb.mine ? blogging.rb.r8583 ? blogging.rb.r8548 C blogging.rb
is it couse the prob?
Yes, so easiest is:
cp blogging.rb.r8583 blogging.rb svn resolved blogging.rb
As the current version does show returned slug, so probably no need to preserve yours.
Alternatively edit blogging.rb and manually resolve the conflict(s) then run svn resolved on the file.
-
Alexey Blinov -
Allan Odgaard -
Oktay Acikalin