On 1/26/07, Ramdas S <[EMAIL PROTECTED]> wrote: > > Any ideas? ... > File > "/usr/lib/python2.4/site-packages/django/newforms/__init__.py", > line 15, in ? > from fields import * > File > "/usr/lib/python2.4/site-packages/django/newforms/fields.py", > line 18 > <<<<<<< .mine
That's a syntax error, and is a collision marker that SVN adds to files when it doesn't know how to resolve file edit merges. It's possible that such markers get accidentally left in the file when you mark a file conflict resolved, but I checked svn and I didn't see any such collision marker. This suggests that the problem is local. I think your best bet is to move the existing Django directory out of the way, and do a fresh checkout of trunk. Please report back with the result. If that doesn't work, this is an interesting problem. :) For the later advice that reverting to 4429 worked for Adam-- maybe, but I don't see how. The files in question haven't changed since 4411. --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
