WMDE-leszek added a comment.
Regarding "filtering commits" - not sure if you want to keep in this task I've gone into a rabbit hole of sorts and didn't get a success yet: - git rebase commands that are the last of bringing changes from lib/packages/wikibase/data-mode to wmde/WikibaseDataModel fail to apply the commit 0d18f39caeac755b8509ef4951a2b329eba0c807 <https://github.com/wikimedia/mediawiki-extensions-Wikibase/commit/0d18f39caeac755b8509ef4951a2b329eba0c807> "EntityId: Remove Serializable interface and methods" - I seem to be able to reproduce this rebase failure and am moderately convinced it is because git rebase command somehow manages to miss the commit somewhere before the above one 4bcc371c75cd640f933fd2717b664b78c5a0d5b6 <https://github.com/wikimedia/mediawiki-extensions-Wikibase/commit/4bcc371c75cd640f933fd2717b664b78c5a0d5b6> "Restore "EntityId: Hard-deprecate Serializable methods"" - it seems to make sense that the Remove serializable.. commit fails to apply cleanly if the state of the branch misses changes from "Restore hard deprecate" as the latter touched many of the files the former, newer commit changes too - I managed to have a successful git rebase run if I manually (via interactive rebase) force git to include commit "restore hard depracate" before the other one - That said, success is not there as I have failed so far to: - fully understand why git rebase ignores one commit. It looks it might be something related to how rebase and git reverting commits interplay but no clean outcome to this thread yet - have a non-interactive git rebase command that could possibly be used in the CI to overcome the current challenge. TASK DETAIL https://phabricator.wikimedia.org/T314987 EMAIL PREFERENCES https://phabricator.wikimedia.org/settings/panel/emailpreferences/ To: WMDE-leszek Cc: Winston_Sung, hoo, Lucas_Werkmeister_WMDE, WMDE-leszek, Aklapper, Michael, Tarrow, Danny_Benjafield_WMDE, Isabelladantes1983, Themindcoder, Adamm71, Jersione, Hellket777, LisafBia6531, Astuthiodit_1, 786, Biggs657, karapayneWMDE, Invadibot, maantietaja, Juan90264, Alter-paule, Beast1978, ItamarWMDE, Un1tY, Akuckartz, Hook696, Kent7301, joker88john, CucyNoiD, Nandana, Gaboe420, Giuliamocci, Cpaulf30, Lahi, Gq86, Af420, Bsandipan, GoranSMilovanovic, QZanden, KimKelting, LawExplorer, Lewizho99, Maathavan, _jensen, rosalieper, Neuronton, Scott_WUaS, Wikidata-bugs, aude, Mbch331
_______________________________________________ Wikidata-bugs mailing list -- [email protected] To unsubscribe send an email to [email protected]
