[Koha-bugs] [Bug 19066] Add branchcode to accountlines

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Sat Jul 21 15:54:16 CEST 2018


https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19066

Cab Vinton <bibliwho at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bibliwho at gmail.com

--- Comment #21 from Cab Vinton <bibliwho at gmail.com> ---
Issue with Sandbox 06 --

Some problems occurred applying patches from bug 19066:
<h1>Something went wrong !</h1>Applying: Bug 19066 - Update Database
Applying: Bug 19066 - Add branchcode to accountlines
.git/rebase-apply/patch:83: trailing whitespace.
         = C4::Context->userenv->{'number'} if C4::Context->userenv; 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       C4/Accounts.pm
M       C4/Circulation.pm
M       C4/Reserves.pm
M       Koha/Account.pm
M       t/db_dependent/Accounts.t
.git/rebase-apply/patch:83: trailing whitespace.
         = C4::Context->userenv->{'number'} if C4::Context->userenv; 
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Accounts.t
CONFLICT (content): Merge conflict in t/db_dependent/Accounts.t
Auto-merging Koha/Account.pm
Auto-merging C4/Reserves.pm
Auto-merging C4/Circulation.pm
Auto-merging C4/Accounts.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 19066 - Add branchcode to accountlines
The copy of the patch that failed is found in: .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.
Bug 19066 - Add branchcode to accountlines

73185 - Bug 19066 - Update Database
73186 - Bug 19066 - Add branchcode to accountlines
73187 - Bug 19066 - Update Schema
73595 - Bug 19066: Follow up to reduce C4::Context references

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-19066---Add-branchcode-to-accountlines-ArAGEA.patch

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


More information about the Koha-bugs mailing list