On 9/17/2018 10:46 AM, Sean McGinnis wrote:
Plan
----
We would now like to have the driverfixes/ocata branch deleted so there is no
confusion about where backports should go and we don't accidentally get these
out of sync again.
Infra team, please delete this branch or let me know if there is a process
somewhere I should follow to have this removed.
The first step is to make sure that all changes on the branch are in a non open
state (merged or abandoned).
https://review.openstack.org/#/q/project:openstack/cinder+branch:driverfixes/ocata+status:open
shows that there are no open changes.
Next you will want to make sure that the commits on this branch are preserved
somehow. Git garbage collection will delete and cleanup commits if they are not
discoverable when working backward from some ref. This is why our old stable
branch deletion process required we tag the stable branch as $release-eol
first. Looking at `git log origin/driverfixes/ocata ^origin/stable/ocata
--no-merges --oneline` there are quite a few commits on the driverfixes branch
that are not on the stable branch, but that appears to be due to cherry pick
writing new commits. You have indicated above that you believe the two branches
are in sync at this point. A quick sampling of commits seems to confirm this as
well.
If you can go ahead and confirm that you are ready to delete the
driverfixes/ocata branch I will go ahead and remove it.
Clark
I did another spot check too to make sure I hadn't missed anything, but it does
appear to be as you stated that the cherry pick resulted in new commits and
they actually are in sync for our purposes.
I believe we are ready to proceed.
Sean,
Thank you for following up on this. I agee it is a good idea to remove
the old driverfixes/ocata branch to avoid possible confusion in the future.
Clark,
Sean, myself and the team worked to carefully cherry-pick everything
that was needed in stable/ocata so I am confident that we are ready to
remove driverfixes/ocata.
Thanks!
Jay
Thanks for your help.
Sean
__________________________________________________________________________
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
__________________________________________________________________________
OpenStack Development Mailing List (not for usage questions)
Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
