[Koha-bugs] [Bug 12896] Move the bookseller-related code into its own module

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

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

--- Comment #16 from Paola Rossi <paola.rossi at cineca.it> ---
(In reply to Katrin Fischer from comment #15)
> Hi Paola, I have tried working my way through the dependencies here, but I
> must be missing something. Can you still get this to apply? Or maybe you
> still have your testing branch and could take a look at the sequence you
> applied the patches in?

Kind Katrin, I'm sorry, I'm not able to help you.

I signed off on Sep the 19-th, against master 3.17.00.025, attaching to
bugzilla an 0004* file.
So I suppose I followed exactly the Jonathan's note of comment 10:

>> Now bug 12830 depends on bug 12953.
>>This one should apply correctly on top.

Today [3.17.00.033] the patch 12953 (1) is already pushed to master, whilst the
patch 12830 (2) not.
So, applying against master, the two 12830 are OK, but this patch 12896 is not
OK [as it should be expected after Sep 23-th]. This is the conflict:

Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Acquisition/OrderFromSubscription.t
CONFLICT (content): Merge conflict in
t/db_dependent/Acquisition/OrderFromSubscription.t
Auto-merging acqui/addorderiso2709.pl
Failed to merge in the changes.
Patch failed at 0001 Bug 12896: Move the bookseller-related code into
Koha::Acquisition::Bookseller
--------------------------------------------------------------------
The 5342's dependency was required later, on the 23-th. But I see conflict:
1) either applying 5342 soon after 12830, 
2) or applying 12852/29-th [as Jonathan asked in comment 14] after 12830, 
3) or applying 12852/PassedQA Oct 11 (after 12830 or without 12830) 

So I'm sorry, I can't help you.
----------------------------------------------
5342's conflict after applying 12830:
Applying: Bug 5342: Serial claiming improvements: add a counter
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by
merge:
        t/db_dependent/Serials/Claims.t
Please move or remove them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Bug 5342: Serial claiming improvements: add a counter
-----------------------------
The conflict of the patch 12852, version of Sep, the 29-th,  after applying
12830:
Applying: Bug 12852: The "preview" param can be removed serials/claims.pl
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging serials/claims.pl
CONFLICT (content): Merge conflict in serials/claims.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 12852: The "preview" param can be removed
serials/claims.pl
======================================================================

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