[Koha-bugs] [Bug 13265] Still too many search cursor cookies

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

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

Magnus Enger <magnus at enger.priv.no> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |magnus at enger.priv.no
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #8 from Magnus Enger <magnus at enger.priv.no> ---
$ git bz apply 13265
Bug 13265 - Still too many search cursor cookies

33616 - Bug 13265 - Still too many search cursor cookies

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 13265 - Still too many search cursor cookies
Using index info to reconstruct a base tree...
M    installer/data/mysql/sysprefs.sql
M    installer/data/mysql/updatedatabase.pl
M    koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
M    koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
M    koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
M    koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 13265 - Still too many search cursor cookies
The copy of the patch that failed is found in:
   /home/magnus/scripts/kohaclone/.git/rebase-apply/patch
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".
Patch left in
/tmp/Bug-13265---Still-too-many-search-cursor-cookies-bMkL_V.patch

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