[Koha-bugs] [Bug 5342] Serial claiming improvements

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

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

Alexandre Lengereau <alexandre.lengereau at biblibre.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |alexandre.lengereau at biblibr
                   |                            |e.com

--- Comment #3 from Alexandre Lengereau <alexandre.lengereau at biblibre.com> ---
<h1>Something went wrong !</h1>Applying: Bug 5342: Adds a claims_count field in
the serial table<br/>
Using index info to reconstruct a base tree...<br/>
Falling back to patching base and 3-way merge...<br/>
Auto-merging installer/data/mysql/kohastructure.sql<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 5342: Adds a claims_count field in the serial
table<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 5342 - Serial claiming improvements<br/>
<br/>
Bug 5342: Adds a claims_count field in the serial table<br/>
Apply? [yn] <br/>
Patch left in
/tmp/Bug-5342-Adds-a-claimscount-field-in-the-serial-ta-b7tIaH.patch<br/>
<br/>=== translation installation ===<br/>Install templates
  Install templates 'opac
    From: /home/koha/src/koha-tmpl/opac-tmpl/prog/en/
    To  : /home/koha/src/koha-tmpl/opac-tmpl/prog/fr-FR
    With: /home/koha/src/misc/translator/po/fr-FR-i-opac-t-prog-v-3006000.po
The install seems to be successful.
  Install templates 'intranet
    From: /home/koha/src/koha-tmpl/intranet-tmpl/prog/en/
    To  : /home/koha/src/koha-tmpl/intranet-tmpl/prog/fr-FR
    With: /home/koha/src/misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po
The install seems to be successful.

If you use this system for the 1st time, you may find usefull to reach the wiki
page http://wiki.koha-community.org/wiki/Sandboxes to have some information
about those results, to check if everything went well & if you can test the
patch properly

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.