[Koha-bugs] [Bug 12765] Capitalization: Cataloguing > Z39.50 search > "Try another search"

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12765

George Williams <georgew at latahlibrary.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |georgew at latahlibrary.org

--- Comment #2 from George Williams <georgew at latahlibrary.org> ---
I couldn't test this patch in the sandboxes.  I tried applying this patch in
one of the Biblibre sandboxes last night and in one of the PTFS sandboxes this
morning and the sandboxes could not apply the patch to Koha.  

The error message the sandbox e-mailed me in both cases was:

The sandbox you've requested is not ready.
Some problems occurred applying patches from bug 12765:
<h1>Something went wrong !</h1>Applying: Bug 12765: Fix capitalization - Try
another search Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 12765: Fix capitalization - Try another search

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.
Bug 12765 - Capitalization: Cataloguing > Z39.50 search > Try another search

30821 - Bug 12765: Fix capitalization - Try another search

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-12765-Fix-capitalization---Try-another-search-isbnJe.patch .

-- 
You are receiving this mail because:
You are watching all bug changes.