[Koha-bugs] [Bug 8220] Allow koc uploads to go to process queue instead of being applied directly.

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

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

Bob Birchall <bob at calyx.net.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bob at calyx.net.au

--- Comment #4 from Bob Birchall <bob at calyx.net.au> ---
I ordered a Biblibre sandbox to test this patch.  It appears that the patch did
not apply.  The extra links do not appear on the Circulation page.  The email
from the sandbox creator included the following:

The patches attached to bugzilla 8220 have been applied, and the result is
<h1>Something went wrong !</h1>Applying: Bug 8220 - Allow koc uploads to go to
process queue instead of being applied directly.<br/>
Using index info to reconstruct a base tree...<br/>
Falling back to patching base and 3-way merge...<br/>
Auto-merging C4/Circulation.pm<br/>
Auto-merging installer/data/mysql/updatedatabase.pl<br/>
CONFLICT (content): Merge conflict in
installer/data/mysql/updatedatabase.pl<br/>
Failed to merge in the changes.<br/>
Patch failed at 0001 Bug 8220 - Allow koc uploads to go to process queue
instead of being applied directly.<br/>
When you have resolved this problem run git am --resolved.<br/>
If you would prefer to skip this patch, instead run git am --skip.<br/>
To restore the original branch and stop patching run git am --abort.<br/>
Bug 8220 - Allow koc uploads to go to process queue instead of being applied
directly.<br/>
<br/>
Bug 8220 - Allow koc uploads to go to process queue instead of being applied
directly.<br/>
Apply? [yn] <br/>
Patch left in
/tmp/Bug-8220---Allow-koc-uploads-to-go-to-process-queu-W6oPhU.patch<br/>

Unable to sign off.

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