[Koha-bugs] [Bug 15586] References to Koha::Branches remain in unit tests

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

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

Héctor Eduardo Castro Avalos <hector.hecaxmmx at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |hector.hecaxmmx at gmail.com
             Status|Needs Signoff               |In Discussion

--- Comment #2 from Héctor Eduardo Castro Avalos <hector.hecaxmmx at gmail.com> ---
Hi Kyle the patch fails in merging process

Applying: Bug 15586 - References to Koha::Branches remain in unit tests
Using index info to reconstruct a base tree...
M       t/db_dependent/BiblioObject.t
M       t/db_dependent/Hold.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Hold.t
CONFLICT (content): Merge conflict in t/db_dependent/Hold.t
Auto-merging t/db_dependent/BiblioObject.t
CONFLICT (content): Merge conflict in t/db_dependent/BiblioObject.t
Failed to merge in the changes.
Patch failed at 0001 Bug 15586 - References to Koha::Branches remain in unit
tests
The copy of the patch that failed is found in:
   /var/koha/koha/.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-15586---References-to-KohaBranches-remain-in-u-Ltdaou.patch

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