Comments (48)
Jojo-Schmitz
commented on May 14, 2024
1
Probably none, but these specifically have been merged to 3.x but not yet into master, this issue here is nothing but a reminder
from musescore.
MarcSabatella
commented on May 14, 2024
1
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.
from musescore.
anatoly-os
commented on May 14, 2024
1
85 PRs left... The ones authored by @njvdberg have been merged successfully.
from musescore.
shoogle
commented on May 14, 2024
1
A heroic effort! (I was going to do mine myself but you got there first, sorry!)
from musescore.
Jojo-Schmitz
commented on May 14, 2024
1
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
from musescore.
ecstrema
commented on May 14, 2024
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?
from musescore.
Jojo-Schmitz
commented on May 14, 2024
@anatoly-os is using his own book-keeping, so this issue isn't needed
from musescore.
shoogle
commented on May 14, 2024
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
from musescore.
Jojo-Schmitz
commented on May 14, 2024
Whow, 165... (minus the ~30 listed above) and counting
from musescore.
Jojo-Schmitz
commented on May 14, 2024
My PRs (36) (and their states) are:
- #6033
-
#6034Ported to #6370. - #6038
- #6061
- #6063
- #6066
- #6071
- #6074
- #6076
- #6077
- #6078
- #6082
- #6083
-
#6096Ported to #6119. - #6101
- #6103
- #6114 Merges cleanly into master.
- #6117 Merges cleanly into master.
- #6152 Still applies, should merge cleanly except for the formatting changes.
- #6155 Still applies, should merge cleanly except for the formatting changes.
-
#6166Ported to #6119. -
#6171Not needed in master. -
#6176Ported to #6369. -
#6194Not needed in master. - #6201 There @SKefalidis' underlying PR #6196, which is not yet in master, but now contains that fix too.
- #6203 Merges cleanly into master.
- #6218 Merges cleanly into master.
- #6222 Seems to be missing some underlying 3.x changes currently, I suspect one of @MarcSabatella's PRs is missing here, investigation needed.
- #6236 Here @njvdberg's #6219 (resp. its replacement #6321) seems needed (unless the latter contains that fix already).
-
#6239Most probably not needed due to new Inspector. -
#6250Not needed in master. - #6252 Here @AntonioBL's underlying PR #5508 is missing in master that made this fix necessary in 3.x.
- #6267 Here @MarcSabatella's underlying PR #6247 was missing in master that made this fix necessary in 3.x.
-
#6294Ported to #6309. - #6296 Merges cleanly into master.
- #6300 Should merge cleanly into master.
- #6314 May not be needed anymore, now that the soundfont's internal has been fixed. Won't harm though either. Should merge cleanly except for the formatting changes.
To be continued (if and when more of my PRs get merged into 3.x), see #6079 (comment)
from musescore.
shoogle
commented on May 14, 2024
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.
from musescore.
SKefalidis
commented on May 14, 2024
Ready to be merged to master (ported):
- #6191 looks like a pretty innocent merge :-)
- #6196 needs reviewing (but please don't make me rebase again after somebody adds more preferences)
Waiting to be ported to master:
from musescore.
Jojo-Schmitz
commented on May 14, 2024
@SKefalidis what about your #6198? Seems embedded into #6196, right?
from musescore.
SKefalidis
commented on May 14, 2024
@SKefalidis what about your #6198? Seems embedded into #6196, right?
Yes
from musescore.
Jojo-Schmitz
commented on May 14, 2024
We'd still need to check the PRs from
- @MarcSabatella: PRs
- @mattmcclinch: PRs
- @igorkorsukov: PRs
- @rettinghaus: PRs
- @worldwideweary: PRs
- @Spire42: PRs
- @AntonioBL: PRs
- @tobik: PRs
- @Howard-C: PRs
- @Marr11317: PRs
- @dmitrio95: PRs
- @blackears: PRs
- @IsaacWeiss: PRs
- @jthistle: PRs
- @anatoly-os : PRs
from musescore.
lvinken
commented on May 14, 2024
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.
from musescore.
shoogle
commented on May 14, 2024
@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.
from musescore.
njvdberg
commented on May 14, 2024
- #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.
from musescore.
MarcSabatella
commented on May 14, 2024
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.
from musescore.
Jojo-Schmitz
commented on May 14, 2024
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
from musescore.
shoogle
commented on May 14, 2024
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.
from musescore.
anatoly-os
commented on May 14, 2024
95 PRs left... At least, the ones enumerated above with unticked checkboxes.
I tick the checkboxes once I manually merge corresponding PRs.
from musescore.
MarcSabatella
commented on May 14, 2024
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.
from musescore.
shoogle
commented on May 14, 2024
@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.
from musescore.
MarcSabatella
commented on May 14, 2024
Not merged for 3.x yet but presumably will be soon enough:
from musescore.
anatoly-os
commented on May 14, 2024
About 36 PRs left...
from musescore.
anatoly-os
commented on May 14, 2024
- #5889
- #6534???
- #6516
- #6407
- #6411
- #6415
- #6436
- #6444
- #6445
- #6450
- #6491
- #6492
- #6493
- #6496
- #6501
- #6507
- #6512
- #6513
- #6452
- #6460
- #6511
- #6521
from musescore.
SKefalidis
commented on May 14, 2024
- #6451 is the master version of #6450
- #6423 is the master version of #6523 (not yet merged but will be soon I believe)
from musescore.
jthistle
commented on May 14, 2024
from musescore.
igorkorsukov
commented on May 14, 2024
from musescore.
Jojo-Schmitz
commented on May 14, 2024
- #6259 @MarcSabatella
-
#6546 @vpereverzev(not needed for master) - #6665 (follow up for #6531) @igorkorsukov
Is anyone continuing to work on the remaining ones?
Are there more that need to get added?
Here are mine:
- #6585 (the master version of #6484)
- #6762 (master version of #6744 (or #6002), actually @mattmcclinch's)
- #6763 (master version of #6760)
- #6768 (master version of #5853 or #4824, well actually @MichaelFroelich's, and it needs and integrates my #6765 too)
from musescore.
vpereverzev
commented on May 14, 2024
#6546 Mine is actual for 3.x only, MU4 will rely on our new network module
from musescore.
Jojo-Schmitz
commented on May 14, 2024
OK I see, amended above
from musescore.
Jojo-Schmitz
commented on May 14, 2024
from musescore.
Jojo-Schmitz
commented on May 14, 2024
- #6818 - Porting 3.5.2_backend fixes to master
from musescore.
jeetee
commented on May 14, 2024
- #6904 (master version of #6810) (cherry pick, libmscore only)
- #6918 (master version of #6857) (cherry pick, libmscore only)
from musescore.
ecstrema
commented on May 14, 2024
from musescore.
MarcSabatella
commented on May 14, 2024
- #6899 - bad navigation after rest with content on last track
from musescore.
jeetee
commented on May 14, 2024
from musescore.
ecstrema
commented on May 14, 2024
- #6935 - Fix #214996: show measure number interval at multi-measure rests
from musescore.
ecstrema
commented on May 14, 2024
from musescore.
Jojo-Schmitz
commented on May 14, 2024
- #6928, #7105 (3.x) -> partly done in #7100, last part missing due to missing prerequisites (edit lyrics) in master
- #7044 (3.x) -> #7089 (master)
- #7084 (3.x)
- #7093, #7099 (3.x) -> #7100
- #7346 (3.x) -> #7497 (master)
from musescore.
igorkorsukov
commented on May 14, 2024
- #7261
- #7292
- #7309
- #7310
- #7315
- #7328
- #7344
- #7346
- #7359
- #7361
- #7362
- #7370
- #7371
- #7373
- #7377
- #7383
- #7384
- #7395
- #7396
- #7403
- #7405
- #7407
- #7412
- #7439
- #7441
- #7442
- #7480
from musescore.
Harmoniker1
commented on May 14, 2024
Are all portable PRs ported as of this moment?
from musescore.
Jojo-Schmitz
commented on May 14, 2024
I think so, but would rather let @igorkorsukov and @vpereverzev decide (and then close this issue)
from musescore.
Tantacrul
commented on May 14, 2024
Closing due to inactivity and the fact that the issue is a year old. Let me know if it needs reopening.
from musescore.
Jojo-Schmitz
commented on May 14, 2024
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
from musescore.
lvinken
commented on May 14, 2024
Checked the MusicXML issues still open in the Feb 15, 2021 comment: the fixes are present in master, no further work required.
from musescore.
Related Issues (20)
- MusicXML ex- and them import moves title to footer HOT 2
- Incorrect use of "Louré" term in tooltip for mezzo-staccato articulation HOT 3
- Implement conflict checking for cloud scores HOT 1
- File size of the new macOS installer background image is huge
- Timpani roll is played back incorrectly when grace notes are added beforehand
- Unable to connect to Helper... HOT 1
- Tuplet brackets between the grand staff's staves HOT 2
- Muse Percussion menu is sometimes cut off/truncated, unable to select anything below "Taikos" HOT 3
- 4.4 custom key signature menu does not fill window
- Inconsistent behavior in adding and removing modifiers to notes
- Arpeggios don't seem to follow Swing in Musescore 4
- The MuseScore (un-)installer should offer the option to revert to factory settings HOT 4
- Add a preference for previewing clicked/selected notes at playback velocity (rather than velocity 80)
- Add string data to bowed string instruments, to allow for Tablatur notation
- Unit tests (in GitHub CI) don't seem to find chords_std.xml HOT 14
- [Musicxml export] - Missing textline end
- Don't re-layout score after every key stroke when typing fast HOT 9
- Cannot access RewindMode enum HOT 6
- MuseHub compromised/used as backdoor vector HOT 5
- After a range selection, left clicking on a dynamic mark within the selection edits it instead of selecting it HOT 2
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from musescore.