Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MU4 Issue] PRs from 3.x to be merged into / ported to master #6079

Closed
28 of 29 tasks
Jojo-Schmitz opened this issue May 12, 2020 · 48 comments
Closed
28 of 29 tasks

[MU4 Issue] PRs from 3.x to be merged into / ported to master #6079

Jojo-Schmitz opened this issue May 12, 2020 · 48 comments

Comments

@Jojo-Schmitz
Copy link
Contributor

Jojo-Schmitz commented May 12, 2020 •
edited
Loading

@ecstrema
Copy link
Contributor

I am not sure I get it. If all PRs solve a bug or add functionality, shouldn't they all get merged into master?
In other words, what PRs should be excluded from this list?

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented May 12, 2020 •
edited
Loading

Probably none, but these specifically have been merged to 3.x but not yet into master, this issue here is nothing but a reminder

@Jojo-Schmitz
Copy link
Contributor Author

@anatoly-os is using his own book-keeping, so this issue isn't needed

@shoogle
Copy link
Contributor

shoogle commented Jul 9, 2020

List of PRs that have been merged into the 3.x branch:
https://github.com/musescore/MuseScore/pulls?q=is%3Apr+is%3Amerged+base%3A3.x

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Jul 9, 2020 •
edited
Loading

Whow, 165... (minus the ~30 listed above) and counting

@Jojo-Schmitz Jojo-Schmitz reopened this Jul 9, 2020
@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Jul 10, 2020 •
edited by anatoly-os
Loading

@lvinken's PRs (4):

My PRs (36) (and their states) are:

To be continued (if and when more of my PRs get merged into 3.x), see #6079 (comment)

@shoogle
Copy link
Contributor

shoogle commented Jul 10, 2020 •
edited by anatoly-os
Loading

We can make the list more manageable by each taking care of our own PRs. My PRs are:

I will edit this comment to add any future PRs on 3.x, and to add "ported by #xxxx" when I create the corresponding PR on master. I will tick the checkbox when the PR is merged into master, or when we decide it is not needed (in which case I will add a comment to explain why).

That leaves these PRs that are not mine (and these are not mine or Jojo's). Anybody can view their own PRs here.

@SKefalidis
Copy link
Contributor

SKefalidis commented Jul 10, 2020 •
edited by anatoly-os
Loading

Ready to be merged to master (ported):

Waiting to be ported to master:

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Jul 11, 2020 •
edited
Loading

@SKefalidis what about your #6198? Seems embedded into #6196, right?

@SKefalidis
Copy link
Contributor

@SKefalidis what about your #6198? Seems embedded into #6196, right?

Yes

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Jul 11, 2020 •
edited by igorkorsukov
Loading

We'd still need to check the PRs from

@lvinken
Copy link
Contributor

lvinken commented Jul 12, 2020

Like some other developers, I also maintain a private list of PRs to be synced to master. As I typically only work on MusicXML import/export, all my PRs apply equally well to master as to the current release.

As was mentioned before, having a public agreement on how we maintain such list could make the process more uniform and transparent.

@shoogle
Copy link
Contributor

shoogle commented Jul 12, 2020

@lvinken, let's not overthink this. I suggested a system that seems as good as any, but really it's enough to know that you plan to take care of your own PRs.

@njvdberg
Copy link
Contributor

njvdberg commented Jul 13, 2020 •
edited by anatoly-os
Loading

  • #6048
  • #6049 Merges cleanly into master.
  • #6060 Replaced by #6219
  • #6067
  • #6087
  • #6093
  • #6110 Merges cleanly into master.
  • #6116 Merges cleanly into master.
  • #6125 Merges cleanly into master.
  • #6129 Merges cleanly into master.
  • #6132 Merges cleanly into master.
  • #6144 Merges cleanly into master.
  • #6164 Merges cleanly into master.
  • #6180 Merges cleanly into master.
  • #6183 Merges cleanly into master.
  • #6216 Merges cleanly into master.
  • #6219 Conflicts, might be replaced by #6321 anyhow. Will check after this PR is merged.
  • #6221 Is a backport from master.
  • #6227 Merges cleanly into master.

@MarcSabatella
Copy link
Contributor

I was under the impression that steps had been / are being taken to minimize the pain of the code formatting changes, by allowing things to be automatically reformatted. So only PR's that actually have semantic conflicts would need to be resubmitted manually.

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Jul 14, 2020 •
edited
Loading

I'm not sure whether there is sufficient track-keeping on which PR is needed for master too, hence this issue here. Those 170 PRs that went into 3.x is a large enough number for some of them getting lost and forgotten for master. Not all apply, some have been merged, some done differently, but there are enough left that need checking

@shoogle
Copy link
Contributor

shoogle commented Jul 22, 2020

I was under the impression that steps had been / are being taken to minimize the pain of the code formatting changes, by allowing things to be automatically reformatted. So only PR's that actually have semantic conflicts would need to be resubmitted manually.

PR #6363 has a script that does exactly this. It would be helpful if people could run it on their own PRs.

@MarcSabatella
Copy link
Contributor

This still feels like something that should be possible to automate completely. And to be perfectly frank, if it is to be done manually, it feels to me like the burden should fall on those who pushed for the change in the first place.

@anatoly-os
Copy link
Contributor

95 PRs left... At least, the ones enumerated above with unticked checkboxes.
I tick the checkboxes once I manually merge corresponding PRs.

@MarcSabatella
Copy link
Contributor

MarcSabatella commented Jul 23, 2020 •
edited
Loading

Thank you for taking this on! I am certainly happy to handle any of mine that require work to rebase due to real changes in the code, but I am still hoping that the ones that can be handled more automatically can and will be. Most of mine are small and “libmscore-y” and can wait.

@shoogle
Copy link
Contributor

shoogle commented Jul 23, 2020

@anatoly-os, when merging PRs, watch out for the fact that PRs submitted before PR #6358 may show tests passing even though they have not been tested for coding style. Here's how to tell whether they have been tested.

@anatoly-os
Copy link
Contributor

85 PRs left... The ones authored by @njvdberg have been merged successfully.

@MarcSabatella
Copy link
Contributor

MarcSabatella commented Jul 29, 2020 •
edited by anatoly-os
Loading

Not merged for 3.x yet but presumably will be soon enough:

@anatoly-os
Copy link
Contributor

About 36 PRs left...

@shoogle
Copy link
Contributor

shoogle commented Aug 11, 2020

A heroic effort! (I was going to do mine myself but you got there first, sorry!)

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Aug 23, 2020 •
edited
Loading

As far as I can tell 14 from 3.5.0 are still left to do

For most of my pending 3.x PRs I've now created PRs for master, see

@anatoly-os
Copy link
Contributor

anatoly-os commented Aug 25, 2020 •
edited by igorkorsukov
Loading

@SKefalidis
Copy link
Contributor

SKefalidis commented Sep 1, 2020 •
edited
Loading

@jthistle
Copy link
Contributor

jthistle commented Sep 2, 2020 •
edited by igorkorsukov
Loading

@igorkorsukov
Copy link
Contributor

igorkorsukov commented Sep 2, 2020 •
edited
Loading

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Sep 14, 2020 •
edited by igorkorsukov
Loading

Is anyone continuing to work on the remaining ones?
Are there more that need to get added?

Here are mine:

@vpereverzev
Copy link
Member

#6546 Mine is actual for 3.x only, MU4 will rely on our new network module

@Jojo-Schmitz
Copy link
Contributor Author

OK I see, amended above

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Nov 4, 2020 •
edited by vpereverzev
Loading

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Nov 5, 2020 •
edited
Loading

@jeetee
Copy link
Contributor

jeetee commented Nov 16, 2020 •
edited
Loading

@ecstrema
Copy link
Contributor

ecstrema commented Nov 24, 2020 •
edited
Loading

@MarcSabatella
Copy link
Contributor

MarcSabatella commented Nov 27, 2020 •
edited by vpereverzev
Loading

@jeetee
Copy link
Contributor

jeetee commented Nov 30, 2020 •
edited
Loading

@ecstrema
Copy link
Contributor

ecstrema commented Nov 30, 2020 •
edited by vpereverzev
Loading

@ecstrema
Copy link
Contributor

ecstrema commented Dec 8, 2020 •
edited by vpereverzev
Loading

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Dec 14, 2020 •
edited
Loading

@igorkorsukov
Copy link
Contributor

igorkorsukov commented Feb 15, 2021 •
edited by RomanPudashkin
Loading

@Harmoniker1
Copy link
Contributor

Are all portable PRs ported as of this moment?

@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Mar 5, 2021 •
edited
Loading

I think so, but would rather let @igorkorsukov and @vpereverzev decide (and then close this issue)

@shoogle shoogle added this to the v4.0 milestone Mar 7, 2021
@Jojo-Schmitz Jojo-Schmitz changed the title PRs (from 3.x) to be merged into master [MU4 Issue] PRs from 3.x to be merged into / ported to master Apr 18, 2021
@vpereverzev vpereverzev removed this from the v4 milestone Oct 13, 2021
@Jojo-Schmitz Jojo-Schmitz mentioned this issue Feb 9, 2022
Closed
@Tantacrul
Copy link
Contributor

Closing due to inactivity and the fact that the issue is a year old. Let me know if it needs reopening.

@Jojo-Schmitz Jojo-Schmitz mentioned this issue Apr 30, 2022
Closed
@Jojo-Schmitz
Copy link
Contributor Author

Jojo-Schmitz commented Apr 30, 2022 •
edited
Loading

As far as I can tell there are still open issues, stuff that need to get ported from 3.x to master, or at least been checked vor neccessity?

One example would be #6094 (port to master in #11462), mentioned in the initial list, but (errnously) marked as ported, unticked now

@lvinken
Copy link
Contributor

lvinken commented May 3, 2022

Checked the MusicXML issues still open in the Feb 15, 2021 comment: the fixes are present in master, no further work required.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests