https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35216
--- Comment #8 from David Nind <[email protected]> --- Hi Brendan. This is what I normally do in KTD (assuming your Bugzilla credentials are in the .env file): 1. Koha clone - up-to-date: on master branch, git pull 2. KTD up-to-date: git pull, ktd pull 3. Start up KTD: ktd up 4. Access Koha using the shell: ktd --shell 5. Checkout a branch for testing the bug: git checkout -B bzXXXXXX 6. Apply the patches: git bz apply XXXXXXX 7. Test using the test plan, if there is one, or you know what it is about 8. Sign-off once happy: 8.1 git bz so X (X = the number of patches, in this case 2) (if you git log, your sign-off line should show at the end of the patch) 8.2 git bz attach -e XXXXXX HEAD (for one patch) or git bz attach -e XXXXXX HEAD~X.. (for multiple patches, where X = number of patches, in this case 2) 9. Check on Bugzilla that the status was changed to signed off. XXXXXX = the bug number I tried to apply the patch, but it no longer applies - I'm not a developer, so don't normally try and resolve the conflict, and change the status in Bugzilla to Patch doesn't apply. If I get an error when going through the test plan, or it doesn't work, I would normally indicate this in a comment on the bug and change the status to Failed QA. Patch doesn't apply message ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ kohadev-koha@kohadevbox:koha(bz35307)$ git bz apply 35216 Bug 35216 - Use return variable names from CanBookBeIssued in circulation.pl for consistency 158185 - Bug 35216: Rename question to needsconfirmation 158187 - Bug 35216: Rename error to issuingimpossible Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35216: Rename question to needsconfirmation Applying: Bug 35216: Rename error to issuingimpossible error: sha1 information is lacking or useless (circ/circulation.pl). error: could not build fake ancestor Patch failed at 0001 Bug 35216: Rename error to issuingimpossible hint: Use 'git am --show-current-patch=diff' to see the failed 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-35216-Rename-error-to-issuingimpossible-mjakx8dk.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
