From 28779abb759d5687a27011b40c0d2f34ada815e9 Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Sat, 8 Mar 2014 13:06:12 -0800 Subject: [PATCH] Fix bad conflict detection during makemigrations --- django/core/management/commands/makemigrations.py | 2 +- django/db/migrations/loader.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/django/core/management/commands/makemigrations.py b/django/core/management/commands/makemigrations.py index e012e247f5..bdf0b2fe77 100644 --- a/django/core/management/commands/makemigrations.py +++ b/django/core/management/commands/makemigrations.py @@ -52,7 +52,7 @@ class Command(BaseCommand): # Load the current graph state. Takes a connection, but it's not used # (makemigrations doesn't look at the database state). # Also make sure the graph is built without unmigrated apps shoehorned in. - loader = MigrationLoader(connections[DEFAULT_DB_ALIAS]) + loader = MigrationLoader(connections[DEFAULT_DB_ALIAS], load=False) loader.build_graph(ignore_unmigrated=True) # Before anything else, see if there's conflicting apps and drop out diff --git a/django/db/migrations/loader.py b/django/db/migrations/loader.py index 7096ee9578..ee4f4c9597 100644 --- a/django/db/migrations/loader.py +++ b/django/db/migrations/loader.py @@ -201,7 +201,6 @@ class MigrationLoader(object): if parent[1] == "__first__" and parent not in self.graph: if parent[0] in self.unmigrated_apps: if ignore_unmigrated: - migration.dependencies.remove(parent) parent = None else: # This app isn't migrated, but something depends on it.