1. Luke Plant
  2. south

Commits

Andrew Godwin  committed 647fd3a Merge

Branch merge

  • Participants
  • Parent commits 148ad6c, 46e9539
  • Branches default

Comments (0)

Files changed (2)

File .hgtags

View file
  • Ignore whitespace
 bb2fb9c5991c13d14225424a8d63a455b04926eb stableish
 bb2fb9c5991c13d14225424a8d63a455b04926eb stableish
 92e1d7754d192043c6eb3c0f7538b7345b26f505 stableish
+92e1d7754d192043c6eb3c0f7538b7345b26f505 stableish
+dbbb515d88cbef75d92864f2ada0ba27b9c487a6 stableish

File south/management/commands/startmigration.py

View file
  • Ignore whitespace
             
             # Uniques need merging
             added_uniques = added_uniques.union(afu)
-            deleted_uniques = deleted_uniques.union(dfu)
+            
+            for mkey, entry in dfu:
+                deleted_uniques.add((mkey, entry, last_orm[mkey]))
         
         
         ### Added model ###