[Koha-bugs] [Bug 5858] Update default MARC21 framework to Update No. 16 (April 2013)

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

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

--- Comment #29 from Bernardo Gonzalez Kriegel <bgkriegel at gmail.com> ---
(In reply to M. de Rooy from comment #28)
> fatal: sha1 information is lacking or useless
> (installer/data/mysql/en/marcflavour/marc21/mandatory/
> marc21_framework_DEFAULT.sql).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 Bug 5858 - Update default MARC21 framework to Update
> No. 16 (April 2013)

Strange

~/kohaclone$ git pull
Already up-to-date.
~/kohaclone$ git checkout bug_5858-B
Switched to branch 'bug_5858-B'
Your branch is behind 'origin/master' by 11 commits, and can be fast-forwarded.
~/kohaclone$ git rebase master
First, rewinding head to replay your work on top of it...
Fast-forwarded bug_5858-B to master.
~/kohaclone$ git bz apply 5858
Bug 5858 - Update default MARC21 framework to Update No. 16 (April 2013)

Bug 5858 - Default frameworks missing many MARC21 tags
Apply? [yn] y

Applying: Bug 5858 - Default frameworks missing many MARC21 tags
[FOLLOWUP] Bug 5858 - Default frameworks missing many MARC21 tags
Apply? [yn] y

Applying: Bug 5858 - Default frameworks missing many MARC21 tags
[FOLLOWUP 2] Bug 5858 - Update default MARC21 framework
Apply? [yn] y

Applying: Bug 5858 - Update default MARC21 framework to Update No. 16 (April
2013)
~/kohaclone$

For me it's applying without problem, should I switch to Needs Singoff?

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