https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20256 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #148 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- This no longer applies, please rebase! Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 20256: Update database Applying: Bug 20256: Add new permission to editor Applying: Bug 20256: Refactor subs for rights to view patrons to make them generic for general use Applying: Bug 20256: Add new methods for checking item editing permissions Applying: Bug 20256: Update groups editor Applying: Bug 20256: Use new methods Using index info to reconstruct a base tree... M Koha/Item.pm M catalogue/detail.pl M catalogue/moredetail.pl M cataloguing/additem.pl M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt M tools/batchMod.pl Falling back to patching base and 3-way merge... Auto-merging tools/batchMod.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Auto-merging cataloguing/additem.pl Auto-merging catalogue/moredetail.pl Auto-merging catalogue/detail.pl Auto-merging Koha/Item.pm Applying: Bug 20256: Add unit tests Applying: Bug 20256: (QA follow-up) Remove double negative from code Applying: Bug 20256: (QA follow-up) Change meaning should change code Applying: Bug 20256: (QA follow-up) test borrowernumber in userenv too Applying: Bug 20256: (QA follow-up) Fix column description for ft_limit_item_editing Applying: Bug 20256: (QA follow-up) Fix missed change from item.cannot_be_edited to item.can_be_edited Applying: Bug 20256: (QA follow-up) Redirect to record details page if user cannot edit this item error: sha1 information is lacking or useless (cataloguing/additem.pl). error: could not build fake ancestor Patch failed at 0001 Bug 20256: (QA follow-up) Redirect to record details page if user cannot edit this item The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-20256-QA-follow-up-Redirect-to-record-details--3RxR9W.patch -- You are receiving this mail because: You are watching all bug changes.