[Koha-bugs] [Bug 7677] New area in subscriptions and new function when receiving

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

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

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 #39 from Paola Rossi <paola.rossi at cineca.it> ---
I've tried to apply the patches against master 3.19.00.000

The second patch needed some [almost trivial] rebasing:

Applying: BZ7677: New areas in subscriptions and new functions when receiving.
Using index info to reconstruct a base tree...
<stdin>:49: trailing whitespace.
                        ORDER BY serialid DESC LIMIT $nth,1 
<stdin>:97: trailing whitespace.
    $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, 
<stdin>:197: trailing whitespace.
          choices: 
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging serials/serials-edit.pl
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
Auto-merging installer/data/mysql/updatedatabase.pl
CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging C4/Serials.pm
Failed to merge in the changes.
Patch failed at 0001 BZ7677: New areas in subscriptions and new functions when
receiving.

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

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