[Koha-bugs] [Bug 11759] Batch checkout

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

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

Magnus Enger <magnus at enger.priv.no> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |magnus at enger.priv.no

--- Comment #13 from Magnus Enger <magnus at enger.priv.no> ---
$ git bz apply 11759
Bug 11759 - Batch checkout

25255 - Bug 11759: Batch checkout - prepare the ground
25256 - Bug 11759: Batch checkout - Add the new template
25257 - Bug 11759: Add links to the new page
25258 - Bug 11759: Add some css to highlight warnings and errors
25260 - Bug 11759: Batch checkout - DB changes
26455 - Bug 11759: (follow-up) Prevent access to the batch checkout if not
allowed

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 11759: Batch checkout - prepare the ground
Applying: Bug 11759: Batch checkout - Add the new template
fatal: sha1 information is lacking or useless (circ/circulation.pl).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 11759: Batch checkout - Add the new template
The copy of the patch that failed is found in:
   /home/magnus/scripts/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-11759-Batch-checkout---Add-the-new-template-tEAbBf.patch

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