I had been considering switching to the GIS branch before the sprint, but the main concern I have is that getting up on GIS features and bugfixes also means getting up on trunk features. As an example, in [6671], auto-escape landed on trunk. I imagine that'll take me about a week of work to adjust to. (I'm not complaining, I'm happy to see the feature added-- I just hadn't planned that time right now.)
I know there are some folks that have GeoDjango code in production now, and their concerns are important, too. The general branch merge policy for Django is: " Developers working on a branch should periodically merge changes from the trunk into the branch. Please merge at least once a week. Every time you merge from the trunk, note the merge and revision numbers in the commit message. " The rationale for this is so that the branch doesn't drift so far from trunk that the merge is hard, and so that people can easily switch from trunk to a branch. Even so, it makes the branch less stable-- we get backwards incompat from both trunk and branch changes. So, to sum up, I'd prefer merges from trunk less often, but understand others may prefer more often. Even with frequent merges, I don't have to take the merge-- but cherry-picking is extra work. If others don't really want the trunk merges either, maybe we could review whether to merge to trunk every week? How about every Thursday, for lack of a specific reason? --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-developers@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/django-developers?hl=en -~----------~----~----~----~------~----~------~--~---
