[Django] #24427: makemigrations --merge ignores --dry-run

28 views
Skip to first unread message

Django

unread,
Feb 27, 2015, 9:25:05 AM2/27/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
----------------------------+---------------------------------------
Reporter: jwa | Owner: nobody
Type: Bug | Status: new
Component: Migrations | Version: master
Severity: Normal | Keywords: migration, dry-run, merge
Triage Stage: Unreviewed | Has patch: 0
Easy pickings: 0 | UI/UX: 0
----------------------------+---------------------------------------
Running `makemigrations --dry-run --merge` will still create a migration
file.

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.

Django

unread,
Feb 28, 2015, 12:15:55 PM2/28/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------

Reporter: jwa | Owner: nobody
Type: Bug | Status: new
Component: Migrations | Version: master
Severity: Normal | Resolution:
Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 0 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------
Changes (by MarkusH):

* 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>

Django

unread,
Mar 1, 2015, 6:13:59 PM3/1/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------
Reporter: jwa | Owner: johngian
Type: Bug | Status: assigned
Component: Migrations | Version: master

Severity: Normal | Resolution:
Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 0 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------
Changes (by johngian):

* owner: nobody => johngian
* status: new => assigned


--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:2>

Django

unread,
Mar 2, 2015, 6:29:15 PM3/2/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------
Reporter: jwa | Owner: johngian
Type: Bug | Status: assigned
Component: Migrations | Version: master

Severity: Normal | Resolution:
Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 0 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------

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>

Django

unread,
Mar 2, 2015, 6:31:00 PM3/2/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------
Reporter: jwa | Owner: johngian
Type: Bug | Status: assigned
Component: Migrations | Version: master

Severity: Normal | Resolution:
Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 1 | Needs documentation: 0

Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------
Changes (by johngian):

* has_patch: 0 => 1


--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:4>

Django

unread,
Mar 6, 2015, 8:29:28 AM3/6/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------
Reporter: jwa | Owner: johngian
Type: Bug | Status: assigned
Component: Migrations | Version: master

Severity: Normal | Resolution:
Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 1 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------

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>

Django

unread,
Mar 6, 2015, 8:34:48 AM3/6/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------
Reporter: jwa | Owner: johngian
Type: Bug | Status: assigned
Component: Migrations | Version: master

Severity: Normal | Resolution:
Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 1 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------

Comment (by johngian):

Pull request opened here:
https://github.com/django/django/pull/4252

--
Ticket URL: <https://code.djangoproject.com/ticket/24427#comment:6>

Django

unread,
Mar 16, 2015, 2:05:41 PM3/16/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------
Reporter: jwa | Owner: johngian
Type: Bug | Status: closed
Component: Migrations | Version: master
Severity: Normal | Resolution: fixed

Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 1 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------
Changes (by Tim Graham <timograham@…>):

* 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>

Django

unread,
Mar 16, 2015, 7:54:29 PM3/16/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------
Reporter: jwa | Owner: johngian
Type: Bug | Status: closed
Component: Migrations | Version: master

Severity: Normal | Resolution: fixed
Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 1 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------

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>

Django

unread,
Mar 16, 2015, 7:58:33 PM3/16/15
to django-...@googlegroups.com
#24427: makemigrations --merge ignores --dry-run
-------------------------------------+-------------------------------------
Reporter: jwa | Owner: johngian
Type: Bug | Status: closed
Component: Migrations | Version: master

Severity: Normal | Resolution: fixed
Keywords: migration, dry-run, | Triage Stage: Accepted
merge |
Has patch: 1 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 1 | UI/UX: 0
-------------------------------------+-------------------------------------

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>

Reply all
Reply to author
Forward
0 new messages