https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19735
Alex Buckley <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #7 from Alex Buckley <[email protected]> --- Can you please rebase your patches, the second patch is currently not applying cleanly on master, as the below output shows: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19735: Script to generate cpanfile (DO NOT PUSH) Applying: Bug 19735: Move Perl deps definitions into a cpanfile Using index info to reconstruct a base tree... M C4/Installer.pm M C4/Installer/PerlDependencies.pm M C4/Installer/PerlModules.pm M Makefile.PL M about.pl M debian/list-deps M installer/install.pl Falling back to patching base and 3-way merge... Removing t/Installer_PerlDependencies.t Auto-merging installer/install.pl Auto-merging debian/list-deps Auto-merging about.pl Auto-merging Makefile.PL Auto-merging C4/Installer/PerlModules.pm CONFLICT (content): Merge conflict in C4/Installer/PerlModules.pm CONFLICT (modify/delete): C4/Installer/PerlDependencies.pm deleted in Bug 19735: Move Perl deps definitions into a cpanfile and modified in HEAD. Version HEAD of C4/Installer/PerlDependencies.pm left in tree. Auto-merging C4/Installer.pm Failed to merge in the changes. Patch failed at 0001 Bug 19735: Move Perl deps definitions into a cpanfile The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch 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-19735-Move-Perl-deps-definitions-into-a-cpanfi-S1GHo1.patch -- 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/
