[Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

[Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Django
#28535: Message on conflicting migrations is misleading for rebase workflows
------------------------------------------------+------------------------
               Reporter:  karyon                |          Owner:  nobody
                   Type:  Cleanup/optimization  |         Status:  new
              Component:  Migrations            |        Version:  1.11
               Severity:  Normal                |       Keywords:
           Triage Stage:  Unreviewed            |      Has patch:  0
    Needs documentation:  0                     |    Needs tests:  0
Patch needs improvement:  0                     |  Easy pickings:  0
                  UI/UX:  0                     |
------------------------------------------------+------------------------
 When there are conflicting migrations, it says
 {{{
 Conflicting migrations detected; multiple leaf nodes in the migration
 graph: (%s). To fix them run 'python manage.py makemigrations --merge'
 }}}

 I lead a project where we have frequent newcomers. on a few occasions they
 encountered this message and the reason was always that they rebased their
 feature branch on a new master, and the master brought a new migration
 which conflicted with a new migration in the feature branch.

 we generally don't see why we would want the merge migrations and advise
 them to migrate to the common ancestor, rename their migration and change
 the dependency, and then run migrate again. that's easy enough and the end
 result is simpler.

 i think makemigrations --merge matches well to a git workflow with
 merging. in our project, we use rebasing instead, and there the merge
 migrations don't make much sense.

 I propose to change the message to {{{To fix them by creating a merge
 migration, run  'python manage.py makemigrations --merge'}}} to make it
 more clearer what will happen, and add {{{Alternatively, you can resolve
 the conflict manually}}}.

 an automatic solution could look like this: {{{mergemigrations --rebase
 <number_of_migration_to_rebase>}}}, which would ask for confirmation
 {{{this will rebase migration <name_of_migration_to_rebase> onto migration
 <name_of_new_base_migration>}}}, or {{{this will set
 <name_of_new_base_migration> as new dependency of
 <name_of_migration_to_rebase>}}}.

--
Ticket URL: <https://code.djangoproject.com/ticket/28535>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

--
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 [hidden email].
To post to this group, send email to [hidden email].
To view this discussion on the web visit https://groups.google.com/d/msgid/django-updates/049.8991b6c171288d3b121496ef8e0fbb09%40djangoproject.com.
For more options, visit https://groups.google.com/d/optout.
Reply | Threaded
Open this post in threaded view
|

Re: [Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Django
#28535: Message on conflicting migrations is misleading for rebase workflows
--------------------------------------+------------------------------------
     Reporter:  karyon                |                    Owner:  nobody
         Type:  Cleanup/optimization  |                   Status:  new
    Component:  Migrations            |                  Version:  1.11
     Severity:  Normal                |               Resolution:
     Keywords:                        |             Triage Stage:  Accepted
    Has patch:  0                     |      Needs documentation:  0
  Needs tests:  0                     |  Patch needs improvement:  0
Easy pickings:  0                     |                    UI/UX:  0
--------------------------------------+------------------------------------
Changes (by Tim Graham):

 * stage:  Unreviewed => Accepted


--
Ticket URL: <https://code.djangoproject.com/ticket/28535#comment:1>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

--
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 [hidden email].
To post to this group, send email to [hidden email].
To view this discussion on the web visit https://groups.google.com/d/msgid/django-updates/064.9dce070b15da317b5976845707428b5b%40djangoproject.com.
For more options, visit https://groups.google.com/d/optout.
Reply | Threaded
Open this post in threaded view
|

Re: [Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Django
In reply to this post by Django
#28535: Message on conflicting migrations is misleading for rebase workflows
-------------------------------------+-------------------------------------
     Reporter:  karyon               |                    Owner:  Masashi
         Type:                       |  SHIBATA
  Cleanup/optimization               |                   Status:  assigned
    Component:  Migrations           |                  Version:  1.11
     Severity:  Normal               |               Resolution:
     Keywords:                       |             Triage Stage:  Accepted
    Has patch:  0                    |      Needs documentation:  0
  Needs tests:  0                    |  Patch needs improvement:  0
Easy pickings:  0                    |                    UI/UX:  0
-------------------------------------+-------------------------------------
Changes (by Masashi SHIBATA):

 * status:  new => assigned
 * owner:  nobody => Masashi SHIBATA


Comment:

 Hi! I implement this feature at:

 https://github.com/django/django/compare/master...c-bata:ticket_28535?expand=1

 I'll submit a PR after adding tests and refactoring.
 So I assign this to myself.

 Thanks.

--
Ticket URL: <https://code.djangoproject.com/ticket/28535#comment:2>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

--
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 [hidden email].
To post to this group, send email to [hidden email].
To view this discussion on the web visit https://groups.google.com/d/msgid/django-updates/064.aa141d2abb14fee8e106b1ef0277697d%40djangoproject.com.
For more options, visit https://groups.google.com/d/optout.
Reply | Threaded
Open this post in threaded view
|

Re: [Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Django
In reply to this post by Django
#28535: Message on conflicting migrations is misleading for rebase workflows
-------------------------------------+-------------------------------------
     Reporter:  karyon               |                    Owner:  Masashi
         Type:                       |  SHIBATA
  Cleanup/optimization               |                   Status:  assigned
    Component:  Migrations           |                  Version:  1.11
     Severity:  Normal               |               Resolution:
     Keywords:                       |             Triage Stage:  Accepted
    Has patch:  0                    |      Needs documentation:  0
  Needs tests:  0                    |  Patch needs improvement:  0
Easy pickings:  0                    |                    UI/UX:  0
-------------------------------------+-------------------------------------

Comment (by Masashi SHIBATA):

 I sent PR at:

 https://github.com/django/django/pull/9131

--
Ticket URL: <https://code.djangoproject.com/ticket/28535#comment:3>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

--
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 [hidden email].
To post to this group, send email to [hidden email].
To view this discussion on the web visit https://groups.google.com/d/msgid/django-updates/064.5b8096ca9c4d75fbdaf983eced7f0fae%40djangoproject.com.
For more options, visit https://groups.google.com/d/optout.
Reply | Threaded
Open this post in threaded view
|

Re: [Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Django
In reply to this post by Django
#28535: Message on conflicting migrations is misleading for rebase workflows
-------------------------------------+-------------------------------------
     Reporter:  karyon               |                    Owner:  Masashi
         Type:                       |  SHIBATA
  Cleanup/optimization               |                   Status:  assigned
    Component:  Migrations           |                  Version:  1.11
     Severity:  Normal               |               Resolution:
     Keywords:                       |             Triage Stage:  Accepted
    Has patch:  1                    |      Needs documentation:  0
  Needs tests:  0                    |  Patch needs improvement:  0
Easy pickings:  0                    |                    UI/UX:  0
-------------------------------------+-------------------------------------
Changes (by Masashi SHIBATA):

 * has_patch:  0 => 1


--
Ticket URL: <https://code.djangoproject.com/ticket/28535#comment:4>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

--
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 [hidden email].
To post to this group, send email to [hidden email].
To view this discussion on the web visit https://groups.google.com/d/msgid/django-updates/064.e964c39271cf730cb51ec1f9446c8189%40djangoproject.com.
For more options, visit https://groups.google.com/d/optout.
Reply | Threaded
Open this post in threaded view
|

Re: [Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Django
In reply to this post by Django
#28535: Message on conflicting migrations is misleading for rebase workflows
-------------------------------------+-------------------------------------
     Reporter:  karyon               |                    Owner:  Masashi
         Type:                       |  SHIBATA
  Cleanup/optimization               |                   Status:  assigned
    Component:  Migrations           |                  Version:  1.11
     Severity:  Normal               |               Resolution:
     Keywords:                       |             Triage Stage:  Accepted
    Has patch:  1                    |      Needs documentation:  0
  Needs tests:  0                    |  Patch needs improvement:  0
Easy pickings:  0                    |                    UI/UX:  0
-------------------------------------+-------------------------------------

Comment (by karyon):

 *bump* this needs a review.

--
Ticket URL: <https://code.djangoproject.com/ticket/28535#comment:5>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

--
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 [hidden email].
To post to this group, send email to [hidden email].
To view this discussion on the web visit https://groups.google.com/d/msgid/django-updates/064.3ea948aebf3a5c8ff9b6b5d51424bcb5%40djangoproject.com.
For more options, visit https://groups.google.com/d/optout.
Reply | Threaded
Open this post in threaded view
|

Re: [Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Django
In reply to this post by Django
#28535: Message on conflicting migrations is misleading for rebase workflows
-------------------------------------+-------------------------------------
     Reporter:  karyon               |                    Owner:  Masashi
         Type:                       |  SHIBATA
  Cleanup/optimization               |                   Status:  assigned
    Component:  Migrations           |                  Version:  1.11
     Severity:  Normal               |               Resolution:
     Keywords:                       |             Triage Stage:  Accepted
    Has patch:  1                    |      Needs documentation:  0
  Needs tests:  0                    |  Patch needs improvement:  0
Easy pickings:  0                    |                    UI/UX:  0
-------------------------------------+-------------------------------------

Comment (by Tim Graham):

 Bump isn't helpful. There are 52 patches needing review at this time.
 You're welcome to help. Use the PatchReviewChecklist and mark the ticket
 as "ready for checkin" if it looks okay.

--
Ticket URL: <https://code.djangoproject.com/ticket/28535#comment:6>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

--
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 [hidden email].
To post to this group, send email to [hidden email].
To view this discussion on the web visit https://groups.google.com/d/msgid/django-updates/064.c96a738452c34858c1f19604406f5917%40djangoproject.com.
For more options, visit https://groups.google.com/d/optout.
Reply | Threaded
Open this post in threaded view
|

Re: [Django] #28535: Message on conflicting migrations is misleading for rebase workflows

Django
In reply to this post by Django
#28535: Message on conflicting migrations is misleading for rebase workflows
-------------------------------------+-------------------------------------
     Reporter:  karyon               |                    Owner:  Masashi
         Type:                       |  SHIBATA
  Cleanup/optimization               |                   Status:  assigned
    Component:  Migrations           |                  Version:  1.11
     Severity:  Normal               |               Resolution:
     Keywords:                       |             Triage Stage:  Accepted
    Has patch:  1                    |      Needs documentation:  1
  Needs tests:  0                    |  Patch needs improvement:  0
Easy pickings:  0                    |                    UI/UX:  0
-------------------------------------+-------------------------------------
Changes (by Carlton Gibson):

 * needs_docs:  0 => 1


--
Ticket URL: <https://code.djangoproject.com/ticket/28535#comment:7>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

--
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 [hidden email].
To post to this group, send email to [hidden email].
To view this discussion on the web visit https://groups.google.com/d/msgid/django-updates/064.438c34d26bf9bccfbade8439cf28465d%40djangoproject.com.
For more options, visit https://groups.google.com/d/optout.