[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

--- Comment #43 from M. de Rooy <m.de.rooy at rijksmuseum.nl> 2012-02-15 12:16:14 UTC ---
Testing the third one:

Applying: bug 6875 de-nesting C4::Member
/usr/share/koha/testclone/.git/rebase-apply/patch:81: trailing whitespace.
                                FROM borrowers
/usr/share/koha/testclone/.git/rebase-apply/patch:89: trailing whitespace.
                                FROM borrowers
/usr/share/koha/testclone/.git/rebase-apply/patch:90: trailing whitespace.
                                LEFT JOIN categories ON
borrowers.categorycode=categories.categorycode
/usr/share/koha/testclone/.git/rebase-apply/patch:271: trailing whitespace.
                      GetMemberFlags
error: patch failed: C4/Members.pm:27
error: C4/Members.pm: patch does not apply
error: patch failed: opac/sco/sco-main.pl:95
error: opac/sco/sco-main.pl: patch does not apply
error: patch failed: t/db_dependent/lib/KohaTest/Members.pm:14
error: t/db_dependent/lib/KohaTest/Members.pm: patch does not apply
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 add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merged C4/ILSDI/Services.pm
Auto-merged C4/Members.pm
CONFLICT (content): Merge conflict in C4/Members.pm
Auto-merged C4/SIP/ILS/Patron.pm
Auto-merged circ/circulation.pl
Auto-merged circ/returns.pl
Auto-merged members/deletemem.pl
Auto-merged opac/sco/sco-main.pl
Auto-merged t/db_dependent/lib/KohaTest/Members.pm
Failed to merge in the changes.
Patch failed at 0001.

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