On 9/21/07, Carlos Hanson <[EMAIL PROTECTED]> wrote: > > > On Sep 19, 5:32 pm, "Russell Keith-Magee" <[EMAIL PROTECTED]> > wrote: > Thank you. Yes, I have done that and understand it is a standalone > check out. My wording was imprecise. It should have been something > like the following: > > I am using the latest development version of Django (0.97). I want to > add multiple-db-support. Because I am using features of 0.97 and > multiple-db-support is based on 0.96. I can't switch to the mutliple- > db-support branch. Is there a way for me to check out the latest > develoment version with the multiple-db-support merged into it? Or > perhaps check out the multiple-db-support branch and update it with > the latest development version?
It is possible to update (the SVN terminology is merge) multi-db with the changes from trunk; however, the process won't be a simple one, as conflicts between changes in multi-db and changes in the trunk will need to be resolved manually. This is essentially what Ben Ford has done for you (for trunk up to somewhere around trunk revision 6100). The patches that Ben has will resolve the merge conflicts that exist up to r6100 of trunk, and give you a version of the multi-db branch that has all the trunk features present in SVN r6100. Once you have applied Ben's patches, the process of keeping your multi-db stream up-to-date will be one of running 'svn merge' whenever the trunk is modified (or whenever trunk has a group of changes that you want to incorporate into your multi-db stream. Again, this will require manually resolving any merge conficts. Alternatively, you can wait until someone like Ben updates his patches, and apply those patches. I should point out that one of the reasons that Ben's patches only go as far as r6100 is that there have been some fairly significant changes to the database backends made since r6100. Since this is the area that multi-db makes most of its changes, this is predictably the area that will introduce the most conflicts, and require the most manual merging. And to Ben: If you are serious about being the long-term maintainer of the multi-db branch, now would be a very good time to step in with a comment. > Thank you, Sir. I appreciate your time. No problems. Yours, Russ Magee %-) --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django users" group. To post to this group, send email to django-users@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-users?hl=en -~----------~----~----~----~------~----~------~--~---
