Hi there, First off sorry for asking a 'non-django-dev' question here...
I've been playing with a number of different branches recently (gis, boulder-oracle-sprint and now multiple-db-support). My working copy is the gis branch with a lot of the boulder-sprint stuff merged in (in fact come to think about it I think I actually achieved this with a switch operation); it works well for my requirements. The problem is that I now need to get at the functionality provided by multiple-db to make the most of the oracle stuff I've been doing for the last few days. I tried to merge the multiple-db-support branch onto my working copy, merging r3198:HEAD as 3198 was when the branch was created, but it failed and i ended up with a lot of <<<<< .working and similar dotted around the files. I'm a bit of a subversion newb and I'm not sure what I'm doing wrong. I'm guessing that I might be trying to merge over the top of a previous merge of multiple-db-support back to trunk..? if anyone could help me out I'd be eternally grateful! The command I used was: svn merge -r3198:HEAD http://code.djangoproject.com/svn/django/branches/multiple-db-support . #this done while I was in the django-gis directory (where I checked out the gis branch) Once again sorry for the OT-ness of my email. Ben -- Regards, Ben Ford [EMAIL PROTECTED] +628111880346 --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
