Thanks very much guys, Wouldn't you know it I have a very good book on svn (the pragmatic one) but it's in New Zealand and I'm in Indonesia! Doh!
A ray of hope might be that I don't think that muliple-db-support changed that many files so it might not to soul destroying to fix the merge. If someone who was involved in that effort could point me in the right direction, I'd be happy to help with any improvements or other stuff that needs doing..? I just had a quick look at SVK and it looks pretty promising, I will have to investigate a bit further assuming I get a second at some point in the next decade ;) Cheers again, Ben On 27/03/07, Robert Coup <[EMAIL PROTECTED]> wrote: > > > Russell Keith-Magee wrote: > > The branches are all independent, and depending on how active the > > branch is, a branch may not be up to date with the trunk, let alone > > other branches. If one branch were to cleanly merges into another, I > > would be extremely surprised - doubly so for the more complex branches > > like multi-db. > > > > That's not to say you can't get multi-db support into a checkout of > > the gis branch - just that you will need to manually resolve a lot of > > merges. Time for you to break out the Subversion manual :-) > > > Or look into SVK, which can potentially make this a lot easier since it > tracks changes across branches/repositories. It takes some time to get > your head around, but there are a number of reasonable tutorials and you > can't break *too* much :) > > http://svk.bestpractical.com/view/HomePage > > Rob :) > > -- > One Track Mind Ltd. > PO Box 1604, Shortland St, Auckland, New Zealand > Phone +64-9-966 0433 Mobile +64-21-572 632 > Web http://www.onetrackmind.co.nz > > > > > > -- Regards, Ben Ford [EMAIL PROTECTED] +6281388434435 --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
