Help! Git disaster!

[Simon Peyton-Jones]

I think Ian has fixed this

S

|  -----Original Message-----
|  From: cvs-ghc-bounces at haskell.org [mailto:cvs-ghc-bounces at haskell.org] On Behalf
|  Of Karel Gardas
|  Sent: 14 April 2011 18:30
|  To: Edward Z. Yang
|  Cc: cvs-ghc at haskell.org
|  Subject: Re: Help! Git disaster!
|  
|  
|  Edward,
|  
|  I'm not sure if I'm not mistaken, but if I invoke:
|  
|  git clone http://darcs.haskell.org/ghc.git
|  
|  I still see those commits on top of the log (git log command):
|  
|  commit 5305c38484cccf341e761e05614d414cd77dfec9
|  Merge: 2c618c2 ce2ea82
|  Author: unknown <simonpj at .europe.corp.microsoft.com>
|  Date:   Thu Apr 14 16:15:10 2011 +0100
|  
|       Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc
|  
|  commit 2c618c278b7ed92fdad2f17fc75c12c01541cba6
|  Merge: 27fc7ca 9eebc6d
|  Author: unknown <simonpj at .europe.corp.microsoft.com>
|  Date:   Thu Apr 14 16:14:32 2011 +0100
|  
|       Merge branch 'master' of http://darcs.haskell.org/ghc
|  
|  commit ce2ea8274f72199ac32d5219fcadb0aaeb968707
|  Author: unknown <simonpj at .europe.corp.microsoft.com>
|  Date:   Thu Apr 14 10:53:23 2011 +0100
|  
|       Small fixes to the generics branch to get rid of warnings,
|       plus a false ASSERT failure
|  
|  
|  
|  Is my expectation wrong that this repo was not reseted yet?
|  
|  Thanks,
|  Karel
|  
|  On 04/14/11 05:57 PM, Edward Z. Yang wrote:
|  > Hello all,
|  >
|  > The remote repository has been reset to 9eebc6dec9a2271a5179, removing
|  > the two merge commits that Simon pushed.  If you do not have any commits
|  > more recent then that in your working copy, you don't have to worry about this.
|  >
|  > Simon, it will be a bit tricky to walk you through resetting the repo
|  > over email; can we by any chance convince you to join us on irc.freenode.net
|  > channel #ghc?
|  >
|  > Cheers,
|  > Edward
|  >
|  > _______________________________________________
|  > Cvs-ghc mailing list
|  > Cvs-ghc at haskell.org
|  > http://www.haskell.org/mailman/listinfo/cvs-ghc
|  >
|  
|  
|  _______________________________________________
|  Cvs-ghc mailing list
|  Cvs-ghc at haskell.org
|  http://www.haskell.org/mailman/listinfo/cvs-ghc