From e150bbd4d65b4b2c3897bdabdda94eba508747a2 Mon Sep 17 00:00:00 2001 From: John Giannelos Date: Tue, 3 Mar 2015 00:13:14 +0200 Subject: [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 8758a63ddbbf7a2626bd84d50cfe83b477e8de0a from master --- docs/releases/1.7.7.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/releases/1.7.7.txt b/docs/releases/1.7.7.txt index 1c6b9325f4..8b4ae1575d 100644 --- a/docs/releases/1.7.7.txt +++ b/docs/releases/1.7.7.txt @@ -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`). -- cgit v1.3