From 8758a63ddbbf7a2626bd84d50cfe83b477e8de0a Mon Sep 17 00:00:00 2001
From: John Giannelos <johngiannelos@gmail.com>
Date: Tue, 3 Mar 2015 00:13:14 +0200
Subject: [PATCH] Fixed #24427 -- Stopped writing migration files in dry run
 mode when merging.

Also added display of migration to stdout when verbosity=3.
---
 .../management/commands/makemigrations.py     | 19 ++++++--
 docs/releases/1.7.7.txt                       |  4 ++
 tests/migrations/test_commands.py             | 43 +++++++++++++++++++
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/django/core/management/commands/makemigrations.py b/django/core/management/commands/makemigrations.py
index d90f5b9428..2fe220b622 100644
--- a/django/core/management/commands/makemigrations.py
+++ b/django/core/management/commands/makemigrations.py
@@ -239,7 +239,18 @@ class Command(BaseCommand):
                 })
                 new_migration = subclass("%04i_merge" % (biggest_number + 1), app_label)
                 writer = MigrationWriter(new_migration)
-                with open(writer.path, "wb") as fh:
-                    fh.write(writer.as_string())
-                if self.verbosity > 0:
-                    self.stdout.write("\nCreated new merge migration %s" % writer.path)
+
+                if not self.dry_run:
+                    # Write the merge migrations file to the disk
+                    with open(writer.path, "wb") as fh:
+                        fh.write(writer.as_string())
+                    if self.verbosity > 0:
+                        self.stdout.write("\nCreated new merge migration %s" % writer.path)
+                elif self.verbosity == 3:
+                    # Alternatively, makemigrations --merge --dry-run --verbosity 3
+                    # will output the merge migrations to stdout rather than saving
+                    # the file to the disk.
+                    self.stdout.write(self.style.MIGRATE_HEADING(
+                        "Full merge migrations file '%s':" % writer.filename) + "\n"
+                    )
+                    self.stdout.write("%s\n" % writer.as_string())
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`).
diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py
index ca7214be2b..bc289d2f91 100644
--- a/tests/migrations/test_commands.py
+++ b/tests/migrations/test_commands.py
@@ -620,6 +620,49 @@ class MakeMigrationsTests(MigrationTestBase):
         self.assertIn("Branch 0002_conflicting_second", output)
         self.assertIn("Created new merge migration", output)
 
+    def test_makemigration_merge_dry_run(self):
+        """
+        Makes sure that makemigrations respects --dry-run option when fixing
+        migration conflicts (#24427).
+        """
+        out = six.StringIO()
+        with self.temporary_migration_module(module="migrations.test_migrations_conflict") as migration_dir:
+            call_command("makemigrations", "migrations", dry_run=True, merge=True, interactive=False, stdout=out)
+            merge_file = os.path.join(migration_dir, '0003_merge.py')
+            self.assertFalse(os.path.exists(merge_file))
+        output = force_text(out.getvalue())
+        self.assertIn("Merging migrations", output)
+        self.assertIn("Branch 0002_second", output)
+        self.assertIn("Branch 0002_conflicting_second", output)
+        self.assertNotIn("Created new merge migration", output)
+
+    def test_makemigration_merge_dry_run_verbosity_3(self):
+        """
+        Makes sure that `makemigrations --merge --dry-run` writes the merge
+        migration file to stdout with `verbosity == 3` (#24427).
+        """
+        out = six.StringIO()
+        with self.temporary_migration_module(module="migrations.test_migrations_conflict") as migration_dir:
+            call_command("makemigrations", "migrations", dry_run=True, merge=True, interactive=False,
+                         stdout=out, verbosity=3)
+            merge_file = os.path.join(migration_dir, '0003_merge.py')
+            self.assertFalse(os.path.exists(merge_file))
+        output = force_text(out.getvalue())
+        self.assertIn("Merging migrations", output)
+        self.assertIn("Branch 0002_second", output)
+        self.assertIn("Branch 0002_conflicting_second", output)
+        self.assertNotIn("Created new merge migration", output)
+
+        # Additional output caused by verbosity 3
+        # The complete merge migration file that would be written
+        self.assertIn("# -*- coding: utf-8 -*-", output)
+        self.assertIn("class Migration(migrations.Migration):", output)
+        self.assertIn("dependencies = [", output)
+        self.assertIn("('migrations', '0002_second')", output)
+        self.assertIn("('migrations', '0002_conflicting_second')", output)
+        self.assertIn("operations = [", output)
+        self.assertIn("]", output)
+
     def test_makemigrations_dry_run(self):
         """
         Ticket #22676 -- `makemigrations --dry-run` should not ask for defaults.