diff options
| author | John Giannelos <johngiannelos@gmail.com> | 2015-03-03 00:13:14 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-03-16 19:58:08 -0400 |
| commit | cb48e192fb8928c5cf4ff3eb0cc34502f19734ff (patch) | |
| tree | a1b599bb30a81ca328a836176c19d6f6991826fe /docs | |
| parent | eaf86858d40d40384375bd967b34818d0d8a9979 (diff) | |
[1.7.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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.7.7.txt | 4 |
1 files changed, 4 insertions, 0 deletions
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`). |