Wiki instructions for dealing with 3.0.x
Hi, I've added instructions to the wiki about handling the new branch:: http://wiki.koha.org/doku.php?id=en:development:git_usage#create_a_branch_to... If anybody finds an error or a better way to do it, please update the wiki or let me know. Regards, Galen -- Galen Charlton VP, Research & Development, LibLime galen.charlton@liblime.com p: 1-888-564-2457 x709 skype: gmcharlt
I've added instructions to the wiki about handling the new branch::
http://wiki.koha.org/doku.php?id=en:development:git_usage#create_a_branch_to...
Thanks Galen, that's a big help. If I'm making a correction to something that would apply to both 3.0.1 and 3.1, it that up to the maintainer/manager to decide? Should I commit the same changes to both branches? -- Owen -- Web Developer Athens County Public Libraries http://www.myacpl.org
Hi, On Tue, Aug 12, 2008 at 8:05 AM, Owen Leonard <oleonard@myacpl.org> wrote:
If I'm making a correction to something that would apply to both 3.0.1 and 3.1, it that up to the maintainer/manager to decide? Should I commit the same changes to both branches?
The final policy for patches for 3.0 will be largely up to the RMaint, but for now I think that most patches should be made against the 3.1 master HEAD. That way, contributors only have to worry about submitting one set of patches per change. The 3.0 maintainer can then cherry-pick which patches to copy to the 3.0.x branch. As 3.1 and 3.0.x diverge, it may necessary at times for the RMaint to request separate patches for both 3.0 and 3.1. However, I hope that will be necessary only for the most important bugfixes and security updates.. Regards, Galen -- Galen Charlton VP, Research & Development, LibLime galen.charlton@liblime.com p: 1-888-564-2457 x709 skype: gmcharlt
participants (2)
-
Galen Charlton -
Owen Leonard