diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2015-10-20 17:39:48 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-10-24 14:45:00 -0400 |
| commit | 3c7d2ee881b13c7fdd0aa90b0aba0430310786de (patch) | |
| tree | 72a32484c67dbfba1542b1a88181e5bf2c06cb91 /docs | |
| parent | a7bb5af50be7b0efbb784011a41fd25fdfe4d42c (diff) | |
Fixed #25604 -- Added makemigrations --check option.
Command exits with non-zero status if changes without migrations exist.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/deprecation.txt | 5 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 11 | ||||
| -rw-r--r-- | docs/releases/1.10.txt | 7 |
3 files changed, 22 insertions, 1 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 5a4d2c6526..39daa0c002 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -104,6 +104,11 @@ details on these changes. ``django.template.base.StringOrigin`` aliases for ``django.template.base.Origin`` will be removed. +See the :ref:`Django 1.10 release notes <deprecated-features-1.10>` for more +details on these changes. + +* The ``makemigrations --exit`` option will be removed. + .. _deprecation-removed-in-1.10: 1.10 diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 27a1a31423..8d45439300 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -699,10 +699,21 @@ of a generated one. .. django-admin-option:: --exit, -e +.. deprecated:: 1.10 + + Use the :djadminopt:`--check` option instead. + The ``--exit`` option will cause ``makemigrations`` to exit with error code 1 when no migrations are created (or would have been created, if combined with ``--dry-run``). +.. django-admin-option:: --check + +.. versionadded:: 1.10 + +The ``--check`` option makes ``makemigrations`` exit with a non-zero status +when model changes without migrations are detected. + migrate [<app_label> [<migrationname>]] --------------------------------------- diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt index c955b7764d..16e7d2ea28 100644 --- a/docs/releases/1.10.txt +++ b/docs/releases/1.10.txt @@ -157,6 +157,10 @@ Management Commands allows specifying the message level that will cause the command to exit with a non-zero status. +* The new :djadminopt:`makemigrations --check <--check>` option makes the + command exit with a non-zero status when model changes without migrations are + detected. + Migrations ^^^^^^^^^^ @@ -268,7 +272,8 @@ Features deprecated in 1.10 Miscellaneous ~~~~~~~~~~~~~ -* ... +* The ``makemigrations --exit`` option is deprecated in favor of the + :djadminopt:`--check` option. .. _removed-features-1.10: |