Re: GeoDjango merge policy

2007-11-14 Thread Adrian Holovaty
On Nov 14, 2007 8:41 AM, Jeremy Dunck <[EMAIL PROTECTED]> wrote: > 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. We've never really enforced th

GeoDjango merge policy

2007-11-14 Thread Jeremy Dunck
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 adj