Andrew Godwin committed 647fd3a Merge

Branch merge

Comments (0)

Files changed (2)

 bb2fb9c5991c13d14225424a8d63a455b04926eb stableish
 bb2fb9c5991c13d14225424a8d63a455b04926eb stableish
 92e1d7754d192043c6eb3c0f7538b7345b26f505 stableish
+92e1d7754d192043c6eb3c0f7538b7345b26f505 stableish
+dbbb515d88cbef75d92864f2ada0ba27b9c487a6 stableish


             # 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 ###
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.