[Koha-bugs] [Bug 6875] de-nesting C4 packages

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |katrin.fischer at bsz-bw.de

--- Comment #31 from Katrin Fischer <katrin.fischer at bsz-bw.de> 2011-12-21 07:32:33 UTC ---
1) Changes to Auth.pm do not apply:
Bug 6875 de-nesting Auth.pm (1.29 KB, patch) 
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6875 de-nesting Auth.pm
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/Auth.pm
CONFLICT (content): Merge conflict in C4/Auth.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 6875 de-nesting Auth.pm
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

2) Changes to C4:Biblio do not apply:
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6875 de nesting C4::Biblio
/home/katrin/kohaclone/.git/rebase-apply/patch:292: trailing whitespace.

/home/katrin/kohaclone/.git/rebase-apply/patch:425: trailing whitespace.

fatal: sha1 information is lacking or useless (C4/Serials.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 6875 de nesting C4::Biblio
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

3) Also failing: Items.pm
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6875 de-nesting C4::Items
fatal: sha1 information is lacking or useless (C4/Items.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 6875 de-nesting C4::Items
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

4) C4:Member
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: bug 6875 de-nesting C4::Member
/home/katrin/kohaclone/.git/rebase-apply/patch:81: trailing whitespace.
                                FROM borrowers 
/home/katrin/kohaclone/.git/rebase-apply/patch:89: trailing whitespace.
                                FROM borrowers 
/home/katrin/kohaclone/.git/rebase-apply/patch:90: trailing whitespace.
                                LEFT JOIN categories ON
borrowers.categorycode=categories.categorycode 
/home/katrin/kohaclone/.git/rebase-apply/patch:271: trailing whitespace.
                      GetMemberFlags 
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
<stdin>:81: trailing whitespace.
                                FROM borrowers 
<stdin>:89: trailing whitespace.
                                FROM borrowers 
<stdin>:90: trailing whitespace.
                                LEFT JOIN categories ON
borrowers.categorycode=categories.categorycode 
<stdin>:271: trailing whitespace.
                      GetMemberFlags 
warning: 4 lines applied after fixing whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging C4/ILSDI/Services.pm
Auto-merging C4/Members.pm
CONFLICT (content): Merge conflict in C4/Members.pm
Auto-merging circ/circulation.pl
Auto-merging circ/returns.pl
Auto-merging opac/sco/sco-main.pl
Auto-merging t/db_dependent/lib/KohaTest/Members.pm
Failed to merge in the changes.
Patch failed at 0001 bug 6875 de-nesting C4::Member
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

5) opac-detail.pl
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Bug 6875 cleaning opac-detail.pl
fatal: sha1 information is lacking or useless (opac/opac-detail.pl).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 6875 cleaning opac-detail.pl
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".

Other patches still apply.

-- 
Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are watching all bug changes.