Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cannot re-merge curation document #4869

Closed
reckart opened this issue Jun 11, 2024 · 0 comments
Closed

Cannot re-merge curation document #4869

reckart opened this issue Jun 11, 2024 · 0 comments
Assignees
@reckart
Labels
🐛Bug Something isn't working Module: Curation
Milestone
33.0

Comments

@reckart
Copy link
Member

reckart commented Jun 11, 2024

Describe the bug
When trying to re-merge the curation document on the curation page, a concurrent access error is displayed.

To Reproduce
Steps to reproduce the behavior:

  1. Open a document on the curation page.
  2. Try re-merging
  3. See error

Expected behavior
No error.

Please complete the following information:

  • Version and build ID: 32.3
@reckart reckart added 🐛Bug Something isn't working Module: Curation labels Jun 11, 2024
@reckart reckart added this to the 32.4 milestone Jun 11, 2024
@reckart reckart self-assigned this Jun 11, 2024
reckart added a commit that referenced this issue Jun 11, 2024
@reckart
#4869 - Cannot re-merge curation document
f7f20a3 
- Remove document from disk before writing the re-merged version to avoid timestamp conflicts
reckart added a commit that referenced this issue Jun 11, 2024
@reckart
Merge pull request #4870 from inception-project/bugfix/4869-Cannot-re…
0284f51 
…-merge-curation-document

#4869 - Cannot re-merge curation document
@reckart reckart closed this as completed Jun 11, 2024
reckart added a commit that referenced this issue Jun 11, 2024
@reckart
Merge branch 'release/32.x' into release/33.x
ee1da77 
* release/32.x:
  #4869 - Cannot re-merge curation document

% Conflicts:
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java
@reckart reckart modified the milestones: 32.4, 33.0 Jun 11, 2024
reckart added a commit that referenced this issue Jun 11, 2024
@reckart
Merge branch 'release/33.x'
8cde109 
* release/33.x:
  #4860 - Knowledge base items should be matched even if query contains terms out of order
  #4869 - Cannot re-merge curation document
  #4867 - Cannot re-open document for curation if it contains an invalid feature value
  No issue: Warn about slow queries when using a scope
reckart added a commit that referenced this issue Jun 11, 2024
@reckart
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
6047639 
* main:
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0
  #4860 - Knowledge base items should be matched even if query contains terms out of order
  #4869 - Cannot re-merge curation document
  #4867 - Cannot re-open document for curation if it contains an invalid feature value
  No issue: Warn about slow queries when using a scope
  No issue: Set version to 34.0-SNAPSHOT
reckart added a commit that referenced this issue Jun 15, 2024
@reckart
Merge branch 'main' into refactoring/4843-Promote-sidebar-curation-mo…
10665b3 
…de-to-proper-curation-page

* main: (27 commits)
  #4875 - Add knowledge-base browser to multi-value concept feature editor
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-33.0
  #4860 - Knowledge base items should be matched even if query contains terms out of order
  #4869 - Cannot re-merge curation document
  #4867 - Cannot re-open document for curation if it contains an invalid feature value
  No issue: Warn about slow queries when using a scope
  No issue: Set version to 34.0-SNAPSHOT
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  #3611 - Upgrade to Spring 6, Boot 3, Wicket 10, etc.
  ...
@reckart reckart added this to Kanban Aug 7, 2024
@reckart reckart moved this to 🍹 Done in Kanban Aug 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@reckart reckart

Labels
🐛Bug Something isn't working Module: Curation
Projects
Kanban
Archived in project
Milestone
33.0
Development

No branches or pull requests
1 participant
@reckart