From 3b8e46cbc7cdb03bb40b3b099997a5f659a2d402 Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Wed, 4 Dec 2013 16:01:31 +0000 Subject: Migration VCS conflict detection and --merge for makemigrations --- .../test_migrations_conflict/0001_initial.py | 27 ++++++++++++++++++++++ .../0002_conflicting_second.py | 17 ++++++++++++++ .../test_migrations_conflict/0002_second.py | 24 +++++++++++++++++++ .../test_migrations_conflict/__init__.py | 0 4 files changed, 68 insertions(+) create mode 100644 tests/migrations/test_migrations_conflict/0001_initial.py create mode 100644 tests/migrations/test_migrations_conflict/0002_conflicting_second.py create mode 100644 tests/migrations/test_migrations_conflict/0002_second.py create mode 100644 tests/migrations/test_migrations_conflict/__init__.py (limited to 'tests/migrations/test_migrations_conflict') diff --git a/tests/migrations/test_migrations_conflict/0001_initial.py b/tests/migrations/test_migrations_conflict/0001_initial.py new file mode 100644 index 0000000000..344bebdfe3 --- /dev/null +++ b/tests/migrations/test_migrations_conflict/0001_initial.py @@ -0,0 +1,27 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + operations = [ + + migrations.CreateModel( + "Author", + [ + ("id", models.AutoField(primary_key=True)), + ("name", models.CharField(max_length=255)), + ("slug", models.SlugField(null=True)), + ("age", models.IntegerField(default=0)), + ("silly_field", models.BooleanField(default=False)), + ], + ), + + migrations.CreateModel( + "Tribble", + [ + ("id", models.AutoField(primary_key=True)), + ("fluffy", models.BooleanField(default=True)), + ], + ) + + ] diff --git a/tests/migrations/test_migrations_conflict/0002_conflicting_second.py b/tests/migrations/test_migrations_conflict/0002_conflicting_second.py new file mode 100644 index 0000000000..15ea1f063a --- /dev/null +++ b/tests/migrations/test_migrations_conflict/0002_conflicting_second.py @@ -0,0 +1,17 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [("migrations", "0001_initial")] + + operations = [ + + migrations.CreateModel( + "Something", + [ + ("id", models.AutoField(primary_key=True)), + ], + ) + + ] diff --git a/tests/migrations/test_migrations_conflict/0002_second.py b/tests/migrations/test_migrations_conflict/0002_second.py new file mode 100644 index 0000000000..ace9a83347 --- /dev/null +++ b/tests/migrations/test_migrations_conflict/0002_second.py @@ -0,0 +1,24 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [("migrations", "0001_initial")] + + operations = [ + + migrations.DeleteModel("Tribble"), + + migrations.RemoveField("Author", "silly_field"), + + migrations.AddField("Author", "rating", models.IntegerField(default=0)), + + migrations.CreateModel( + "Book", + [ + ("id", models.AutoField(primary_key=True)), + ("author", models.ForeignKey("migrations.Author", null=True)), + ], + ) + + ] diff --git a/tests/migrations/test_migrations_conflict/__init__.py b/tests/migrations/test_migrations_conflict/__init__.py new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.1