mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Sorted conflicting migrations by names.

Browse Source
This commit is contained in:
François Freitag
2020-04-26 18:24:43 +02:00
committed by Mariusz Felisiak
parent 52a0a03671
commit 04e4f80c1f
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/loader.py
View File

@@ -317,7 +317,7 @@ class MigrationLoader:
if app_label in seen_apps:
conflicting_apps.add(app_label)
seen_apps.setdefault(app_label, set()).add(migration_name)
return {app_label: seen_apps[app_label] for app_label in conflicting_apps}
return {app_label: sorted(seen_apps[app_label]) for app_label in conflicting_apps}
def project_state(self, nodes=None, at_end=True):
"""