Mercurial Linux kernel repository

[Matt Mackall]

On Thu, Feb 08, 2007 at 12:04:37PM -0800, Jeremy Fitzhardinge wrote:
> Matt Mackall wrote:
> > Ok, I've put a hack in place that makes updates to the changelog lag
> > everything else by an hour.
> >   
> 
> I just got this:
> 
> : ezr:pts/3; hg pull
> pulling from http://www.kernel.org/hg/linux-2.6
> searching for changes
> adding changesets
> adding manifests
> adding file changes
> abort: unknown parent b5876e2a1283!
> transaction abort!
> rollback completed
> exit status 255
> 
> Is this the problem we're talking about?  It's the first time I've seen
> it.  Maybe the hack made things worse?

Yes, that's the problem. It actually hit on an earlier pull.
Truncating your history to before the affected pull will fix it up.

-- 
Mathematics is the supreme nostalgia of our time.