[Koha-bugs] [Bug 21159] Update item shelving location (952$c) on checkout

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

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

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Patch doesn't apply         |Needs Signoff

--- Comment #61 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
(In reply to Laura Escamilla from comment #56)
> Applying: Bug 21159: Database changes
> Using index info to reconstruct a base tree...
> M	installer/data/mysql/mandatory/sysprefs.sql
> Falling back to patching base and 3-way merge...
> Auto-merging installer/data/mysql/mandatory/sysprefs.sql
> Applying: Bug 21159: Template and yaml changes
> Applying: Bug 21159: Update item location on checkout
> Using index info to reconstruct a base tree...
> M	C4/Circulation.pm
> M	Koha/Item.pm
> M	t/db_dependent/Circulation/issue.t
> Falling back to patching base and 3-way merge...
> Auto-merging t/db_dependent/Circulation/issue.t
> CONFLICT (content): Merge conflict in t/db_dependent/Circulation/issue.t
> Auto-merging Koha/Item.pm
> CONFLICT (content): Merge conflict in Koha/Item.pm
> Auto-merging C4/Circulation.pm
> error: Failed to merge in the changes.
> Patch failed at 0001 Bug 21159: Update item location on checkout
> hint: Use 'git am --show-current-patch=diff' to see the failed 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-21159-Update-item-location-on-checkout-TimIX1.patch

Thanks for trying to test Laura.

I've rebased against master, these patches should now apply cleanly.

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