Skip to content

revert: roll back release/2500u2 to 2.0.52 baseline - #845

Merged
deepin-bot[bot] merged 1 commit into
release/2500u2from
release/2500u2-revert
Nov 12, 2026
Merged

deepin-bot[bot] merged 1 commit into
release/2500u2from
release/2500u2-revert

Conversation

@52cyb

@52cyb 52cyb commented Nov 12, 2026

Copy link
Copy Markdown
Contributor

目的

将 release/2500u2 回退到 b6a8b63(chore: bump version to 2.0.52)的代码状态。

release/2500u2 是受保护分支(禁止强推、必须通过 PR 合入),无法直接 reset 远程历史,因此以 revert 提交实现等效回退:合并后代码树与 b6a8b63 完全一致,同时保留原有提交历史。

本次撤销的提交(8 个)

  • 5834ba7 refactor: use theme lookup for fallback icon
  • 0487d78 fix: add AT-SPI accessible properties for QML controls
  • 35343f5 feat: defer layer shell anchor config to onCompleted
  • 6bfd42a test: add unit tests and enable packaging tests
  • ba101b1 fix: replace private isVariantLessThan with numeric/string compare; fix deprecated invalidateFilter
  • 9bd4fb1 fix: correct launcher position calculation with dock margins
  • 17738c5 fix: remove deprecated treeland personalization integration
  • c4122bf refactor: delegate folder management to dde-shell shared model

验证

  • git diff b6a8b63 HEAD 为空,代码树与 b6a8b63 完全一致
  • debian/changelog 版本为 2.0.52

测试建议

  1. 确认构建产物与 changelog 版本号为 2.0.52
  2. 确认启动器可正常启动,应用列表、搜索、文件夹等功能与 2.0.52 一致
  3. 检查回退的 QML 控件与 AT-SPI 属性行为与 2.0.52 一致
  4. 确认单元测试与 OBS 打包构建(OBS: deepin_develop/x86_64)通过

1. Revert the 8 commits made after b6a8b63 (chore: bump version to 2.0.52)
2. Restore source, QML, build files and tests to the 2.0.52 state
3. Keep the original commits in history and land the rollback via a PR

Log: Roll back release/2500u2 to the 2.0.52 release state

Influence:
1. Verify the built package and changelog report version 2.0.52
2. Confirm the launcher starts and app list, search and folder features work as in 2.0.52
3. Check the reverted QML controls and AT-SPI properties behave as in 2.0.52
4. Confirm unit tests and OBS packaging build pass on release/2500u2

revert: 将 release/2500u2 回退到 2.0.52 基线

1. 撤销 b6a8b63(chore: bump version to 2.0.52)之后的 8 个提交
2. 将源码、QML、构建脚本和测试恢复到 2.0.52 状态
3. 保留原始提交历史,通过 PR 合入本次回退

Log: 将 release/2500u2 回退到 2.0.52 发布状态

Influence:
1. 验证构建产物与 changelog 版本号为 2.0.52
2. 确认启动器可正常启动,应用列表、搜索、文件夹等功能与 2.0.52 一致
3. 检查回退的 QML 控件与 AT-SPI 属性行为与 2.0.52 一致
4. 确认单元测试与 OBS 打包构建通过
@sourcery-ai

sourcery-ai Bot commented Nov 12, 2026

Copy link
Copy Markdown

Sorry @52cyb, your pull request is larger than the review limit of 150,000 diff characters

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 52cyb, wjyrich

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@52cyb

52cyb commented Nov 12, 2026

Copy link
Copy Markdown
Contributor Author

/forcemerge

@deepin-bot

deepin-bot Bot commented Nov 12, 2026

Copy link
Copy Markdown

This pr force merged! (status: unstable)

@deepin-bot
deepin-bot Bot merged commit 2a454b2 into release/2500u2 Nov 12, 2026
8 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants