Paul,
I hope this is what you need:
emonpiupdate.log.txt (12.1 KB)
Regards
Frits
The other info would be useful too, but a quick look through the log suggests you have local changes to your dashboard module and it isn’t clear (to me) if the update has been successful or not.
git pull /var/www/emoncms/Modules/dashboard
On branch stable
Your branch and 'origin/stable' have diverged,
and have 1 and 100 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
Your branch and 'origin/stable' have diverged,
and have 1 and 100 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
what version does the admin page say the dashboard module is?
cd /var/www/emoncms/Modules/dashboard
git status
Then
git diff HEAD <filename that is different>
borpin, Thanks for your help, but I need some more help.
I entered: cd /var/www/emoncms/Modules/dashboard
then: git diff HEAD diff.txt
and received this feedback:
fatal: ambiguous argument 'diff.txt': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
So I tried:
git diff HEAD 9.9.5 -- diff995.txt
and
git diff HEAD 9 -- diff9.txt
but received:
bad revision '9.9.5'
and bad revision '9' errors
I am not sure what the initial version was I had before update, but it was shipped with empnPi in late 2016.
Could you please let me know what is wrong with my command?
Regards
Frits
Hi @Frits, firstly, it is easier to read if you use a bit of formatting in your post. Search for markdown for some help. For code or terminal output, put 3 backticks (this is the key in the top left of the keyboard) on a line on their own before the code/output, and then 3 on the line following the code. (edit your previous post and you will see what I have done).
Step by step 
first
cd /var/www/emoncms/Modules/dashboard
this take you into the dashboard folder.
then
git status
Post the output of that please (remember the formatting ).
On branch stable
Your branch and 'origin/stable' have diverged,
and have 1 and 100 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
Hope this is what you meant!
Then git pull:
error: cannot open .git/FETCH_HEAD: Read-only file system
Is that the whole output?
yes you get the error as the filesystem needs to be put into read/write mode explicitly.
Try this command
sudo git diff HEAD
That would require a rpi-rw command first, then sudo git diff HEAD, wouldn’t it?
As it is not actually writing to disk I doubt it. Didn’t want to enable RW until it was really needed!
when I issue the rpi -rw command:
-bash: rpi: command not found
no spaces. rpi-rw all in one string.
1 Like
No space just one command rpi-rw but not neede for the diff command. Need to be a little careful here.
aha! that works
So i issues:
sudo git diff HEAD
But no response.
Sorry for all the questions
Isn’t there a way I can like: Sudo apt get install and reinstall all?
No it is not an apt package.
You are in the /var/www/emoncms/Modules/dashboard folder? To check you can used to command pwd
Sorry, there must be no difference which makes the earlier message odd.
So,
rpi-rw
cd /var/www/emoncms/Modules/dashboard
sudo git reset --hard
then
sudo git pull
I am making progress, but really slow:
I followed the instructions and was asked by RPi to git config my email address and name which I did.
So output from
sudo git pull
pi@emonpi(rw):dashboard$ sudo git pull
Auto-merging widget/sun/sun_render.js
CONFLICT (content): Merge conflict in widget/sun/sun_render.js
Auto-merging widget/signal/signal_render.js
CONFLICT (content): Merge conflict in widget/signal/signal_render.js
Auto-merging widget/humidex/humidex_render.js
Auto-merging widget/heatindex/heatindex_render.js
Auto-merging widget/frostpoint/frostpoint_render.js
Auto-merging widget/feedvalue/feedvalue_render.js
CONFLICT (content): Merge conflict in widget/feedvalue/feedvalue_render.js
Auto-merging widget/dial/dial_render.js
CONFLICT (content): Merge conflict in widget/dial/dial_render.js
Auto-merging widget/dewpoint/dewpoint_render.js
Auto-merging widget/battery/battery_render.js
CONFLICT (content): Merge conflict in widget/battery/battery_render.js
Auto-merging widget/bar/bar_render.js
CONFLICT (content): Merge conflict in widget/bar/bar_render.js
Auto-merging module.json
CONFLICT (add/add): Merge conflict in module.json
Auto-merging dashboard_langjs.php
CONFLICT (content): Merge conflict in dashboard_langjs.php
Auto-merging Views/dashboard_edit_view.php
Automatic merge failed; fix conflicts and then commit the result.
Thanks for helping me, I do appreciate itIt seems to me the repository is really out of sorts.
Try this to get things back to where they should be.
git fetch origin
git reset --hard origin/stable
git clean -f -d
git status