https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36557
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #4 from David Nind <[email protected]> --- (In reply to David Nind from comment #3) > However, now I'm getting a sha1/fake ancestor error for bug 36166. If I apply bug 36166 by itself, everything works as it should - no sha1/fake ancestor error. However, I think I worked out what the problem is. The sha1/fake ancestor is for this bug - the patch itself for this bug has the wrong bug number! - Bug title: Bug 36557 - Improve logic and display of OPAC cart, tag, and lists controls - Bug attached: Bug 36166: Convert Cart and Lists conrols to buttons and rework logic () Here is the sha1/fake ancestor error: git bz apply 36557 Bug 36557 Depends on bug 36166 (Signed Off) Follow? [(y)es, (n)o] y Bug 36166 Depends on bug 36207 (Signed Off) Follow? [(y)es, (n)o] y Bug 36207 - Convert browser alerts to modals: OPAC tags 166212 - Bug 36207: Use confirmation modal when removing tags from titles in the OPAC Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36207: Use confirmation modal when removing tags from titles in the OPAC Bug 36166 - Disable select to add to list if opacuserlogin is disabled 162794 - Bug 36166: Disable select to add to list if opacuserlogin is disabled Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36166: Disable select to add to list if opacuserlogin is disabled Bug 36557 - Improve logic and display of OPAC cart, tag, and lists controls 164563 - Bug 36166: Convert Cart and Lists conrols to buttons and rework logic Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36166: Convert Cart and Lists conrols to buttons and rework logic error: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss). error: could not build fake ancestor Patch failed at 0001 Bug 36166: Convert Cart and Lists conrols to buttons and rework logic -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
