FWIW, I also added some of the "untracked files" to our updated .gitignore file.
Christian Thomas Kjeldahl Nilsson writes: > Andrew, > > - We're releasing an upgraded version of the installer this week, > including the latest Gitorious version and improvements in how/what it > installs. We'll announce it on the gitorious blog once it's up and > available. > > - Regarding rake tasks etc, this has been more fiddly than necessary and > we've taken steps to make gitorious less "Rails-y" for admins installing > it. One of the things we've done is to create new scripts under bin/ in > the gitorious src code, which hides rails environments, makes sure you > are running the commands with the correct user/permissions etc. > > sorry you had to fight so much with your installation, hope jumping > straight to 2.4.7 makes life easier. > > cheers, > Thomas > > > On 02/10/2013 04:20 PM, Andrew Kerr wrote: >> I just install gitorious on a clean CentOS 6 machine using the >> installation script located here: http://getgitorious.com/installer. >> I assume this is the supported method? >> >> Surprisingly, this installed a pretty old version - v2.3.2, and not >> the most recent. >> >> I've spent many hours trying to upgrade to v2.4.7, following the >> directions here >> https://gitorious.org/gitorious/pages/Upgrading#Upgrading+from+2.3.2+to+2.4.1++ >> >> For starters, the merge fails because I have locally updated files. >> Surprising, since I just ran the installer and haven't touched anything: >> [root@XXX /var/www/gitorious/app]# git status >> # On branch my-version >> # Changed but not updated: >> # (use "git add <file>..." to update what will be committed) >> # (use "git checkout -- <file>..." to discard changes in working >> directory) >> # >> # modified: db/schema.rb >> # modified: db/seeds.rb >> # >> # Untracked files: >> # (use "git add <file>..." to include in what will be committed) >> # >> # .bundle/ >> # log/git-proxy.log1 >> # log/gitorious_auth.log-20130210 >> # log/message_processing.log-20130210 >> # log/pre_receive_guard.log-20130210 >> # log/production.log-20130210 >> # log/sphinx.log-20130210 >> # public/javascripts/capillary.js >> # public/stylesheets/all.css >> # public/stylesheets/gts-external.css >> # tmp/bundles_installed >> # tmp/database_populated >> # tmp/ownership >> # vendor/bundle/ >> >> So I "git stash" the two files in the db directory. Then I can do the >> git merge, which seems to work but still reports "Automatic merge >> failed; fix conflicts and then commit the result." >> >> After this I can run the rest of the tasks, although only if I >> pre-pend "env RAILS_ENV=production bundle exec". From everything I've >> read this is the proper way to run the rake tasks, so I can't see why >> the upgrade docs would ignore them - or how/if they'd even work? >> >> So the next issue is that, while the upgrade completely fails to >> mention this, per the changelog "The Ultrasphinx plugin has been >> replaced by ThinkingSphinx". So the init script that the installer >> created, /etc/init.d/git-ultrasphinx, obviously doesn't work. The >> problem is that nothing anywhere tells you how to appropriately change >> this. Also, doc/templates/centos/ still contains the old ultrasphinx >> script. I don't know what to change here to make it work. >> >> I assume I'm doing the right thing by using the "supported" installer, >> but I could sure use some help getting on the latest 2.4.x release. >> Has anyone else done this on a CentOS 6 system? If so, I could use use >> some help! >> >> Thanks! >> -- >> -- >> To post to this group, send email to [email protected] >> To unsubscribe from this group, send email to >> [email protected] >> >> --- >> You received this message because you are subscribed to the Google >> Groups "Gitorious" group. >> To unsubscribe from this group and stop receiving emails from it, send >> an email to [email protected]. >> For more options, visit https://groups.google.com/groups/opt_out. >> >> > > > -- > Best regards, > Thomas Kjeldahl Nilsson, > Partner & Programmer, > Gitorious AS > http://gitorious.com > > -- -- -- To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] --- You received this message because you are subscribed to the Google Groups "Gitorious" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
