https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=37888

--- Comment #3 from Eric Phetteplace <[email protected]> ---
I can't get this patch to apply against main. Am I perhaps doing something
wrong? I will leave it at needs signoff. I'm doing this manually, not with
git-bz, and I've successfully applied patches before.

If I `git am -3 -i -u <name_of_patch_file>` like the wiki recommends, I get
"error: sha1 information is lacking or useless
(koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt).
error: could not build fake ancestor"

If I try `git apply` or `cat patch_file | patch -p1` I get portions that are
unable to be applied:

"2 out of 4 hunks failed--saving rejects to
'koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt.rej'"

The rejected chunks are the `let additional_filters...` JS is and the third
chunk of JS further down that references that var and adds an on change
handler.

-- 
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/

Reply via email to