To offer a very late answer to your question Rahul: I don't think we have any firm standards for what "backport" commits look like or how they reference their "main" counterparts. Maybe we should, but there's no firm standard right now.
It sounds like David's script is relying on a few heuristics that are pretty good but not 100% foolproof. Best, Jason On Sat, Jul 18, 2026 at 3:16 PM Rahul Goswami <[email protected]> wrote: > > Hi David, > I am one of the offenders on the list. I debated replying to the reminder > email from you last night vs asking on the wider list so I can learn if I > should do something differently going forward, and if not, the backporter > skill could benefit from an enhancement. > > So my main branch PR "Rename CoreAdmin UPGRADECOREINDEX action to > UPGRADEINDEX > (#4387 <https://github.com/apache/solr/pull/4387>)" was also back ported > to branch_10x ( > https://github.com/apache/solr/commit/ea7beadb032809dee806f3ea5f2d0e5895aa5ffb > ) > > But reading your email, looks like I still appear on the list since I > missed referencing the source commit from main in the branch_10x cherrypick > (missing "-x" git option). Is that correct? I have been referencing commits > in cherrypicks ever since but more as a personal best practice. Is this a > standard guideline we follow in the project (so that I am extra-cautious > going forward) ? > > Thanks, > Rahul > > On Mon, Jul 13, 2026 at 1:20 AM David Smiley <[email protected]> wrote: > > > I wrote a script that generates a table of info of every commit on main > > that is not yet on branch_10x, skipping the last 7 days. A link is below > > and 2 columns are conveniently pasted. > > > > Some of these changes should stay on main, but many should be back-ported. > > I can do the backporting (as I described in another recent email) but I > > need your assistance in labelling the final destination branch -- 9.x, > > 10.x, 11.x. Just ask for edit permissions on this sheet, or DM/email me. > > Don't provide specific answers in a reply on this dev list -- too noisy. > > I'll then update the "Milestone" for corresponding GitHub PRs, and do most > > backports linearly mirroring the order from main branch. > > > > Some have already been backported but sadly lacked good backporting > > practices (different subject and worse, didn't have a "cherry pick" source > > commit in the message). If so, indicate this somehow in your response. > > > > I don't plan on repeating this exercise, at least not in the exact same > > way. We've got a lot of catch-up to do now. If we embrace PR milestones, > > the scope of the forgetful backport problem will be much narrower; I could > > probably handle the remainder myself. > > > > Google Sheet Link > > < > > https://docs.google.com/spreadsheets/d/15PQOPvNs51DKaLIc9hrCfWiAa_D8gE523cVKjJxbu8A/edit?gid=185600588#gid=185600588 > > > > > (note: 107 rows) > > > > committer subject > > anshumg Add branch protection for branch_10_0 and branch_10x > > anshumg Add next major version 11.0.0 > > anshumg SOLR-17438: Remove json from requirements.txt (#3767) > > epugh Update dependency com.microsoft.onnxruntime:onnxruntime to v1.23.1 > > (#3751) > > epugh Revert "Update dependency com.microsoft.onnxruntime:onnxruntime to > > v1.23.1 (#3751)" > > janhoy SOLR-17619 Fix changelog diffs between branches Move SOLR-17321 > > changelog to v9.8.0 folder Move SOLR-6994 to v9.4 Remove some deps from > > unreleased that are in 9.8 > > janhoy SOLR-17619 Delete CHANGES.txt from main > > janhoy SOLR-17619 Logchange archive up to v9.8.0 on main > > janhoy Add branch protection for branch_9_10 > > gerlowskija Make warning in remote-streaming docs more expansive (#3821) > > chatman SOLR-17892: Fix cuVS checksum issue (#3825) > > janhoy SOLR-17986: Remove check for CHANGES.txt edits (#3854) > > janhoy SOLR-17989 Auto add changelog yaml for solrbot PRs (#3866) > > janhoy Fix check for modified yml file in renovate-changelog workflow > > (#3869) > > janhoy Renovate changelog workflow use SOLRBOT_GITHUB_TOKEN (#3874) > > janhoy Renovate changelog workflow now use pull_request_target (#3875) > > janhoy Use SolrBot as identity for renovate-changelog workflow > > janhoy Update dependency dev.logchange to v1.19.12 (#3824) > > janhoy Remove duplicate logchange file > > sigram SOLR-17231: Don't try buffering updates when there's no update log. > > (#3880) > > anshumg SOLR-17997: Upgrade to Apache Lucene 10.3.2 (#3895) > > markrmiller SOLR-17947: CloudSolrClient refreshes collection state > > asynchronously using a dedicated thread pool to reduce ZooKeeper blocking > > under load. (#3851) > > janhoy SOLR-18027 Increase socket timeout in addition to request timeout > > (#3975) > > janhoy Add more checks to the changelog validator (#3978) > > gus-asf SOLR-18041 PathExclusionFilter extracted from SolrDispatchFilter > > (#3981) > > gerlowskija SOLR-17136: Introduce MetricsRequest and SystemInfoRequest to > > SolrJ (#3955) > > gus-asf SOLR-18042 Manage MDC Logging Context setup/teardown in a servlet > > filter. (#3985) > > janhoy The validate-changelog workflow should allow deleted yml file > > (#3999) > > janhoy SOLR-18032 Github workflow for docker nightly builds (#3976) > > janhoy Update actions/cache action to v5 (#4000) > > janhoy Update gradle/actions action to v5 (#4002) > > janhoy Update actions/setup-java action to v5 (#4001) > > janhoy Update actions/setup-python action to v6 (#3870) > > gus-asf SOLR-18044 EssentialSolrRequestFilter to perform non-optional > > request wrapping operations (#3997) > > janhoy Change DOCKERHUB secrets for docker-nightly.yml > > epugh SOLR-18008: Remnant core files prevent Collections for working > > (#3904) > > gerlowskija Fix TestReplicationHandler.testUrlAllowListFailure > > gus-asf SOLR-18046 RateLimitFilter, rename EssentialSolrRequestFilter > > (#4065) > > dsmiley build: restore testImplementation libs.jakarta.servlet.api > > sigram SOLR-18063: Fix NPE in CrossDC Consumer when resubmitting requests > > to dead-letter queue. (#4045) > > janhoy Renovate to file new PRs only on Sundays Group AWS packages Group > > Google Cloud packages > > HoustonPutman SOLR-18083: Fix replication and other general operations in > > readOnly mode (#4081) > > HoustonPutman Revert "SOLR-18083: Fix replication and other general > > operations in readOnly mode (#4081)" > > epugh Fix the path to the SystemInfoHandler at the node level. (#4083) > > epugh Test rolling upgrade of Solr using Docker and BATS (#3706) > > sigram SOLR-18060: Add Prometheus metrics to CrossDC Consumer. (#4063) > > janhoy Update contributor docs about AI coding assistants (#3946) > > janhoy Improve generate-renovate-changelog.py (#4006) > > janhoy Improve writeChangelog gradle task (#4007) > > gus-asf SOLR-18047 Move tracing initialization to TracingFilter (#4108) > > sigram SOLR-18062: CrossDC - support arbitrary Kafka properties. (#4087) > > anshumg SOLR-18014: Update changelog (#4128) > > anshumg SOLR-18014: Revert changelog (#4129) > > anshumg SOLR-18003: move the changelog file to 10.0 folder on main > > epugh Revert "SOLR-18038: Remove deprecated LocalSolrQueryRequest and use > > SolrQueryRequestBase (#4101)" > > dsmiley build runDev: specify solr.host > > dsmiley SOLR-18107: fix Log4j2Watcher, register parents (#4113) > > sigram SOLR-18064: CrossDC Producer - add more detailed metrics. (#4106) > > sigram SOLR-18061: CrossDC Consumer - add /health endpoint (#4126) > > sigram SOLR-18077: CrossDC Consumer - out-of-order Kafka partition > > processing (#4125) > > dsmiley changelog: move entry advise into template (#4111) > > gerlowskija Minor IntRangeField fixes > > epugh SOLR-18153: Fix File Upload in Documents Tab of Admin UI (#4204) > > epugh SOLR-18153: Fix File Upload in Documents Tab of Admin UI (#4204) > > dsmiley ZkTestServer: log.error -> log.warn for 'stat' > > gerlowskija SOLR-16458: Convert /api/node/system to JAX-RS (#4078) > > epugh Migrate org.apache.solr.cli tools from V1 to V2 APIs (#4154) > > epugh SOLR-16458: Migrate NodeHealthAPI from homegrown @EndPoint to JAX-RS > > (#4171) > > dsmiley SOLR-16458: Fix flaky test HealthCheckHandlerTest due to SSL > > (#4247) > > epugh Add reference to tect-to-vector module inside Dense Vector search > > (#4251) > > janhoy Add concurrency cancellation to all PR-triggered workflows (#4318) > > malliaridis Bump dependencies of UI module (#4283) > > dsmiley SOLR-18039: More tests for repeated knn parents.preFilter (#4159) > > dsmiley Add branch protection for branch_9_11 > > malliaridis Fix solr:ui lockfile using stale kotlinx-datetime compat > > variant (#4335) > > gerlowskija SOLR-16738: Refactor AdminHandlersProxy for better > > extensibility (#3991) > > kotman12 SOLR-18202 Reduce Memory Usage of > > testSequentialVsParallelFingerprint (#4310) > > rahulgoswami Rename CoreAdmin UPGRADECOREINDEX action to UPGRADEINDEX > > (#4387) > > gus-asf Remove 4 unused fields from CachingDirectoryFactory (#4393) > > malliaridis SOLR-17924: Introduce Configset create and import flows (#4166) > > sigram SOLR-18077: Fix incorrect request reuse, fix unit tests. (#4396) > > epugh SOLR-16458: Bugfix that we don't want to assume everything is a > > string. (#4330) > > janhoy Fix bugs in validate-changelog-yaml.py (#4414) > > janhoy Force renovatebot to run with java 21 (#4426) > > janhoy Tweak renovate.json again > > janhoy renovate.json - remove install-tool command > > janhoy Tweak nightly docker image builds (#4448) > > sigram SOLR-18252: Fix flaky test by avoiding race conditions. (#4462) > > janhoy More secure version of renovate-changelog.yml workflow (#4453) > > janhoy Skip changelog entry for upgrades of github workflows (#4486) > > janhoy Update actions/stale action to v10.3.0 (#4484) > > janhoy Update actions/download-artifact action to v8 (#4485) > > janhoy Update gradle/actions action to v6 (#4358) > > janhoy Update actions/labeler action to v6.1.0 (#4435) > > janhoy Update actions/upload-artifact action to v7 (#4352) > > janhoy Update docker/login-action action to v4 (#4355) > > janhoy Update docker/setup-buildx-action action to v4 (#4356) > > janhoy Update docker/setup-qemu-action action to v3.7.0 (#4351) > > HoustonPutman Local antora build should not include the solr operator docs > > markrmiller SOLR-18244: Fix several concurrency bugs in > > ParallelHttpShardHandler (#4547) > > markrmiller SOLR-18284: Load-average and memory circuit breakers no longer > > stampede or trip on transient pre-GC heap peaks (#4514) > > mkhludnev SOLR-18245: Add reRankCutoff output on LTR queries (#4442) > > dsmiley .github/workflows/docker-nightly.yml: remove 9_11 > > sigram SOLR-18283: Catch and ignore shutdown exceptions. (#4583) > > janhoy SOLR-18297 Upgrade Jetty to 12.1.10 (#4574) > > dsmiley Gradle task writeChangelogPr (#4536) > > dsmiley build: allow org.gradle.caching to enable local build cache on CI > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
