Ticket #6844: generic_relations_inheritance.diff

base.py

@@ -101 +101 @@
                 new_class._meta.parents[base] = field
             else:
                 names = [f.name for f in new_class._meta.local_fields + new_class._meta.many_to_many]
-                for field in base._meta.local_fields:
+                for field in base._meta.local_fields+base._meta.many_to_many:
                     if field.name in names:
                         raise FieldError('Local field %r in class %r clashes with field of similar name from abstract base class %r'
                                 % (field.name, name, base.__name__))