Summary: | Typo: "Does not exists" | ||
---|---|---|---|
Product: | Koha | Reporter: | Katrin Fischer <katrin.fischer> |
Component: | Developer documentation | Assignee: | Nicolas Hunstein <nicolas.hunstein> |
Status: | Patch doesn't apply --- | QA Contact: | Testopia <testopia> |
Severity: | trivial | ||
Priority: | P5 - low | CC: | david, nicolas.hunstein |
Version: | Main | Keywords: | Academy |
Hardware: | All | ||
OS: | All | ||
GIT URL: | Change sponsored?: | --- | |
Patch complexity: | --- | Documentation contact: | |
Documentation submission: | Text to go in the release notes: | ||
Version(s) released in: | Circulation function: | ||
Attachments: | Bug 39017: update "Does not exists" |
Description
Katrin Fischer
2025-02-03 13:17:21 UTC
Created attachment 180620 [details] [review] Bug 39017: update "Does not exists" changes string "Does not exists" to "Does not exist" to test: - look for "Does not exists" - check there are some entries "Does not exists" - apply patch - verify there are no entries "Does not exists". Instead there are entries "Does not exist" The patch no longer applies (on the latest main) 8-(... git bz apply 39017 Bug 39017 - Typo: "Does not exists" 180620 - Bug 39017: update "Does not exists" Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39017: update "Does not exists" Using index info to reconstruct a base tree... M Koha/SimpleMARC.pm M admin/auth_tag_structure.pl M admin/marctagstructure.pl M patroncards/create-pdf.pl M serials/create-numberpattern.pl Falling back to patching base and 3-way merge... Auto-merging serials/create-numberpattern.pl CONFLICT (content): Merge conflict in serials/create-numberpattern.pl Auto-merging patroncards/create-pdf.pl CONFLICT (content): Merge conflict in patroncards/create-pdf.pl Auto-merging admin/marctagstructure.pl CONFLICT (content): Merge conflict in admin/marctagstructure.pl Auto-merging admin/auth_tag_structure.pl CONFLICT (content): Merge conflict in admin/auth_tag_structure.pl Auto-merging Koha/SimpleMARC.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 39017: update "Does not exists" |