Upgrade 3.10 to 3.11 why are there changes to commit?

Upgrade 3.10 to 3.11 why are there changes to commit?

by Michael Knichel -
Number of replies: 5

I am trying to upgrade to 3.11 from 3.10.  I have a script that I use and it returned the following:

error: Your local changes to the following files would be overwritten by merge:
       .eslintignore
       .stylelintignore
       .travis.yml
       Gruntfile.js
       admin/tool/oauth2/issuers.php
       admin/tool/oauth2/lang/en/tool_oauth2.php
       config-dist.php
Please commit your changes or stash them before you merge.
Aborting

So .eslintignore and the other files seem to have changes that need to be committed?  Not sure why/how as I never edited these files.

Can I simply do a git add * then git commit and then restart the upgrade?

MK

Average of ratings: -
In reply to Michael Knichel

Re: Upgrade 3.10 to 3.11 why are there changes to commit?

by Ken Task -
Picture of Particularly helpful Moodlers

?? your script looks like?

best to do a git pull and update prior to upgrading.

in a 3.10 git pull

Updating 2d7386420cb..10daae7ab70
Fast-forward
 .eslintignore                                      |  95 -------------
 .gitignore                                         |   2 +
 .stylelintignore                                   |  96 -------------
 .travis.yml                                        |   2 +-
 Gruntfile.js                                       |   5 +-
 admin/category.php                                 |   5 +
 admin/tool/oauth2/issuers.php                      |   6 +
 admin/tool/oauth2/lang/en/tool_oauth2.php          |   1 +
 config-dist.php

in a git pull of 311

Updating 70f99ddd9a6..0e64d1d00d0
Fast-forward
 .eslintignore              | 96 ----------------------------------------------
 .gitignore                 |  2 +
 .grunt/tasks/javascript.js |  5 ++-
 .grunt/tasks/style.js      |  3 ++
 .grunt/tasks/stylelint.js  |  3 +-
 .stylelintignore           | 96 ----------------------------------------------
 .travis.yml                |  2 +-
 config-dist.php            |  2 +-
 course/renderer.php        |  6 +++
 install/stringnames.txt    |  1 +
 repository/filepicker.js   |  6 +++
 version.php                |  4 +-
 12 files changed, 28 insertions(+), 198 deletions(-)
 delete mode 100644 .eslintignore
 delete mode 100644 .stylelintignore

'sos' ken

Average of ratings: -
In reply to Ken Task

Re: Upgrade 3.10 to 3.11 why are there changes to commit?

by Michael Knichel -
Thanks for the reply. Here is what a git pull does...
git pull
Updating 237f4ccada7..10daae7ab70
error: Your local changes to the following files would be overwritten by merge:
.eslintignore
.stylelintignore
.travis.yml
Gruntfile.js
admin/tool/oauth2/issuers.php
admin/tool/oauth2/lang/en/tool_oauth2.php
config-dist.php
Please commit your changes or stash them before you merge.
Aborting

My question still remains, why are there changes in the files on my system? I didn't edit them...

MK
Average of ratings: -
In reply to Michael Knichel

Re: Upgrade 3.10 to 3.11 why are there changes to commit?

by Ken Task -
Picture of Particularly helpful Moodlers

Been my experience that files do not change themselves. 

My response was to show that git does remove files and updates some on a git pull in test directories of a 3.10 and a 3.11.  Please look again as those did show some of the files your system is reporting as changed in your 3.10 and suggesting a merge should have already been there - like config-dist.php

./moodle310/version.php:$release  = '3.10.4+ (Build: 20210617)';// Human-friendly version name
./moodle311/version.php:$release  = '3.11+ (Build: 20210617)';// Human-friendly version name

Asked if we could see your script?

The original installation of your 3.10.x was done with what git commands?   Did you use a -b?

So what version do you have at present?

fgrep '$release' version.php

SoS, Ken

Average of ratings: -
In reply to Michael Knichel

Re: Upgrade 3.10 to 3.11 why are there changes to commit?

by Ken Task -
Picture of Particularly helpful Moodlers

in a 3.10 git pull (mine)

Updating 2d7386420cb..10daae7ab70

git log --oneline |grep 2d7386420cb
git log --oneline |grep 2d7386420cb

2d7386420cb weekly release 3.10.4+

Yours
git pull
Updating 237f4ccada7..10daae7ab70

git log --oneline |grep 237f4ccada7
237f4ccada7 Moodle release 3.10.4
 see the difference .. its suttle

sos, ken

Average of ratings: -
In reply to Ken Task

Re: Upgrade 3.10 to 3.11 why are there changes to commit?

by Michael Knichel -
Sorry for the delay, I was home and this is all on my work computer.
So I have 3.10.4 not 3.10.4+, why does that matter when I try to upgrade?
When I opened the directory with my development editor (git enabled) it shows that those files have uncommitted changes. I swear I have never edited ANY moodle files (other than config.php). Maybe a plugin I added did that?
Being fairly new to GIT, what do I do to correct this?

When I upgraded from 3.9 to 3.10 I did the same thing on both my dev and prod servers. My prod server is 3.10.4+ for some reason...

Thanks again for all of your help.

MK
Average of ratings: -