[Koha-bugs] [Bug 7292] new permission for claims

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

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

Paola Rossi <paola.rossi at cineca.it> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |paola.rossi at cineca.it

--- Comment #28 from Paola Rossi <paola.rossi at cineca.it> ---
I try to apply against master 3.15.00.052
I think that the patches need to be rebased.

I could resolve the CONFLICT on the first patch:
Applying: Bug 7292: New permission for claims (database changes only)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging
installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
Auto-merging
installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
Auto-merging installer/data/mysql/pl-PL/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
Auto-merging installer/data/mysql/it-IT/necessari/userpermissions.sql
Auto-merging installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
Auto-merging installer/data/mysql/es-ES/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/en/mandatory/userpermissions.sql
Auto-merging installer/data/mysql/de-DE/mandatory/userpermissions.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 7292: New permission for claims (database changes
only)

Anyway, the second patch doesn't apply:
Applying: Bug 7292: More granular permissions for claiming orders
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/acqui/lateorders.tt

I pass the patches to "Patch doesn't apply" status.

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