2009/6/25 Ali B. <[email protected]> > > On Thu, Jun 25, 2009 at 11:39 AM, Michael C. Harris < > [email protected]> wrote: > >> >> 2009/6/25 Ali B. <[email protected]>: >> > >> > On Thu, Jun 25, 2009 at 11:09 AM, Michael Bishop < >> [email protected]> wrote: >> >> >> >> Again, this is where we differ. I don't understand why trunk wouldn't >> >> be used for current development. Sure, one might create a branch for >> >> something extremely ambitious (again, same as we do with core, think >> >> Monolith), but it would be merged back to trunk once deemed ready, not >> >> tagged from there. >> > >> > Contiuning from my answer on the previous quesion: What if, within the >> > intial release of the plugin (plugin version 0.1), you wanted to have a >> > version that is compatible with Habari 0.7? You create a branch from the >> > trunk for Habari 0.7 support and make the plugin compatible with 0.7. >> You >> > tag it 0.7-0.1. When you want to add the cool feature or fix the nasty >> bug >> > on the 0.7 "edition" of the plugin, you commit your change and tag that >> > branch 0.7. >> >> Why not have trunk compatible with 0.7 and tag from there ? Fixes for >> nasty bugs can be committed to trunk and merged to the 0.6 branch. >> >> That may work. Although, if there are significant changes between > 0.7-compatible plugin code and 0.6-compatible (or any two successive habari > versions, for that matter), merging may not be as easy and probably won't > appeal to many. >
That will be an issue wherever the fix is coming from, whether trunk or a branch. Thankfully, plugins tend to be small, so fixing a merge shouldn't be too hard. -- Michael C. Harris, School of CS&IT, RMIT University http://twofishcreative.com/michael/blog IRC: michaeltwofish #habari --~--~---------~--~----~------------~-------~--~----~ To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/habari-dev -~----------~----~----~----~------~----~------~--~---
