Repository navigation
Let the fork's delta merge onto upstream master - #27
Merged
Merged
Conversation
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
The daily upstream master preview stops at its first step. The fork's delta has three content conflicts with master, so no candidate is built and the lane says nothing about the 397 master commits past the pin. Each conflict is a line of ours beside a line upstream changed. tilemanager.h: our three forward declarations followed TileModel's, which master removed when it decoupled the tile manager from the tile model (b692d1c). They are in a namespace block of the fork's own now, ahead of upstream's. tiles_test.cpp: our includes sat in upstream's blocks, one beside QAbstractItemModelTester, and our transient check preceded the tester's line in init(); master removed both tester lines. Upstream's include blocks and init() are as upstream has them again. Our includes are in blocks of their own between them, and the check is a test of its own, rootTileIsNotTransient. offscreenquickview.cpp: the baseline set the opacity on the view's QWindow and copied it to the item. Master's fix of the same bug (ff26dc4, "effect: Fix sync'ing of OffscreenQuickView opacity") sets and reads the item only: the view has no platform window, so the QWindow's value is never used. The fork takes upstream's two lines. Through the view's setter the item's opacity and what opacity() returns are as before. The QWindow keeps an opacity of 1, and a value written to it directly is no longer what opacity() returns. testOpacity accepted either behaviour and pins this one now; it and the new check in testResynchronizeOpacity fail on the old lines. With the change the preview's merge is clean against master 75175b1. Signed-off-by: Wisbendji Fimerlus <archledger236@gmail.com>
archledger
force-pushed
the
fix/upstream-preview-conflicts
branch
from
November 13, 2026 14:20
b600cf1 to
9490ad0
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
The advisory
upstream master previewjob stops at its first step,Prepare an isolated upstream candidate:upstream.py prepare --track previewreportsconflict, so no candidate is built and nothing is tested against master. The scheduled run of 2026-11-13 (43418569957, onc00da922fa) names three files. On216857c341the result is the same three.Each conflict is a line of ours beside a line master changed. This moves our lines out of upstream's way.
src/tiles/tilemanager.hclass TileModel;, which master removed when it decoupled the tile manager from the tile model (b692d1c).autotests/integration/tiles_test.cpp<QAbstractItemModelTester>, and our transient check ininit()preceded the tester's line; master removed both tester lines.init()are as upstream has them. Our includes are in blocks of their own between them; the check is a test of its own,rootTileIsNotTransient.src/effect/offscreenquickview.cppQWindowand copied it to the item. Master fixed the same bug differently (ff26dc4, "effect: Fix sync'ing of OffscreenQuickView opacity"): the item only.Behaviour
Only the opacity lines change behaviour. Through the view's setter the item's opacity and what
opacity()returns are as before. The view'sQWindowkeeps an opacity of 1 (it has no platform window, so the stored value was never used), and a value written to thatQWindowdirectly is no longer whatopacity()returns. Nothing in the tree reads the view'sQWindowopacity; drawing, overlay selection and the opaque region use the item.testOpacityaccepted either behaviour and pins this one now.How long it stays clean
A probe with fourteen single upstream edits beside our lines in these three files (a synthetic commit on master each, merged with the job's own
git merge-tree --merge-base=<pin>):The three that still conflict: upstream removes
class QTimer;(the line our block follows), upstream edits the#if KWIN_BUILD_X11line our include blocks precede, and upstream editssetOpacity()again. The last one is inherent while the fork carries upstream's fix on a base that lacks it; the answer is to take upstream's new lines again.Validation (
localhost/kwin-fork-ci:fedora44)prepare --track previewon216857c341against master75175b1045conflict:tiles_test.cpp,offscreenquickview.cpp,tilemanager.hclean, exit 0, candidate tree7e4ff347cd(KWin 6.8.80)prepare --track stableon this commit against Plasma/6.8087592f44ecleantestOffscreenQuickView,testTileson this committestOpacityandtestResynchronizeOpacityon the old opacity linesQWindowcarries 0 and 0.25;opacity()returns theQWindow's 0.25)git clang-format --diff origin/plasma-fusionThe job only runs on pull requests that touch
.github/ci/, the manifest or its workflow, so it does not run here by itself. Dispatched on this branch:b600cf1fd1clean, 26 of 26 suites9490ad028cclean, candidate tree7e4ff347cd(the tree built locally), 26 of 26 suites, 2710 test rows, no failed attemptThe scheduled run reads the workflow and the source from
plasma-fusion, so it turns green with the merge.Not changed
Other places where a line of ours sits beside upstream's and merges cleanly today: fork sources inside upstream's sorted list in
src/CMakeLists.txt, fork test slots after upstream's last slot intiles_test.cpp, fork members after upstream's intilemanager.h, andenum class Typeone line from signals master added intile.h.