Archived Forum

What do you get if you call;

$ git branch -a

...from /var/www/emoncms

Paul

Hi Paul

pi@raspberrypi /var/www/emoncms $ git branch -a

* redismetadata
  remotes/origin/HEAD -> origin/master
  remotes/origin/flatfilestore
  remotes/origin/master
  remotes/origin/postgreSQLite
  remotes/origin/redismetadata
  remotes/origin/resetpassword
  remotes/origin/timestore
pi@raspberrypi /var/www/emoncms $

Regards

Ian

Ian, you appear to be using the redismetadata branch (does it exist? - I can't find it in Github).
I'm no expert in 'Git', but you should be able to change your subscription to the 'master' branch by;

$ git checkout master

and then update to the master branch;

$ git pull origin master

The 'master' branch is the current stable version of emoncms.

Paul

Any luck Ian?

Paul

Is it possible to go from version 6 to version 7 of emoncms using a git pull?

I used the above check and I am on the origin/master branch

Many thanks

Yes, but you also have to install the Redis server as well. See the readme @ https://github.com/emoncms/emoncms

Install the Redis server and then do a git pull to update to v7.
(if you have installed the event module - git pull that too, otherwise you'll get an error)

Paul

Hi Paul

Many thanks. Switching to master clears the warning.

Regards

Ian

Paul

OK, Redis install done.  Coming from Windows there were a few nasty pauses where I was wondering if it had fallen over - I was expecting something more like the apt get upgrade which at least gives you some sort of countdown!

Then did a quick trip to the "admin/view" in emonCMS and nothing was reported with the update & upgrade button but all looked to be working

I then needed a "sudo git pull" in "/var/www/emoncms/Modules/event" before anything happened and all reported up-to-date.  Something seems to be wrong though with the page showing the events I have set up already.

I then dropped down into "var/www/emoncms" and tried a git pull which errored with:

pi@emoncms /var/www/emoncms $ git pull
Updating 9123701..ffd5080
error: Your local changes to the following files would be overwritten by merge:
        default.settings.php
Please, commit your changes or stash them before you can merge.
Aborting

and then a sudo git pull which got me the same:

pi@emoncms /var/www/emoncms $ sudo git pull
Updating 9123701..ffd5080
error: Your local changes to the following files would be overwritten by merge:
        default.settings.php
Please, commit your changes or stash them before you can merge.
Aborting

I then tried a git pull / sudo git pull in Modules in case anything was stuck in there and got the same "commit changes error"

Any suggestions of what I need to do next as a bit of Googling gets me firmly in the realm of stashing / comitting / popping in Git?

Much appreciated

And a quick update - I now seem to be having issues with the Feeds.  I am getting the odd one updating and the LED on the RFM12pi is blinking so I assume data is incoming.

Have tried a reboot on the Pi but no change

I will leave it running overnight to see if it stabilizes as it is looking a very similar issue to one I had last weekend when trying to add some more nodes 

http://openenergymonitor.org/emon/node/3540

I think I can rule out packetgen on my install as it does not seem to be installed

I have had a look at emoncms.org as well to see if it was a local install issue only but nothing showing there either.

Gary, the Git error appears to be because you have modified the default.settings.php file locally (did you add your mysql security details and save it as default.settings.php instead of settings.php when you installed emoncms?)

I would first revert the changes that you made;

$ git reset --hard

then;

$ git pull origin master

to update to v7
 

Paul

Things still not going well

I reverted to the SD image I did before trying the upgrade (once bitten and all that)

Made sure I had a copy of the deafult.settings.php file and then did the Redis install.  

I then did the event update  - no issues

Then the git reset and pull you suggested in emoncms (and modules for good measure)

All are reporting as updated to current versions, e.g.

pi@emoncms /var/www/emoncms $ git pull origin master
From https://github.com/emoncms/emoncms
* branch            master     -> FETCH_HEAD
Already up-to-date.

All seemed to go well but ..

I tried admin/view and I now had a users area I had not had before but  the "update" found nothing

Have had a look in Modules but no Packetgen - I thought this came with V7

When I look at a feed I now have PHPTIMESERIES and GRAPHITE options but all my MYSQL/TIMESTORE feeds are showing in active and refusing to update

Now all rather stuck - back to the old SD imgae but will save this one in case anyone can suggest what is going wrong on the update

I would check around the MYSQL entries in your settings.php file and possibly add your MYSQL security details & Timestore key to the (v7) 'default.settings.php' file and save it back as 'settings.php' then you can be sure that its correct.

I have no knowledge of packetgen but if you can get v7 working, it's a solid working base for the other add ons.

Paul