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
On Fri, Jan 18, 2013 at 4:38 PM, jpatal...@gmail.com wrote:
/home/git/gitorious/lib/tasks/../gitorious.rb
module Gitorious
HEAD
VERSION = 2.3.2
===
VERSION = 2.4.1
v2.4.1
end
The and characters makes me wonder if you're installation is
stuck in the middle of a merge or
Hello Ken,
I figured it out, thanks. haha, ok my process below.
That was exactly the issue...the file
/home/git/gitorious/lib/tasks/../gitorious.rb
for some reason didn't merge properly. I deleted the offending lines
HEAD
VERSION = 2.3.2
===
as I was heading towards version
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
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
Thanks...I can try.
Regards,
2013/1/10 Thomas Kjeldahl Nilsson tho...@gitorious.org
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
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
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
