https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17855
--- Comment #17 from M. Tompsett <[email protected]> --- (In reply to Alex Buckley from comment #16) > M. Tompsett. Thank you of informing me of this. > > I have now gone through and obsoleted older patches including the patch that > was causing the failure. > > So try seeing if it will apply for you now. Still fails. I'm thinking you are patching an old version of master. You may need to rebase. $ git checkout master $ git pull $ git checkout -b bug_17855_retest1 origin/master $ git bz apply 17855 -- This should fail. $ git bz apply --abort $ git checkout bug_17855 -- probably discover your are out some changes, not just these. -- I'm assuming you generally name your branches bug_#####. $ git rebase origin/master $ git bz attach -e HEAD^^^^^^^^..HEAD -- there are 8 ^'s. That should get all your patches. $ git checkout bug_17855_retest1 -- probably some messages about being out of sync, doesn't matter. $ git reset --hard origin/master $ git bz apply 17855 -- hopefully this will work now. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug. _______________________________________________ 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/
