Tested in 1.7.4 and latest master
(`3b966c2b73c420222d1524cda03c1a5626c90fe6`)
--
Ticket URL: <https://code.djangoproject.com/ticket/24427>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.
* needs_better_patch: => 0
* stage: Unreviewed => Accepted
* easy: 0 => 1
* needs_tests: => 0
* needs_docs: => 0
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:1>
* owner: nobody => johngian
* status: new => assigned
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:2>
Comment (by johngian):
I pushed a branch with the fix and a couple of regression tests here:
https://github.com/johngian/django/tree/ticket_24427
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:3>
* has_patch: 0 => 1
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:4>
Comment (by MarkusH):
Thanks for the patch, johngian. Do you mind
[https://docs.djangoproject.com/en/dev/internals/contributing/writing-code
/working-with-git/#publishing-work creating a pull-request]?
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:5>
Comment (by johngian):
Pull request opened here:
https://github.com/django/django/pull/4252
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:6>
* status: assigned => closed
* resolution: => fixed
Comment:
In [changeset:"8758a63ddbbf7a2626bd84d50cfe83b477e8de0a" 8758a63]:
{{{
#!CommitTicketReference repository=""
revision="8758a63ddbbf7a2626bd84d50cfe83b477e8de0a"
Fixed #24427 -- Stopped writing migration files in dry run mode when
merging.
Also added display of migration to stdout when verbosity=3.
}}}
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:7>
Comment (by Tim Graham <timograham@…>):
In [changeset:"e150bbd4d65b4b2c3897bdabdda94eba508747a2" e150bbd]:
{{{
#!CommitTicketReference repository=""
revision="e150bbd4d65b4b2c3897bdabdda94eba508747a2"
[1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode
when merging.
Also added display of migration to stdout when verbosity=3.
Backport of 8758a63ddbbf7a2626bd84d50cfe83b477e8de0a from master
}}}
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:8>
Comment (by Tim Graham <timograham@…>):
In [changeset:"cb48e192fb8928c5cf4ff3eb0cc34502f19734ff" cb48e192]:
{{{
#!CommitTicketReference repository=""
revision="cb48e192fb8928c5cf4ff3eb0cc34502f19734ff"
[1.7.x] Fixed #24427 -- Stopped writing migration files in dry run mode
when merging.
Also added display of migration to stdout when verbosity=3.
Backport of 8758a63ddbbf7a2626bd84d50cfe83b477e8de0a from master
}}}
--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:9>