Hosed X server master & server-1.6 branches (fixed now)

Dave Airlie airlied at redhat.com
Thu Oct 29 17:11:52 PDT 2009

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 <gitid> 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.


More information about the xorg-devel mailing list