[Koha-bugs] [Bug 11213] GetItemsInfo() called twice

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

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

--- Comment #62 from M. Tompsett <mtompset at hotmail.com> ---
(In reply to Marcel de Rooy from comment #61)
> Repeated on fresh master:
> Applying: bug_11213: C4::VirtualShelves::Page::shelf_contents()
> fatal: sha1 information is lacking or useless (C4/VirtualShelves/Page.pm).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 bug_11213: C4::VirtualShelves::Page::shelf_contents()
> 
> Since our git version may be different, please apply them again with your
> git version and resubmit.

mtompset at debian:~/kohaclone$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
mtompset at debian:~/kohaclone$ git branch -D bug_11213_restart
Deleted branch bug_11213_restart (was 113c548).
mtompset at debian:~/kohaclone$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
mtompset at debian:~/kohaclone$ git pull
Already up-to-date.
mtompset at debian:~/kohaclone$ git remote update -p
Fetching origin
mtompset at debian:~/kohaclone$ git checkout -b bug_11213_restart origin/master
Branch bug_11213_restart set up to track remote branch master from origin.
Switched to a new branch 'bug_11213_restart'
mtompset at debian:~/kohaclone$ git bz apply 11213
Bug 11213 - GetItemsInfo() called twice

39023 - bug_11213: Changed XSLTParse4Display() interface
39024 - bug_11213: whitespace correction
39025 - bug_11213: Include XSLT processing for searchResults() test
39026 - bug_11213: C4::VirtualShelves::Page::shelf_contents()
39027 - bug_11213: GetItemsInfo() test
39028 - bug_11213: Added XSLTParse4Display() to Items test
39029 - bug_11213: Check for $item->{itype} presence to avoid warning

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: bug_11213: Changed XSLTParse4Display() interface
Applying: bug_11213: whitespace correction
Applying: bug_11213: Include XSLT processing for searchResults() test
Applying: bug_11213: C4::VirtualShelves::Page::shelf_contents()
Using index info to reconstruct a base tree...
M       C4/VirtualShelves/Page.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/VirtualShelves/Page.pm
Applying: bug_11213: GetItemsInfo() test
Applying: bug_11213: Added XSLTParse4Display() to Items test
Using index info to reconstruct a base tree...
M       t/db_dependent/Items.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Items.t
Applying: bug_11213: Check for $item->{itype} presence to avoid warning
mtompset at debian:~/kohaclone$

It works fine for me with Debian Jessie.
Did you check if your 'git bz' is up to date?

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