On 18 September 2013 23:38, Paul Poulain <paul.poulain@biblibre.com> wrote:
Hello koha-devel,
I see that many patches are now automatically marked as "patch doesn't apply", automatically.
If I'm not wrong, it's Chris C. that setup this bot. Useful job.
2 questions: * Has this been discussed/announced somewhere ? Not on koha-devel, somewhere else ? * the script is marking as "patch does not apply" patches have a conflict. Does it mark as such patches that only have an updatedatabase/sysprefs.sql conflict ? Those conflicts happends on every updatedatabase push, it would be a pain to have to rebase them on every push. 2 options to fix this:
Actually they don't, git can sometimes 3 way merge and get it right. I noticed about 8 did, while more conflicted.
- push the new updatedb, that has been tested a lot, is passed QA for a while (bug 7167) - Prevent updatedatabase/sysprefs.sql conflicts from resulting in a "patch does not apply" status
I can do this, I will still update the bug saying there is a conflict though. Chris
-- Paul POULAIN - BibLibre http://www.biblibre.com Free & Open Source Softwares for libraries Koha, Drupal, Piwik, Jasper
_______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/