Hello, I am also experiencing the exact same problem as Federico Don. The upgrade from Gitorious 2.2.1 was working perfectly up until 2.4.1. When I tried to upgrade from 2.3.2 to 2.4.1 i get the same errors, however when i run git diff I don't see any conflicted files:
[git@tbwa-git02 gitorious]$ git diff [git@tbwa-git02 gitorious]$ This is the file in question, what could possibly be wrong with it? [git@tbwa-git02 gitorious]$ cat /home/git/gitorious/lib/tasks/../gitorious.rb # encoding: utf-8 #-- # Copyright (C) 2011 Gitorious AS # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. #++ module Gitorious <<<<<<< HEAD VERSION = "2.3.2" ======= VERSION = "2.4.1" >>>>>>> v2.4.1 end *******************ERROR MESSAGE******************* [git@tbwa-git02 gitorious]$ bundle exec rake assets:clear (in /home/git/gitorious) Please install RDoc 2.4.2+ to generate documentation. rake aborted! /home/git/gitorious/lib/tasks/../gitorious.rb:19: syntax error, unexpected tLSHFT, expecting kEND <<<<<<< HEAD ^ /home/git/gitorious/lib/tasks/../gitorious.rb:21: syntax error, unexpected tEQQ, expecting kEND ======= ^ /home/git/gitorious/lib/tasks/../gitorious.rb:23: syntax error, unexpected tRSHFT, expecting kEND >>>>>>> v2.4.1 ^ /home/git/gitorious/lib/tasks/../gitorious.rb:23: no .<digit> floating literal anymore; put 0 before dot >>>>>>> v2.4.1 ^ /home/git/gitorious/Rakefile:10:in `require' (See full trace by running task with --trace) On Thursday, January 17, 2013 10:00:38 AM UTC-8, Thomas Kjeldahl Nilsson wrote: > > Looks like you have a conflict. I suggest you repeat the git checkout > operation on any files with conflicts, then try again. > > cheers, > Thomas > > On Thursday, January 17, 2013 at 4:37 PM, Federico Don wrote: > > Thanks for your answer but now i have other issue.... > > when execute: > > # rake assets:clear > (in /home/git/gitorious) > Please install RDoc 2.4.2+ to generate documentation. > rake aborted! > /home/git/gitorious/lib/tasks/../gitorious.rb:19: syntax error, unexpected > tLSHFT, expecting kEND > <<<<<<< HEAD > ^ > /home/git/gitorious/lib/tasks/../gitorious.rb:21: syntax error, unexpected > tEQQ, expecting kEND > ======= > ^ > /home/git/gitorious/lib/tasks/../gitorious.rb:23: syntax error, unexpected > tRSHFT, expecting kEND > >>>>>>> v2.4.1 > ^ > /home/git/gitorious/lib/tasks/../gitorious.rb:23: no .<digit> floating > literal anymore; put 0 before dot > >>>>>>> v2.4.1 > ^ > /home/git/gitorious/Rakefile:10:in `require' > (See full trace by running task with --trace) > > I have Rdoc 3.12 > > # gem list -d rdoc > > *** LOCAL GEMS *** > > rdoc (3.12) > Authors: Eric Hodel, Dave Thomas, Phil Hagelberg, Tony Strauss > Rubyforge: http://rubyforge.org/projects/rdoc > Homepage: http://docs.seattlerb.org/rdoc > Installed at: /opt/ruby-enterprise-1.8.7-2011.03/lib/ruby/gems/1.8 > > RDoc produces HTML and command-line documentation for Ruby projects > > Could you please help me? > > Thanks and regards, > > > > > 2013/1/17 Thomas Kjeldahl Nilsson <[email protected] <javascript:>> > > Hi Frederico, > > seems you have touched that ldap lib file, but unless you have something > you need in there you can simply reset in like this: > > git checkout lib/gitorious/authentication/ldap_authentication.rb > > and proceed with the merge. :) > > cheers, > Thomas > > On Thursday, January 17, 2013 at 12:16 AM, Federico Don wrote: > > lib/gitorious/authentication/ldap_authentication.rb > > > -- > To post to this group, send email to [email protected]<javascript:> > To unsubscribe from this group, send email to > [email protected] <javascript:> > > > -- > To post to this group, send email to [email protected]<javascript:> > To unsubscribe from this group, send email to > [email protected] <javascript:> > > > -- To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected]
