  from __future__ import unicode_literals
  
  from django.db import transaction, IntegrityError
  from django.test import TestCase
  
  from .models import (Place, Restaurant, Bar, Waiter, ManualPrimaryKey, RelatedModel,
      MultiModel)
  
 
</s> remove from .models import (Place, Restaurant, Bar, Waiter, ManualPrimaryKey, RelatedModel,
    MultiModel)
 </s> add from .models import (Bar, Favorites, HiddenPointer, ManualPrimaryKey, MultiModel,
    Place, RelatedModel, Restaurant, Target, UndergroundBar, Waiter) </s> remove         self.r.place = self.p2
        self.r.save()
 </s> add         self.r1.place = self.p2
        self.r1.save() </s> remove         self.assertEqual(repr(self.r.place), '<Place: Ace Hardware the place>')
        self.assertEqual(self.p2.pk, self.r.pk)
 </s> add         self.assertEqual(repr(self.r1.place), '<Place: Ace Hardware the place>')
        self.assertEqual(self.p2.pk, self.r1.pk) </s> remove         self.assertEqual(repr(self.r.place), '<Place: Demon Dogs the place>')
 </s> add         self.assertEqual(repr(self.r1.place), '<Place: Demon Dogs the place>')
from django.db import transaction, IntegrityError, connection
  from __future__ import unicode_literals
  
from django.db import transaction, IntegrityError, connection
  from django.test import TestCase
  
  from .models import (Place, Restaurant, Bar, Waiter, ManualPrimaryKey, RelatedModel,
      MultiModel)
  
keep keep replace keep keep keep keep keep
 Merged one_to_one_regress into the one_to_one test package. 
tests/one_to_one/tests.py