On 14/04/2011 20:45, Matthias Kilian wrote:
On Thu, Apr 14, 2011 at 11:57:51AM -0400, Edward Z. Yang wrote:
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,
Excerpts from Ian Lynagh's message of Thu Apr 14 15:10:03 -0400 2011:
> I just ran git-update-server-info; I think it's fixed now.
Ah, good catch. I always forget to do that. >.>
Cheers,
Edward
___
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.ha
I think Ian has fixed this
S
| -Original Message-
| From: cvs-ghc-boun...@haskell.org [mailto:cvs-ghc-boun...@haskell.org] On
Behalf
| Of Karel Gardas
| Sent: 14 April 2011 18:30
| To: Edward Z. Yang
| Cc: cvs-ghc@haskell.org
| Subject: Re: Help! Git disaster!
|
|
| Edward
On Thu, Apr 14, 2011 at 11:57:51AM -0400, Edward Z. Yang wrote:
> 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.
A
On Thu, Apr 14, 2011 at 07:30:06PM +0200, Karel Gardas wrote:
>
> 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):
I just ran git-update-server-info; I think it's fixed now.
Tha
| 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?
I'm only in erratic contact during this conference.
I think I'll just refrain from committing till I get back!
S
__
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
Date: Thu Apr 14 16:15:10 2011 +0100
On 14 April 2011 16:33, Simon Peyton-Jones wrote:
> I did ask myself the question "what will 'push' do", but I was unable to find
> out.
> git push --dry-run
> was uninformative.
For future reference, "git log" is my go-to command for any query of
this type. If you are on branch master, w
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 t
I'm resetting the remote repo. Please stand by.
Cheers,
Edward
Excerpts from Johan Tibell's message of Thu Apr 14 11:46:33 -0400 2011:
> Hi,
>
> On Thu, Apr 14, 2011 at 5:33 PM, Simon Peyton-Jones
> wrote:
> > Oh *bother*. I have no clue how this happened but I appear to have merged
> > ghc-g
Note that the change has been pushed, so we'll need to manually revert the
change on any servers that are mirroring the repo. We're currently
discussing what to do on #ghc; we'll probably do a hard reset, update
the mirrors, and then help Simon get his working copy into a reasonable
state.
Cheers
Hi,
On Thu, Apr 14, 2011 at 5:33 PM, Simon Peyton-Jones
wrote:
> Oh *bother*. I have no clue how this happened but I appear to have merged
> ghc-generics into the HEAD. I certainly did not intend to do so.
> ghc-generics is supposed to be a separate branch, and to stay that way till
> it wo
Oh *bother*. I have no clue how this happened but I appear to have merged
ghc-generics into the HEAD. I certainly did not intend to do so. ghc-generics
is supposed to be a separate branch, and to stay that way till it works.
Oh... looking back I did try to update my ghc-generics branch by s
13 matches
Mail list logo
