On Wed, Nov 13, 2013 at 12:06:12PM -0200, Lucas Meneghel Rodrigues wrote: > TL/DR; - We had pull requests incorrectly generated against next that > were merged, in order to avoid messing up with things I merged master > into next. No action is required by anyone copied on this message, > this is just to make people aware of the mistakes. > > Hello folks: > > Yu just brought to my attention that we had some pull requests > generated against master that were merged, breaking the expectations > that patches go to next first, then to master, so they can stand some > regression testing. > > The offending pull requests merged are: > [...] > commit 19ed8562dee7e8fc7da9eda89560f6eb9edbd787 > Merge: 3feece7 99759ff > Author: Rudá Moura <[email protected]> > Date: Fri Nov 8 10:19:11 2013 -0800 > > Merge pull request #1048 from ehabkost/cpuid-fixes > > CPUID config file updates > > > I recently started using the nice little merge buttons on github, but > the fact we easily miss the detail of which branch a pull request was > generated against strikes me as a disadvantage.
Sorry for that. I noticed it was submitted to master instead of next only after Rudá had already merged it. By the way, I created the pull request when I opened https://github.com/autotest/virt-test in a web browser and saw a pretty box saying something like "you have this branch you just pushed to your own fork" and a "Create Pull Request" button besides it. Github makes it very easy to submit and merge code, but that also means it makes it very easy to submit and merge code to the wrong places, sometimes. > > After thinking a lot on how to solve this potential conflict, I > looked at the PRs and saw that they are low risk, so they shouldn't > break virt-test core functionality. Therefore, I merged master in > next, so that there are no non-ff updates to any branch, and things > can continue to go smoothly. > > There are some things about our release management process that need > to be re thought, and we had a fair deal of discussion about it > during KVM Forum. I will structure an RFC and post it to the ML, so > you guys can give me some feedback on it. > > Cheers, > > Lucas -- Eduardo _______________________________________________ Virt-test-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/virt-test-devel
