http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8133
--- Comment #32 from Magnus Enger <[email protected]> --- I get an error when I try to apply the patches: $ git bz apply 8133 Bug 8133 - hourly loans doesn't know when library closed 32985 - Bug 8133 - hourly loans doesn't know when library closed 32986 - Bug 8133 [QA Followup] - Fix koha-qa.pl violations 32991 - Bug 8133 [QA Followup 2] - Fix unit tests Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8133 - hourly loans doesn't know when library closed /home/vagrant/kohaclone/.git/rebase-apply/patch:62: trailing whitespace. }, { Slice => {} }, $branchcode ); /home/vagrant/kohaclone/.git/rebase-apply/patch:314: trailing whitespace. }, 'weekday', { Slice => {} }, $branch ); /home/vagrant/kohaclone/.git/rebase-apply/patch:399: trailing whitespace. if ( $self->{days_mode} eq 'Calendar' ) { /home/vagrant/kohaclone/.git/rebase-apply/patch:429: trailing whitespace. if ( $self->{days_mode} eq 'Calendar' ) { /home/vagrant/kohaclone/.git/rebase-apply/patch:595: trailing whitespace. warning: squelched 36 whitespace errors warning: 41 lines add whitespace errors. Using index info to reconstruct a base tree... <stdin>:62: trailing whitespace. }, { Slice => {} }, $branchcode ); <stdin>:314: trailing whitespace. }, 'weekday', { Slice => {} }, $branch ); <stdin>:399: trailing whitespace. if ( $self->{days_mode} eq 'Calendar' ) { <stdin>:429: trailing whitespace. if ( $self->{days_mode} eq 'Calendar' ) { <stdin>:595: trailing whitespace. warning: squelched 36 whitespace errors warning: 41 lines applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/calendar.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Circulation.pm Applying: Bug 8133 [QA Followup] - Fix koha-qa.pl violations fatal: sha1 information is lacking or useless (C4/Calendar.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8133 [QA Followup] - Fix koha-qa.pl violations 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-8133-QA-Followup---Fix-koha-qapl-violations-admQOe.patch But I did get some weirdness when running the tests from bug 11211 (see bug 11211 comment 26), so perhaps there is something about my setup that is borken. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
