Since the Material and Cupertino code was copied to flutter/packages in flutter/packages#11888, several new PRs have landed in flutter/flutter against the code freeze. These PRs should be ported to flutter/packages.
Which commits should be ported?
The last flutter/flutter commit that was included in the main code copy was 30dbe06. Everything after that needs to be ported over. All changes to the relevant directories since that commit can be listed with the following command:
git log --oneline 30dbe066d40b1b8a6661d79dc2247bbb1aaff9e2..HEAD -- packages/flutter/lib/src/material packages/flutter/test/material examples/api/lib/material examples/api/test/material packages/flutter/lib/src/cupertino packages/flutter/test/cupertino examples/api/lib/cupertino examples/api/test/cupertino packages/flutter/lib/fix_data/fix_material packages/flutter/test_fixes/material packages/flutter/lib/fix_data/fix_cupertino.yaml packages/flutter/test_fixes/cupertino
We should also double check that this includes everything that was overridden by the code freeze: https://github.com/flutter/flutter/pulls?q=is%3Apr+label%3A%22override+code+freeze%22+is%3Aclosed
| flutter/flutter PR |
Assignee |
flutter/packages port PR |
Status |
| 1d5ce4c Remove Material import from implicit animation tests (#186673) |
@justinmc |
flutter/packages#11964 |
✅ |
| 1668e8a Remove semantics_tester import from material_button_test.dart (#184807) |
@elliette |
flutter/packages#11972 |
⏳ |
| a191e6d Remove the Y coordinate flip workaround in the Material stretch effect shader now that it is no longer required by the Impeller GLES back end (#187247) |
@elliette |
flutter/packages#11971 Port is not necessary, will be handled by #188526 |
⬜ |
| b2e3cc4 Revert "[pubspec] Bump Dart SDK constraint to ^3.13.0 (#186957)" (#187209) |
You? Investigate if we can skip this one. |
Original PR landed May 26th, and this revert landed on May 28th. [elliette] Looked into how easy it would be to port these two commits. Unless we need complete linear history I think we should skip them, since this one completely reverts df8cb09, and the merge conflicts introduced by cherry-picking df8cb09 are large(due to it being reverted). |
⬜ |
| f704391 Use local semantics tester in Material button tests (#186667) |
@Renzo-Olivares |
Looks like this was already included in the mega PR cherry-picking is a no-op. Verified the changes are in material_ui. |
✅ |
| df8cb09 [pubspec] Bump Dart SDK constraint to ^3.13.0 (#186957) |
You? Investigate if we can skip this one. (reverted above) |
Landed May 26th, reverted May 28th. |
⬜ |
How should a merged PR be ported?
- Cherry pick the PR's merge commit from flutter/flutter into a new branch.
git remote add source-origin <path to your flutter/flutter checkout>
git fetch source-origin
git cherry-pick <PR merge SHA>
-
Ensure that the cherry-pick was applied cleanly. Fix any merge conflicts. Make sure that the affected files are in the correct directories in flutter/packages.
-
Check if any affected test files are now free of cross-imports. If so, for each one, remove the @Skip directive and move it out of temporarily-skipped-tests and into the correct directory.
-
Push your branch and open your PR. Be sure to link to the original PR in your new PR.
For an example, see flutter/packages#11964.
Related
Not included in this issue, we should also instruct contributors on how to port over their unmerged PRs. https://github.com/flutter/flutter/pulls?q=is%3Apr+label%3A%22override+code+freeze%22+is%3Aopen
Since the Material and Cupertino code was copied to flutter/packages in flutter/packages#11888, several new PRs have landed in flutter/flutter against the code freeze. These PRs should be ported to flutter/packages.
Which commits should be ported?
The last flutter/flutter commit that was included in the main code copy was 30dbe06. Everything after that needs to be ported over. All changes to the relevant directories since that commit can be listed with the following command:
We should also double check that this includes everything that was overridden by the code freeze: https://github.com/flutter/flutter/pulls?q=is%3Apr+label%3A%22override+code+freeze%22+is%3Aclosed
flutter/packages#11971Port is not necessary, will be handled by #188526material_ui.How should a merged PR be ported?
Ensure that the cherry-pick was applied cleanly. Fix any merge conflicts. Make sure that the affected files are in the correct directories in flutter/packages.
Check if any affected test files are now free of cross-imports. If so, for each one, remove the
@Skipdirective and move it out oftemporarily-skipped-testsand into the correct directory.Push your branch and open your PR. Be sure to link to the original PR in your new PR.
For an example, see flutter/packages#11964.
Related
Not included in this issue, we should also instruct contributors on how to port over their unmerged PRs. https://github.com/flutter/flutter/pulls?q=is%3Apr+label%3A%22override+code+freeze%22+is%3Aopen