1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

[1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging.

Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddb from master
This commit is contained in:
John Giannelos
2015-03-03 00:13:14 +02:00
committed by Tim Graham
parent febcbbf89d
commit e150bbd4d6
3 changed files with 62 additions and 4 deletions

View File

@@ -12,3 +12,7 @@ Bugfixes
* Fixed renaming of classes in migrations where renaming a subclass would
cause incorrect state to be recorded for objects that referenced the
superclass (:ticket:`24354`).
* Stopped writing migration files in dry run mode when merging migration
conflicts. When ``makemigrations --merge`` is called with ``verbosity=3`` the
migration file is written to ``stdout`` (:ticket: `24427`).