Be sure and check out SVNMerge: http://www.orcaware.com/svn/wiki/Svnmerge.py
It's a little Python script that helps ease the pain of merging. It's superfantastic. ( = On Jan 20, 7:59 pm, Kenneth Gonsalves <[EMAIL PROTECTED]> wrote: > On 20-Jan-08, at 2:06 PM, Andrew wrote: > > > This also may be a good time to consider a distributed version control > > system (Like bazaar or mercurial)... we're just about to finish > > porting to bazaar after running up to several situations just like > > yours. > > > One benefit of DVCS is that branching is easier than SVN...making > > feature-level branches easier to intergrate into your workflow. > > yes - I had my first experience of branching under svn and it was > harrowing - some files just refused to get transferred to the branch > > -- > > 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 -~----------~----~----~----~------~----~------~--~---
