On 5/1/06, Sandro <[EMAIL PROTECTED]> wrote: > Is the currently available magic removal branch going to be any > different than the magic removal trunk that is soon going to be merged?
There is no "magic-removal trunk", only a magic-removal branch. Django is like a tree -- the trunk is the core, and branches sprout off it every so often when new and interesting things need to happen. Eventually they get "merged" back in so that the new and interesting things are in the trunk; when that happens, the code in the branch replaces the code in the trunk, so the trunk, after the merge, will be identical to whatever the last version of the magic-removal branch was. So if you're building applications with magic-removal, they won't be affected by the merge; all it means is that magic-removal won't be a "branch" separate from the main version of Django anymore, and that improvements and bugfixes will take place on the trunk instead of on the magic-removal branch. -- "May the forces of evil become confused on the way to your house." -- George Carlin --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
