search

denshoproject / ddr-local

Web UI used for interacting with DDR collections and entities on a local machine.
Other
3 stars 0 forks source link

Git merge conflict in ddr-pc-58 #342

Open gjost opened 2 weeks ago

gjost commented 2 weeks ago

pkikawa: got a interesting DDR editor bug(?) (hqma v5.10.8) ddr-pc-58 is showing a "Collection ddr-pc-58 is in a conflicted state. Click here to resolve." warning in editor. git fetch; git status is showing nothing wrong, same with git gc, git annex fsck, etc. The "Click here to resolve." page throws a TypeError at http://192.168.56.101/ui/collection/ddr-pc-58/merge/

Seeing this across multiple editor VMs but not other collections. Banner shows on the collection page. Doesn't show on individual objects page (incl 58-50). Collection is locked, but we aren't needing to edit the collection atm. Not seeing a lock file in the collection dir.

Collection hasn't been touched in years as far as we know Looks like back in 2022 there was a merge issue with one of the objects

gjost
OK, got it fixed.  There was an entity (ddr-pc-58-50) and a file (ddr-pc-58-50-mezzanine-5b435363c1) that had merge conflicts.  I edited the files manually and that took care of the problem
[Posted in tech_general](https://densho.slack.com/archives/C5PMT0BDG/p1642121733094200) | [Jan 13th, 2022]```

Environment:

Request Method: GET Request URL: http://192.168.56.101/ui/collection/ddr-pc-58/merge/

Django Version: 4.1.13 Python Version: 3.9.2 Installed Applications: ('django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', 'bootstrap_pagination', 'gunicorn', 'rest_framework', 'sorl.thumbnail', 'ddrlocal', 'storage', 'webui', 'namesdb_public') Installed Middleware: ('django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware')

Traceback (most recent call last): File "/opt/ddr-local/venv/ddrlocal/lib/python3.9/site-packages/django/core/handlers/exception.py", line 56, in inner response = get_response(request) File "/opt/ddr-local/venv/ddrlocal/lib/python3.9/site-packages/django/core/handlers/base.py", line 197, in _get_response response = wrapped_callback(request, *callback_args, **callback_kwargs)

Exception Type: TypeError at /ui/collection/ddr-pc-58/merge/ Exception Value: merge() missing 2 required positional arguments: 'repo' and 'org'



[ddr-pc-58_merge_conflict.zip](https://github.com/user-attachments/files/17684681/ddr-pc-58_merge_conflict.zip)
gjost commented 2 weeks ago

Searched the collection for the strings that Git uses to mark merge conflicts (ack -Q "<<<<", ack -Q ">>>>", ack -Q "====") but got nothing.