Bench update error - frappe

Am getting this error while doing “bench update”

INFO:bench.utils:updating bench
INFO:bench.utils:git pull
remote: Counting objects: 22, done.
remote: Compressing objects: 100% (16/16), done.
remote: Total 22 (delta 8), reused 3 (delta 3), pack-reused 3
Unpacking objects: 100% (22/22), done.
From https://github.com/frappe/bench
080ca17…2f03e9f master -> origin/master
Updating 080ca17…2f03e9f
Fast-forward
bench/config/nginx.py | 2 ±
bench/patches/patches.txt | 2 ++
bench/patches/v4/update_socketio.py | 4 ++++
3 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 bench/patches/v4/update_socketio.py
npm WARN deprecated isarray@2.0.1: Just use Array.isArray directly
npm WARN optional Skipping failed optional dependency /chokidar/fsevents:
npm WARN notsup Not compatible with your operating system or architecture: fsevents@1.1.1
npm WARN enoent ENOENT: no such file or directory, open ‘/home/frappe/frappe-bench/package.json’
npm WARN frappe-bench No description
npm WARN frappe-bench No repository field.
npm WARN frappe-bench No README data
npm WARN frappe-bench No license field.
remote: Counting objects: 1086, done.
remote: Compressing objects: 100% (320/320), done.
remote: Total 1086 (delta 898), reused 939 (delta 763), pack-reused 0
Receiving objects: 100% (1086/1086), 157.07 KiB | 0 bytes/s, done.
Resolving deltas: 100% (898/898), completed with 255 local objects.
From https://github.com/frappe/frappe
1c08475…645f26a master -> upstream/master

  • [new tag] v8.0.43 -> v8.0.43
  • [new tag] v8.0.26 -> v8.0.26
  • [new tag] v8.0.27 -> v8.0.27
  • [new tag] v8.0.28 -> v8.0.28
  • [new tag] v8.0.29 -> v8.0.29
  • [new tag] v8.0.30 -> v8.0.30
  • [new tag] v8.0.31 -> v8.0.31
  • [new tag] v8.0.32 -> v8.0.32
  • [new tag] v8.0.33 -> v8.0.33
  • [new tag] v8.0.34 -> v8.0.34
  • [new tag] v8.0.35 -> v8.0.35
  • [new tag] v8.0.36 -> v8.0.36
  • [new tag] v8.0.37 -> v8.0.37
  • [new tag] v8.0.38 -> v8.0.38
  • [new tag] v8.0.39 -> v8.0.39
  • [new tag] v8.0.40 -> v8.0.40
  • [new tag] v8.0.41 -> v8.0.41
  • [new tag] v8.0.42 -> v8.0.42
    INFO:bench.utils:./env/bin/pip install Pillow
    Requirement already satisfied: Pillow in ./env/lib/python2.7/site-packages

Cannot proceed with update: You have local changes in app “frappe” that are not committed.

Here are your choices:

  1. Merge the frappe app manually with “git pull” / “git pull --rebase” and fix conflicts.
  2. Temporarily remove your changes with “git stash” or discard them completely
    with “bench update --reset” or for individual repositries “git reset --hard”
  3. If your changes are helpful for others, send in a pull request via GitHub and
    wait for them to be merged in the core.

I believe there are source codes that were modified/added (reports that were not standardized, doctypes that are located somewhere in the core, etc). If you haven’t made any changes to the core, then doing a git reset would be completely fine.

1 Like

go to /apps/frappe and git reset --hard

I tried, but still the same error. Please see the below details,

/home/frappe/frappe-bench/apps/erpnext# git stash
No local changes to save
/home/frappe/frappe-bench/apps/erpnext# git reset --hard
HEAD is now at 154385d Merge branch ‘develop’
/home/frappe/frappe-bench/apps/erpnext# git pull --rebase
Current branch master is up to date.
/home/frappe/frappe-bench/apps/erpnext# cd …
/home/frappe/frappe-bench/apps# cd frappe/
/home/frappe/frappe-bench/apps/frappe# git stash
No local changes to save
/home/frappe/frappe-bench/apps/frappe# git reset --hard
HEAD is now at 2b8a12d Update contact.js (#3286)
/home/frappe/frappe-bench/apps/frappe# git pull --rebase
Current branch master is up to date.
root@erp:/# bench update --upgrade
INFO:bench.utils:updating bench
INFO:bench.utils:git pull
Already up-to-date.
INFO:bench.utils:./env/bin/pip install Pillow
Requirement already satisfied: Pillow in ./env/lib/python2.7/site-packages

Cannot proceed with update: You have local changes in app “frappe” that are not committed.

Here are your choices:

  1. Merge the frappe app manually with “git pull” / “git pull --rebase” and fix conflicts.
  2. Temporarily remove your changes with “git stash” or discard them completely
    with “bench update --reset” or for individual repositries “git reset --hard”
  3. If your changes are helpful for others, send in a pull request via GitHub and
    wait for them to be merged in the core.