[Koha-bugs] [Bug 14484] Warns when changing patron password
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Tue Aug 11 14:56:24 CEST 2015
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14484
Mirko Tietgen <mirko at abunchofthings.net> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |mirko at abunchofthings.net
--- Comment #4 from Mirko Tietgen <mirko at abunchofthings.net> ---
I get an error when I try to apply the patch:
> Applying: Bug 14484: Jonathan Druart's fix
> fatal: sha1 information is lacking or useless (members/member-password.pl).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 Bug 14484: Jonathan Druart's fix
It looks like the second patch modifies the first one, so
1) the first patch should not be obsoleted OR
2) the second one should be done against master without the first in between
the second being the better option.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list