Hello all, I am trying to upgrade my 7.0.x to 7.1 this morning and am getting an error. Here are the commands I have run.
$ bench use site1-test.local $ bench update --upgrade INFO:bench.utils:updating bench Already up-to-date. Requirement already satisfied (use --upgrade to upgrade): Pillow in ./env/lib/python2.7/site-packages INFO:bench.app:pulling frappe From https://github.com/frappe/frappe * branch master -> FETCH_HEAD Updating 9def17f..25608cc error: Your local changes to the following files would be overwritten by merge: frappe/__init__.py frappe/api.py frappe/app.py ... lots of files listed ... frappe/docs/user/fr/guides/app-development/how-to-improve-a-standard-control.md frappe/docs/user/fr/guides/app-development/index.md frapp Aborting Traceback (most recent call last): File "/usr/local/bin/bench", line 11, in <module> load_entry_point('bench', 'console_scripts', 'bench')() File "/home/erpnext/.bench/bench/cli.py", line 40, in cli bench_command() File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 716, in __call__ return self.main(*args, **kwargs) File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 696, in main rv = self.invoke(ctx) File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 1060, in invoke return _process_result(sub_ctx.command.invoke(sub_ctx)) File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 889, in invoke return ctx.invoke(self.callback, **ctx.params) File "/usr/local/lib/python2.7/dist-packages/click/core.py", line 534, in invoke return callback(*args, **kwargs) File "/home/erpnext/.bench/bench/commands/update.py", line 60, in update _update(pull, patch, build, bench, auto, restart_supervisor, requirements, no_backup, upgrade, force=force) File "/home/erpnext/.bench/bench/commands/update.py", line 76, in _update pull_all_apps(bench_path=bench_path) File "/home/erpnext/.bench/bench/app.py", line 140, in pull_all_apps remote=remote, branch=get_current_branch(app, bench_path=bench_path)), cwd=app_dir) File "/home/erpnext/.bench/bench/utils.py", line 127, in exec_cmd raise CommandFailedError(cmd) bench.utils.CommandFailedError: git pull upstream master
I have looked at a collection of other posts where others get the same error. I’ll admit I was using sudo at first, this error is still coming up after I have reset file permissions on the directories, did a git reset --hard and git pull from the ~/.bench directory, etc.
I have two sites on my server, run running on regular port 80 (site1.local) and then a test/non-prod site called site1-test.local running on port 8080. I am trying to update just the test site to start if possible, but either way still seem to get the error.
What I find interesting is bench aborts before it has finished listing all the files it is going to update. I have not altered any of the files by hand and I am pulling master branch.