http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210
--- Comment #21 from Nicole C. Engard <[email protected]> 2012-01-24 16:48:57 UTC --- Owen, Is your patch a follow up? or an edited patch? Should I apply both? Cause when I tried to apply both I got this: nengard@kohavm:~/kohaclone$ git bz apply 6210 Bug 6210 - Choose framework on Merge [SIGNED-OFF] bug_6210: Select framework if merging two records with different frameworks Apply? [yn] y Applying: bug_6210: Select framework if merging two records with different frameworks /home/nengard/kohaclone/.git/rebase-apply/patch:195: trailing whitespace. $framework = $frameworkcode1; /home/nengard/kohaclone/.git/rebase-apply/patch:221: trailing whitespace. choosereference => 1, /home/nengard/kohaclone/.git/rebase-apply/patch:299: trailing whitespace. [% frameworkcodeloo.frameworktext %] warning: 3 lines add whitespace errors. Follow-up fix Apply? [yn] y Applying: Bug 6210 - Follow up, Choose framework on merge error: patch failed: koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt:198 error: koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt: patch does not apply Patch failed at 0001 Bug 6210 - Follow up, Choose framework on merge 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". Patch left in /tmp/Follow-up-fix-z8BjoC.patch nengard@kohavm:~/kohaclone$ -- 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. _______________________________________________ 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/
