On 2025-02-27 13:57:08 -0600 (-0600), Vladimir Kozhukalov wrote: [...]
The procedure is going to be smth. like
1. Freeze the infra repo and prepare retirement PSs for it 2. Merge openstack-helm-infra repo into openstack-helm ``` git clone https://opendev.org/openstack/openstack-helm.git cd openstack-helm git remote add infra https://opendev.org/openstack/openstack-helm-infra.git git fetch infra git checkout -b infra infra/master git checkout master git merge --allow-unrelated-histories infra # resolve not so many conflicts git review ``` 3. Accept merger PS [...]
First off, the ACL for the openstack/openstack-helm repo doesn't allow you to push merge commits, so Gerrit is simply going to reject it. But even if it did, this isn't just going to create a single review for the merge commit, it's also going to create reviews for every commit in the branch history which didn't already exist in that project-branch within Gerrit. Instead, if you can construct the repo state you want, as a Gerrit admin I can work with you to push that new branch state into the repository without creating any new reviews. -- Jeremy Stanley