From 04446b60f29dcbadc1a73bd3a916dcf9a4b0f445 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Tue, 17 Jan 2017 13:43:21 +0000 Subject: [PATCH] [1.10.x] Refs #24109 -- Doc'd the elidable feature in squashing migrations docs. Backport of d1eda9b4ad47c7773e65d90fd882e9d07759fe41 from master --- docs/topics/migrations.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt index 7a11c27614..6c1a2ce8cd 100644 --- a/docs/topics/migrations.txt +++ b/docs/topics/migrations.txt @@ -584,8 +584,8 @@ Once the operation sequence has been reduced as much as possible - the amount possible depends on how closely intertwined your models are and if you have any :class:`~django.db.migrations.operations.RunSQL` or :class:`~django.db.migrations.operations.RunPython` operations (which can't -be optimized through) - Django will then write it back out into a new set of -migration files. +be optimized through unless they are marked as ``elidable``) - Django will then +write it back out into a new set of migration files. These files are marked to say they replace the previously-squashed migrations, so they can coexist with the old migration files, and Django will intelligently