Skip to content

fix: resolve file conflict during upgrade from 10.7.0-3deepin3,add missing trailing newline to sw64 CPU patch#26

Merged
Zeno-sole merged 1 commit into
deepin-community:masterfrom
Zeno-sole:fix/libvirt-clients-conflict-with-daemon-common
Jun 10, 2026
Merged

fix: resolve file conflict during upgrade from 10.7.0-3deepin3,add missing trailing newline to sw64 CPU patch#26
Zeno-sole merged 1 commit into
deepin-community:masterfrom
Zeno-sole:fix/libvirt-clients-conflict-with-daemon-common

Conversation

@Zeno-sole

@Zeno-sole Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown

TAG Bot

TAG: 10.7.0+really9.10.0-1deepin19
EXISTED: no
DISTRIBUTION: unstable

@Zeno-sole

Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/integrate

@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown

AutoIntegrationPr Bot
auto integrate with pr url: deepin-community/Repository-Integration#4139
PrNumber: 4139
PrBranch: auto-integration-27186878274

@deepin-community-ci-bot deepin-community-ci-bot Bot mentioned this pull request Jun 9, 2026
Open
@Zeno-sole

Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/integrate

@deepin-ci-robot deepin-ci-robot requested a review from myml June 9, 2026 06:03
@deepin-ci-robot

deepin-ci-robot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from zeno-sole. For more information see the Code Review Process.

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

UTsweetyfish
UTsweetyfish reviewed Jun 9, 2026
View reviewed changes
Comment thread debian/patches/fix-sw64-cpu-update-signature.patch Outdated
UTsweetyfish
UTsweetyfish reviewed Jun 9, 2026
View reviewed changes
Comment thread debian/changelog Outdated
@Zeno-sole Zeno-sole force-pushed the fix/libvirt-clients-conflict-with-daemon-common branch from 17e61ce to 0eabe7e Compare June 9, 2026 08:38
@Zeno-sole

Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/integrate

@Zeno-sole

Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

@UTsweetyfish add review

UTsweetyfish
UTsweetyfish reviewed Jun 9, 2026
View reviewed changes
Comment thread debian/patches/fix-sw64-cpu-update-signature.patch
@Zeno-sole Zeno-sole force-pushed the fix/libvirt-clients-conflict-with-daemon-common branch 2 times, most recently from ec59d00 to 6244610 Compare June 9, 2026 09:12
@Zeno-sole

Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/integrate

@Zeno-sole Zeno-sole force-pushed the fix/libvirt-clients-conflict-with-daemon-common branch from 6244610 to f4c5d6a Compare June 9, 2026 09:29
@Zeno-sole

Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/integrate

@Zeno-sole Zeno-sole force-pushed the fix/libvirt-clients-conflict-with-daemon-common branch from f4c5d6a to 4ce729f Compare June 9, 2026 09:31
@Zeno-sole

Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

/integrate

@Zeno-sole

Zeno-sole commented Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

@UTsweetyfish debian/patches/fix-sw64-cpu-update-signature.patch 这个patch缺少空行导致应用失败，需要同步更新

@Zeno-sole Zeno-sole changed the title Fix/libvirt clients conflict with daemon common fix: resolve file conflict during upgrade from 10.7.0-3deepin3,add missing trailing newline to sw64 CPU patch Jun 9, 2026
@UTsweetyfish

UTsweetyfish commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

@UTsweetyfish debian/patches/fix-sw64-cpu-update-signature.patch 这个patch缺少空行导致应用失败，需要同步更新

ok
现在看起来正常多了

@Zeno-sole Zeno-sole merged commit e868db5 into deepin-community:master Jun 10, 2026
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UTsweetyfish UTsweetyfish UTsweetyfish left review comments

@myml myml Awaiting requested review from myml

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Zeno-sole @deepin-ci-robot @UTsweetyfish