[Koha-bugs] [Bug 11897] Stock Rotation for Koha

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

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

Lisette Scheer <lisetteslatah at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #292 from Lisette Scheer <lisetteslatah at gmail.com> ---
CONFLICT (content): Merge conflict in Koha/Schema/Result/Branch.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 11897: DO NOT PUSH: Add stock rotation schema files.
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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".

Nick recommended skipping the patch, then I got this:
Unstaged changes after reset:
M       Koha/Schema/Result/Item.pm
Applying: Bug 11897: DBIX::Class::Ordered in Stockrotationstage.
Using index info to reconstruct a base tree...
A       Koha/Schema/Result/Stockrotationstage.pm
Falling back to patching base and 3-way merge...
error: refusing to lose untracked file at
'Koha/Schema/Result/Stockrotationstage.pm'
CONFLICT (modify/delete): Koha/Schema/Result/Stockrotationstage.pm deleted in
HEAD and modified in Bug 11897: DBIX::Class::Ordered in Stockrotationstage..
Version Bug 11897: DBIX::Class::Ordered in Stockrotationstage. of
Koha/Schema/Result/Stockrotationstage.pm left in tree.
Failed to merge in the changes.
Patch failed at 0001 Bug 11897: DBIX::Class::Ordered in Stockrotationstage.
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-11897-DBIXClassOrdered-in-Stockrotationstage-uoGTy1.patch

Nick recommended skipping again and I got this:
Unstaged changes after reset:
M       Koha/Schema/Result/Item.pm
Applying: Bug 11897: Add Boolean handling to dbic classes.
Using index info to reconstruct a base tree...
A       Koha/Schema/Result/Stockrotationitem.pm
A       Koha/Schema/Result/Stockrotationrota.pm
Falling back to patching base and 3-way merge...
error: refusing to lose untracked file at
'Koha/Schema/Result/Stockrotationrota.pm'
error: refusing to lose untracked file at
'Koha/Schema/Result/Stockrotationitem.pm'
CONFLICT (modify/delete): Koha/Schema/Result/Stockrotationrota.pm deleted in
HEAD and modified in Bug 11897: Add Boolean handling to dbic classes.. Version
Bug 11897: Add Boolean handling to dbic classes. of
Koha/Schema/Result/Stockrotationrota.pm left in tree.
CONFLICT (modify/delete): Koha/Schema/Result/Stockrotationitem.pm deleted in
HEAD and modified in Bug 11897: Add Boolean handling to dbic classes.. Version
Bug 11897: Add Boolean handling to dbic classes. of
Koha/Schema/Result/Stockrotationitem.pm left in tree.
Failed to merge in the changes.
Patch failed at 0001 Bug 11897: Add Boolean handling to dbic classes.
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-11897-Add-Boolean-handling-to-dbic-classes-mwDSBq.patch

Lisette

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