Need to do some branch cleanup in the mesa tree |
|||||
Issue descriptionWe have pushed mesa commits from upstream's non-master branch (from a mesa 11.0 release branch). Now I'd like to push a newer mesa ToT branch onto our mesa tree, but of course I can't force push (that would break the build because it would remove commits that are only in the 11.0 branch) and I can't create new branches (I don't have permissions). Ideally, what I'd like is rename the src/third_party/mesa master branch into mesa-11.0, and create a new clean master branch to import mesa git.
,
Mar 8 2016
Making this a higher priority since we have a bunch of decisions we need to make about some products based on findings here. Its probably not a P0 but more like P0.5.
,
Mar 8 2016
,
Mar 8 2016
The new branch mesa-11.0 has been created and is set to the state of master. https://chromium.googlesource.com/chromiumos%2Fthird_party%2Fmesa/+/refs%2Fheads%2Fmesa-11.0 It looks like chromeos-committers has force push access to that repo (which seems a bit dangerous) but that does mean you should be able to completely modify the branches however you would like. If you need any additional permission changes or branches please let me know.
,
Mar 8 2016
Do you need help from me for this, or do you have the necessary access already?
,
Mar 8 2016
I think I'm good as far as pushing to the branches. I will push everything to the mesa-11.0 branch, then switch the ebuild, then I will pave the master branch.
,
Mar 8 2016
SGTM. I'm going to remove the Infra-Git label to get this out of the git admin queue (i.e. go/git-admin). If you need infra git admin support, please readd the label.
,
Mar 10 2016
pushed to mesa master, we'll wait & see if everything breaks, but otherwise I think this is good
,
Mar 10 2016
Well stuff is sticking, so. |
|||||
►
Sign in to add a comment |
|||||
Comment 1 by puneetster@chromium.org
, Mar 8 2016Labels: -Pri-1 Pri-0
Status: Available (was: Untriaged)