On 01/09/06, Derek Anderson <[EMAIL PROTECTED]> wrote: > > i merged with head before i checked it in. unless i really frelled up > w/ svn, it should only be ~2 weeks behind.
I think you may have "frelled up". Your branch was created on 07/11/06 and from the revision log [1] it does appear that you've merged any changes from the trunk in since then. In fact if I do a merge from trunk at the last revision (r3644) before your checked in your schema-evolution code it shows a bunch of changes: $ cd ~/src $ svn co http://code.djangoproject.com/svn/django/branches/schema-evolution $ cd schema-evolution $ svn merge --dry-run -r3332:3644 http://code.djangoproject.com/svn/django/trunk U django/dispatch/license.txt U django/dispatch/saferef.py U django/dispatch/errors.py U django/dispatch/robust.py U django/dispatch/robustapply.py U django/dispatch/dispatcher.py U django/http/__init__.py U django/contrib/auth/backends.py U django/contrib/auth/views.py U django/contrib/auth/__init__.py U django/contrib/auth/models.py U django/contrib/auth/decorators.py U django/contrib/auth/forms.py U django/contrib/syndication/feeds.py U django/contrib/comments/models.py U django/contrib/comments/templatetags/comments.py U django/contrib/comments/feeds.py U django/contrib/comments/views/karma.py U django/contrib/comments/views/comments.py U django/contrib/comments/templates/comments/form.html U django/contrib/flatpages/views.py U django/contrib/flatpages/README.TXT U django/contrib/sessions/middleware.py U django/contrib/sessions/models.py U django/contrib/admin/media/css/layout.css U django/contrib/admin/media/css/global.css U django/contrib/admin/media/css/rtl.css U django/contrib/admin/media/css/changelists.css U django/contrib/admin/media/css/forms.css U django/contrib/admin/media/js/admin/RelatedObjectLookups.js U django/contrib/admin/media/js/admin/CollapsedFieldsets.js U django/contrib/admin/media/js/admin/DateTimeShortcuts.js U django/contrib/admin/utils.py U django/contrib/admin/filterspecs.py U django/contrib/admin/templatetags/admin_modify.py U django/contrib/admin/templatetags/admin_list.py U django/contrib/admin/urls.py U django/contrib/admin/views/template.py A django/contrib/admin/views/auth.py U django/contrib/admin/views/main.py ...etc etc [1] http://code.djangoproject.com/log/django/branches/schema-evolution > > could you send just your models? (+ load script, original schema) > Sorry, as I stated before I can't shared the code as it is for an internal project for my employer. I'll just say that I haven't actually try to "evolve" any schema yet, I'm just trying to get my project up and running on your branch. regards matthew > > Matthew Flanagan wrote: > > Derek, > > > > On 31/08/06, Derek Anderson <[EMAIL PROTECTED]> wrote: > >> hey matt, > >> > >> would you be willing to send me a copy of your app, your original > >> schema, and whatever load script failed? > >> > >> derek > > > > Unfortunately I can't send you a copy of the app. However looking at > > your branch it seems it may benefit from a merge from a more recent > > revision of the trunk or atleast with the 0.95 release (See my message > > below re: the User.is_authenticated() missing from your branch) > > > > Alternatively I'm on #django if we can manage to hook up there. > > > > matthew > > > >> > >> Matthew Flanagan wrote: > >>> I had some to make some changes to some models today that would result > >>> in schema changes so I decided to give the schema-evolution branch a > >>> go. > >>> > >>> I didn't get far as the script I use to load sample data into my > >>> applications failed [1] and trying to manually add data via my public > >>> CRUD views failed because 'User' object has no attribute > >>> 'is_authenticated'. So it seems the branch is quite far behind the > >>> trunk. > >>> > >>> Any chance of merging the latest trunk changes in the schema-evolution > >>> branch? > >>> > >>> > >>> [1] http://paste.e-scribe.com/1384/ > >>> > >>> regards > >>> > >>> matthew > >>> > >> > > > > > > > > > > > > --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
