Hello,
I performed the following steps:
# cd /home/git/gitorious/
# bundle exec rake changelog
# git fetch git://gitorious.org/gitorious/mainline.git
# git fetch --tags
# git merge v2.3.0
# rake assets:clear
# bundle exec rake changelog
# git submodule init
# git submodule update
# rake db:migrate
# touch tmp/restart.txt
# reboot
# cd /home/git/gitorious/
# bundle exec rake changelog
# git fetch git://gitorious.org/gitorious/mainline.git
# git merge v2.3.1
# bundle install
# rake assets:clear
# touch tmp/restart.txt
# reboot
# cd /home/git/gitorious/
# git fetch git://gitorious.org/gitorious/mainline.git
# git merge v2.3.2
# bundle install
# rake assets:clear
# touch tmp/restart.txt
# reboot
# cd /home/git/gitorious/
# bundle exec rake changelog
# git fetch git://gitorious.org/gitorious/mainline.git
# git merge v2.4.2
error: Your local changes to the following files would be overwritten by
merge:
lib/gitorious/authentication/ldap_authentication.rb
Please, commit your changes or stash them before you can merge.
Aborting
but....i have this error... I do not have knowledge to solve ...Could you
please help me to finish the upgrade?
Thanks and regards,
2013/1/11 Federico Don <[email protected]>
> Thanks...I can try.
>
> Regards,
>
>
> 2013/1/10 Thomas Kjeldahl Nilsson <[email protected]>
>
>> Hi Frederico,
>>
>> I just checked and there were some upgrade instructions in the old
>> project wiki that haven't been added to the current, updated documentation
>> at getgitorious.com/documentation - specifically how to move from
>> 2.2/2.3 to 2.4.x and upwards.
>>
>> I've updated the doc, and you should find the instructions you need to
>> manually upgrade from 2.2.1 and up to the newly released 2.4.5 here:
>>
>> http://getgitorious.com/documentation/index.html#sec-5-1-3
>>
>> cheers,
>> Thomas
>>
>>
>> On Wed, Jan 9, 2013 at 10:20 PM, Federico Don
>> <[email protected]>wrote:
>>
>>> Hello all,
>>>
>>> I have a server with gitorious on version 2.2.1.
>>>
>>>
>>> # bundle exec rake changelog
>>> (in /home/git/gitorious)
>>>
>>> Available versions
>>> -> v2.2.1 Makes the sync adapter work again
>>> v2.2.0 Private repositories, site-level wikis, bug fixes
>>> v2.1.1 Resolve a potential vulnerability in GitShell.
>>> v2.1.0 Graphs, HTTP API, blame, improved diffs, LDAP,
>>> themeability
>>> v2.0.2 Patches a XSS vulnerability
>>> v2.0.1 New messaging API, pagination improvements and
>>> themeability
>>> v2.0.0 First versioned version of Gitorious
>>>
>>> Could you tell me please what are the steps necessary for upgrade to
>>> version 2.4.5?
>>>
>>> Thanks and regards,
>>>
>>> --
>>> To post to this group, send email to [email protected]
>>> To unsubscribe from this group, send email to
>>> [email protected]
>>>
>>
>> --
>> To post to this group, send email to [email protected]
>> To unsubscribe from this group, send email to
>> [email protected]
>>
>
>
--
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
