[1.10.x] Fixed #27100 -- Included already applied migration changes in the pre-migrate state.

Refs #24100.

Thanks Tim for the review.

Backport of d5c4ea524679a787fe11c927448e44e95646096b from master

1 files changed, 6 insertions, 4 deletions

diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py
index 4c8e008374..6846b33d2a 100644
--- a/django/core/management/commands/migrate.py
+++ b/django/core/management/commands/migrate.py
@@ -160,7 +160,8 @@ class Command(BaseCommand):
                         % (targets[0][1], targets[0][0])
                     )
 
-        pre_migrate_apps = executor._create_project_state().apps
+        pre_migrate_state = executor._create_project_state(with_applied_migrations=True)
+        pre_migrate_apps = pre_migrate_state.apps
         emit_pre_migrate_signal(
             self.verbosity, self.interactive, connection.alias, apps=pre_migrate_apps, plan=plan,
         )
@@ -198,10 +199,11 @@ class Command(BaseCommand):
         else:
             fake = options['fake']
             fake_initial = options['fake_initial']
-        post_migrate_project_state = executor.migrate(
-            targets, plan, fake=fake, fake_initial=fake_initial
+        post_migrate_state = executor.migrate(
+            targets, plan=plan, state=pre_migrate_state.clone(), fake=fake,
+            fake_initial=fake_initial,
         )
-        post_migrate_apps = post_migrate_project_state.apps
+        post_migrate_apps = post_migrate_state.apps
 
         # Re-render models of real apps to include relationships now that
         # we've got a final state. This wouldn't be necessary if real apps