Thanks Adam,
I read your original advice about git stash, but wanted to see if I could make things work without having to use it. My understanding of the stash command is that it keeps things "stashed" until you might need them again. I had hoped that it would not be necessary to stash things away if you didn't do anything to them anyway. That's why I regenerated the system. Once I got as similar result as before, I ran the git stash command and got the following:
git stash
Saved working directory and index state WIP on MOODLE_25_STABLE: b222cfb Moodle release 2.5
Checking out files: 100% (11713/11713), done.
HEAD is now at b222cfb Moodle release 2.5
Then I ran the git pull and got the following:
git pull
Updating b222cfb..f65261d
Fast-forward
admin/tests/behat/upload_users.feature | 2 +-
admin/tool/customlang/db/upgrade.php | 4 +
auth/cas/db/upgrade.php | 43 ++++
auth/cas/version.php | 2 +-
auth/ldap/db/upgrade.php | 43 ++++
auth/ldap/version.php | 2 +-
auth/manual/db/upgrade.php | 4 +
auth/mnet/db/upgrade.php | 4 +
backup/backup.class.php | 2 +-
blocks/community/db/upgrade.php | 4 +
blocks/completionstatus/db/upgrade.php | 4 +
blocks/course_summary/db/upgrade.php | 4 +
blocks/html/db/upgrade.php | 4 +
blocks/navigation/db/upgrade.php | 4 +
blocks/section_links/db/upgrade.php | 8 +-
blocks/selfcompletion/db/upgrade.php | 4 +
blocks/settings/db/upgrade.php | 4 +
cohort/tests/behat/add_cohort.feature | 2 +-
cohort/tests/behat/behat_cohort.php | 2 +-
cohort/tests/behat/upload_cohort_users.feature | 2 +-
course/request_form.php | 4 +-
course/resources.php | 18 +-
course/tests/behat/behat_course.php | 4 +-
course/tests/behat/course_controls.feature | 11 +-
course/tests/behat/move_activities.feature | 19 --
enrol/authorize/db/upgrade.php | 4 +
enrol/database/db/upgrade.php | 4 +
enrol/flatfile/db/upgrade.php | 4 +
enrol/guest/db/upgrade.php | 4 +
enrol/imsenterprise/db/upgrade.php | 4 +
enrol/manual/db/upgrade.php | 4 +
enrol/mnet/db/upgrade.php | 4 +
enrol/paypal/db/upgrade.php | 4 +
enrol/self/db/upgrade.php | 4 +
files/coursefilesedit_form.php | 1 +
filter/mediaplugin/db/upgrade.php | 4 +
filter/tex/db/upgrade.php | 4 +
grade/grading/form/rubric/db/upgrade.php | 4 +
install/lang/bn/error.php | 48 ++++
install/lang/bn/install.php | 67 ++++++
install/lang/ca_valencia/langconfig.php | 2 +-
install/lang/cy/admin.php | 10 +
install/lang/cy/error.php | 1 +
install/lang/cy/install.php | 24 ++
install/lang/dz/admin.php | 42 ++++
install/lang/dz/error.php | 48 ++++
install/lang/dz/install.php | 75 +++++++
install/lang/dz/langconfig.php | 34 +++
install/lang/dz/moodle.php | 36 +++
install/lang/en_kids/langconfig.php | 1 +
install/lang/eu/install.php | 4 +-
install/lang/fa/error.php | 33 +++
install/lang/fj/admin.php | 35 +++
install/lang/fj/moodle.php | 36 +++
install/lang/fr/error.php | 4 +
install/lang/ga/moodle.php | 35 +++
install/lang/gd/moodle.php | 33 +++
install/lang/ha/langconfig.php | 33 +++
install/lang/is/admin.php | 1 +
install/lang/it/error.php | 1 +
install/lang/it/install.php | 6 +-
install/lang/ja_kids/langconfig.php | 1 +
install/lang/ka/admin.php | 1 +
install/lang/ka/moodle.php | 3 +
install/lang/kl/langconfig.php | 1 +
install/lang/ko/install.php | 1 +
install/lang/lt_uni/moodle.php | 1 +
install/lang/my/langconfig.php | 33 +++
install/lang/so/admin.php | 1 +
install/lang/sr_cr/error.php | 2 +
install/lang/sr_lt/error.php | 2 +
install/lang/te/error.php | 38 ++++
install/lang/te/install.php | 41 ++++
install/lang/te/langconfig.php | 1 +
install/lang/tg/admin.php | 44 ++++
install/lang/tt/langconfig.php | 1 +
install/lang/uk/admin.php | 34 +++
install/lang/vi/error.php | 39 ++++
install/lang/wo/langconfig.php | 2 +
install/lang/zh_tw/langconfig.php | 1 +
lang/en/repository.php | 3 +-
lib/db/upgrade.php | 25 +++
lib/editor/tinymce/db/upgrade.php | 4 +
.../tinymce/plugins/spellchecker/db/upgrade.php | 4 +
lib/filelib.php | 120 +++++-----
lib/filestorage/file_storage.php | 65 ++++++
lib/filestorage/stored_file.php | 34 +++
lib/licenselib.php | 4 +-
lib/tests/behat/behat_general.php | 4 +-
lib/tests/behat/behat_hooks.php | 21 +-
lib/tests/behat/behat_navigation.php | 40 +++-
lib/tests/behat/behat_permissions.php | 2 +-
lib/yuilib/3.9.1/build/io-xdr/io.swf | Bin 2247 -> 2258 bytes
.../build/uploader-deprecated/assets/uploader.swf | Bin 6611 -> 6681 bytes
.../3.9.1/build/uploader/assets/flashuploader.swf | Bin 5080 -> 5150 bytes
message/output/email/db/upgrade.php | 4 +
message/output/jabber/db/upgrade.php | 4 +
message/output/popup/db/upgrade.php | 4 +
mod/assign/db/upgrade.php | 4 +
mod/assign/feedback/comments/db/upgrade.php | 4 +
mod/assign/feedback/file/db/upgrade.php | 4 +
mod/assign/submission/comments/db/upgrade.php | 4 +
mod/assign/submission/file/db/upgrade.php | 4 +
mod/assign/submission/onlinetext/db/upgrade.php | 4 +
mod/assignment/db/upgrade.php | 4 +
mod/book/db/upgrade.php | 4 +
mod/chat/db/upgrade.php | 4 +
mod/choice/db/upgrade.php | 4 +
mod/data/db/upgrade.php | 4 +
mod/feedback/db/upgrade.php | 4 +
mod/folder/db/upgrade.php | 4 +
mod/folder/edit.php | 5 +-
mod/forum/db/upgrade.php | 7 +-
mod/forum/lib.php | 2 +-
mod/glossary/db/upgrade.php | 4 +
mod/imscp/db/upgrade.php | 4 +
mod/label/db/upgrade.php | 4 +
mod/lesson/db/upgrade.php | 4 +
mod/lti/db/upgrade.php | 4 +
mod/page/db/upgrade.php | 4 +
mod/quiz/db/upgrade.php | 4 +
mod/quiz/report/overview/db/upgrade.php | 4 +
mod/quiz/report/overview/report.php | 13 +-
mod/quiz/report/statistics/db/upgrade.php | 4 +
mod/resource/db/upgrade.php | 4 +
mod/scorm/datamodels/scorm_12.js.php | 2 +-
mod/scorm/db/upgrade.php | 4 +
mod/survey/db/upgrade.php | 4 +
mod/url/db/upgrade.php | 4 +
mod/wiki/db/upgrade.php | 4 +
mod/workshop/db/upgrade.php | 4 +
mod/workshop/form/accumulative/db/upgrade.php | 4 +
mod/workshop/form/comments/db/upgrade.php | 4 +
mod/workshop/form/numerrors/db/upgrade.php | 4 +
mod/workshop/form/rubric/db/upgrade.php | 4 +
portfolio/googledocs/db/upgrade.php | 4 +
portfolio/picasa/db/upgrade.php | 4 +
question/behaviour/manualgraded/db/upgrade.php | 4 +
question/engine/bank.php | 5 +-
question/type/calculated/db/upgrade.php | 4 +
question/type/essay/db/upgrade.php | 4 +
question/type/match/db/upgrade.php | 4 +
question/type/multianswer/db/upgrade.php | 4 +
question/type/multichoice/db/upgrade.php | 4 +
question/type/numerical/db/upgrade.php | 4 +
question/type/questionbase.php | 18 ++
question/type/shortanswer/db/upgrade.php | 4 +
repository/draftfiles_ajax.php | 127 +++++------
repository/draftfiles_manager.php | 19 +-
repository/dropbox/db/upgrade.php | 4 +
repository/filepicker.js | 14 +-
repository/googledocs/db/upgrade.php | 4 +
repository/lib.php | 112 ++++++++++
repository/manage_instances.php | 6 +-
repository/picasa/db/upgrade.php | 4 +
repository/tests/repository_test.php | 229 +++++++++++++++++++-
repository/upload/lib.php | 15 +-
theme/afterburner/db/upgrade.php | 4 +
theme/afterburner/style/afterburner_styles.css | 13 +-
theme/bootstrapbase/config.php | 55 +++--
theme/bootstrapbase/layout/embedded.php | 23 ++
theme/formal_white/db/upgrade.php | 4 +
theme/formal_white/style/block.css | 5 +-
version.php | 4 +-
webservice/lib.php | 15 +-
165 files changed, 2045 insertions(+), 279 deletions(-)
create mode 100644 auth/cas/db/upgrade.php
create mode 100644 auth/ldap/db/upgrade.php
create mode 100644 install/lang/bn/error.php
create mode 100644 install/lang/dz/admin.php
create mode 100644 install/lang/dz/error.php
create mode 100644 install/lang/dz/install.php
create mode 100644 install/lang/dz/langconfig.php
create mode 100644 install/lang/dz/moodle.php
create mode 100644 install/lang/fa/error.php
create mode 100644 install/lang/fj/admin.php
create mode 100644 install/lang/fj/moodle.php
create mode 100644 install/lang/ga/moodle.php
create mode 100644 install/lang/gd/moodle.php
create mode 100644 install/lang/ha/langconfig.php
create mode 100644 install/lang/my/langconfig.php
create mode 100644 install/lang/te/error.php
create mode 100644 install/lang/te/install.php
create mode 100644 install/lang/tg/admin.php
create mode 100644 install/lang/uk/admin.php
create mode 100644 install/lang/vi/error.php
create mode 100644 theme/bootstrapbase/layout/embedded.php
A second git pull got a "Already up-to-date" message.
It seems like there were quite a few file changes in one day's time, especially when I didn't do anything with the system. When I did the second install, I restored three courses which had been backed up in the original 2.4 version, but the git pull command did not find any system changes on the day I did the first git pull. The changes all seemed to come overnight.
Things seem to be working now, but how do I interpret a git pull error which might arise if I check the system tomorrow and it doesn't compare? Do I run another stash and then another git pull? It doesn't seem right to ignore file system changes.
Over the past week I've viewed about 20 of the 40 or so drupalize-me video tutorials on git. I'll keep on studying, but right now I don't seem to "git" it. "-)
Rick