Branch: refs/heads/master
Home:
https://github.com/django/django
Commit: f7a78f9bba4efd0231aec0326a73fdbd004d1faa
https://github.com/django/django/commit/f7a78f9bba4efd0231aec0326a73fdbd004d1faa
Author: Huu Nguyen <
who...@gmail.com>
Date: 2014-07-14 (Mon, 14 Jul 2014)
Changed paths:
M django/core/management/commands/makemigrations.py
A tests/migrations/migrations_test_apps/unspecified_app_with_conflict/__init__.py
A tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0001_initial.py
A tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_conflicting_second.py
A tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/0002_second.py
A tests/migrations/migrations_test_apps/unspecified_app_with_conflict/migrations/__init__.py
A tests/migrations/migrations_test_apps/unspecified_app_with_conflict/models.py
M tests/migrations/test_commands.py
Log Message:
-----------
Fixed #22791 -- Invoke interactive questioner only for conflicts in specified apps.
Thanks bendavis78 for the report and Tim Graham for the review.