Re: Hosed X server master & server-1.6 branches (fixed now)
On Thu, 2009-10-29 at 17:02 -0700, Jesse Barnes wrote: > In an effort emphasize the wisdom of our new development model (well > actually because I'm an idiot) I just overwrote HEAD of both master and > server-1.6-branch. Fortunately airlied had the right objects in his > tree to correct things, so they're all fixed now. > > Morale: use private repos! push forced updates of remote branches > carefully! > > I'm going back to my hole now to whimper in a corner. For future reference for master I had ssh access to git and I just git branch -f master which jbarnes had in the log of his screw-up. so when you do screw up in future people, remember to keep the logs and don't panic. Dave. ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
Re: Hosed X server master & server-1.6 branches (fixed now)
On Thu, 29 Oct 2009 17:02:35 -0700 Jesse Barnes wrote: > In an effort emphasize the wisdom of our new development model (well > actually because I'm an idiot) I just overwrote HEAD of both master > and server-1.6-branch. Fortunately airlied had the right objects in > his tree to correct things, so they're all fixed now. > > Morale: use private repos! push forced updates of remote branches > carefully! Damn and I can't even spell "moral". Time to step away from the keyboard. Anyway, sorry, and thanks again Dave. -- Jesse Barnes, Intel Open Source Technology Center ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
Re: Hosed X server master & server-1.6 branches (fixed now)
On 10/29/2009 08:02 PM, Jesse Barnes wrote: > In an effort emphasize the wisdom of our new development model (well > actually because I'm an idiot) I just overwrote HEAD of both master and > server-1.6-branch. Fortunately airlied had the right objects in his > tree to correct things, so they're all fixed now. > > Morale: use private repos! push forced updates of remote branches > carefully! > > I'm going back to my hole now to whimper in a corner. > Keith, My patch series to server-1.6-branch seems to have gone missing as a result of this. Can you re-push it? Hopefully you don't have to do the rebase -i thing again. Thanks. -- Eamon Walsh National Security Agency ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
Re: Hosed X server master & server-1.6 branches (fixed now)
On Fri, Oct 30, 2009 at 21:25:25 -0400, Eamon Walsh wrote: > My patch series to server-1.6-branch seems to have gone missing as a > result of this. Can you re-push it? > > Hopefully you don't have to do the rebase -i thing again. > I had it locally so I just re-pushed it. Cheers, Julien ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
Re: Hosed X server master & server-1.6 branches (fixed now)
Excerpts from Julien Cristau's message of Fri Oct 30 18:41:28 -0700 2009: > I had it locally so I just re-pushed it. Sounds good. Thanks for cleaning it up. -- keith.pack...@intel.com signature.asc Description: PGP signature ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
