Branch: refs/heads/master
Home: https://github.com/django/django
Commit: f7a78f9bba4efd0231aec0326a73fdbd004d1faa
https://github.com/django/django/commit/f7a78f9bba4efd0231aec0326a73fdbd004d1faa
Author: Huu Nguyen <[email protected]>
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.
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/django-updates/53c3f0c177d52_78f8e71d3c948f0%40hookshot-fe1-cp1-prd.iad.github.net.mail.
For more options, visit https://groups.google.com/d/optout.
