Hi Kenneth, I have very similar situation in my projects (some our projects, we develop 4 version in the same time - client specific versions). We do it in this way (we are using SVN): /trunk/ <- latest version /branches/product-1.0 /branches/product-1.1 /branches/product-1.2 /tags/product-1.0.0 /tags/product-1.0.1 /tags/product-1.0.2
New feature development is in /trunk/ and maintenance (bugfixing for old version) are made directly on branches (1.0, 1.1). And if we have a bug in version 1.0, when we checkout source code from brunch /branches/product-1.0 and after fix, we build version 1.0.3 (tag + installation package for client). After bug fixing, we merge this bugfix to trunk. Regards, Marcin -- http://www.zenzire.com On Jan 18, 8:55 am, Kenneth Gonsalves <[EMAIL PROTECTED]> wrote: > hi, > > I have a site in production and being developed at the same time - a > common django usecase I am sure. This is the first time I am > developing a site with a team comprised of several remote > contributors also. My previous teams were all in the same lab. > Currently everyone with commit rights commits code to the repository. > I test it out on the setup on my local box, and if satisfactory do an > svn up on the server and restart apache. The problem is that there > are two types of changes in code - one is new features and the other > is minor changes. With the current setup, minor changes have to wait > until the new features are tested out. So even a spelling mistake has > to wait until whatever is already committed is tested and accepted. > At the same time, the new features do not really justify setting up > separate branches. So what would be the best way out of this? > -- > > regards > kghttp://lawgon.livejournal.comhttp://nrcfosshelpline.in/web/ > Foss Conference for the common man:http://registration.fossconf.in/web/ --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django users" group. 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/django-users?hl=en -~----------~----~----~----~------~----~------~--~---
