summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2013-11-27 12:29:22 +0000
committerAndrew Godwin <andrew@aeracode.org>2013-11-27 12:29:22 +0000
commitdb4527e3c0486c46356e3d625931369e8b3bec19 (patch)
treee6a2ba7fd57e3771ba81241534ecc3d06471396b
parent0c46ca83e820cd725f5d0fa299c2b5405bfeee1b (diff)
Fix squashed migration loading ordering issue
-rw-r--r--django/db/migrations/loader.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py
index 16557074a1..598c582fa0 100644
--- a/django/db/migrations/loader.py
+++ b/django/db/migrations/loader.py
@@ -171,6 +171,8 @@ class MigrationLoader(object):
# the usage pattern here is to delete things after a while.
del normal[replaced]
for child_key in reverse_dependencies.get(replaced, set()):
+ if child_key in migration.replaces:
+ continue
normal[child_key].dependencies.remove(replaced)
normal[child_key].dependencies.append(key)
normal[key] = migration