On 04/23/2013 12:36 AM, Yiqiao Pu wrote: > On 04/23/2013 12:24 AM, Chris Evich wrote: >> All, >> >> Big thanks to Yu for noticing and alerting us about an unintended >> next-fork. Luckily the next HEAD was only two commits ahead, and we >> were able to find all the missing commits. Cleber applied all of them >> (missing) onto current next HEAD so nothing was lost. >> >> Based on the history of events, it looks like the divergent push came in >> from here: https://github.com/autotest/virt-test/pull/307 So we are >> guessing ypu might have --force pushed to next by mistake. If so, >> _we're_not_mad_, it's an innocent enough mistake (I've done it myself >> before). >> >> The only other possibility is "The Green Button" (on pull requests) >> caused the trouble. We would really not like this to be the cause, but >> we need to be sure. I am hoping Ypu just made this simple mistake- >> >> Ypu, do you remember if you did --force push to next? > > Yes. Sorry for that. I just thought the "The Green Button" means the > pullreq is based on the newest next branch, but not just don't have > conflict. > > So when I push the #307 from the website I find some commit log without > any code just like: > > Merge pull request #307 from .... > > which is kind of noise as I though in the repo. So I just remove that > commit log by reset and push this change to next without check. And this > caused the problem that the 7 patches missing. > > Check with reset my local tree to the one that before I remove the merge > log. And compare it with the one after remove the merge log. I can > confirm that no more patches is missing. > > I am very sorry for making so many troubles for everyone. And thanks for > everyone who help to recover this. > > This will never happen again.
Ooohhhhhhhh, that makes perfect sense! So it really wasn't even an accident then. Thanks for being honest and explaining what happened. That kind of problem could (in theory) happen at any time, especially as more maintainers are added. If multiple people happen to do a force push close in time together, we could easily have the same problem! Since you mention it, we might as well put it out in the open about "The green button" and the junk/messy "Merge Pull ..." messages. Last week I noticed them and had the same conclusion as you: Junk. However, I talked with lmr and found they actually have a very useful purpose: Tell who pressed "The Green Button"! Github (somehow) only sometimes shows who committed some changes (i.e. v.s. who is the author). With these "Merge" messages in the log, we will always know who pushed the button and what set of changes it included. Therefor, I think they are actually useful! Especially for Pull requests with 3+ commits in them. Otherwise, right next to "The Green Button" is a little "i" icon. If you click on that, github will provide you with the commands you can use, copy-paste, to merge the pull request. It's also possible to just do them on next manually and push as a ff updated. Ref: "The Green Button": https://github-images.s3.amazonaws.com/help/pullrequest-mergebutton.png "i": https://github-images.s3.amazonaws.com/help/pullrequest-mergebar-i.png So if everyone agrees, let's just leave those Merge messages in there. If we ever need to --force push to upstream next or master, it should only be in VERY extreme situation. Even then, we must make a lot of noise about it (IRC, ML, Phone, stomp feet, etc.). Personally, I'd not even like to use --force, I would ask lmr or cleber to do it for me. Maybe this is the best policy. -- Chris Evich, RHCA, RHCE, RHCDS, RHCSS Quality Assurance Engineer e-mail: cevich + `@' + redhat.com o: 1-888-RED-HAT1 x44214 _______________________________________________ Virt-test-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/virt-test-devel
