corrupt repository after following mq merging instructions

[L. David Baron]

On Thursday 2008-02-28 20:56 -0800, Bryan O'Sullivan wrote:
> L. David Baron wrote:
> > I finally
> > gave it another try, and I ended up with a corrupt repository.
> 
> Thanks for the log output.  I'm pretty sure your repository is not badly
> corrupted.  Probably what's happened is that some revisions got stripped
> by MQ, but something went wrong before the dirstate could be updated to
> know what the new parents were.
> 
> That said, it's probably less work to save your patch queue and get rid
> of that repository than to clean it up.  If you need to save the repo,
> let me know, and we'll work something out.

The repo in question was easy to reconstruct, but this doesn't build
confidence in the tool.

It's the second repo corruption I've had this week that required
blowing away a repository and cloning again; the first was when I
accidentally hit Ctrl-C during an hg qpop (log below, with the
commands I think I Ctrl-C'd rather than entered edited out; I really
need to get in the habit of using Ctrl-U for that so I can tell what
I actually did by looking at scrollback).  (I sometimes
intentionally hit Ctrl-C because I want to stop slow operations that
I decide I don't need, though, although I've sort of learned the
hard way not to do that with mercurial.)

(I know how to fix the mq-state corruption resulting from hitting
Ctrl-C in the middle of an hg qpush by removing the last line of the
.hg/patches/series file, though.  That said, I really shouldn't
*have* to know this.)

-David

dbaron at ridley Linux (0) /builds/trunk/working/layout/tables $ hg qpop
Now at: rtl-inline-abs-pos-fix
Exception exceptions.KeyboardInterrupt in <bound method lock.__del__ of <mercurial.lock.lock object at 0x94c8a0c>> ignored
dbaron at ridley Linux (0) /builds/trunk/working/layout/tables $ hg qunapplied
top-bottom-caption-sizing
dbaron at ridley Linux (0) /builds/trunk/working/layout/tables $ hg diff .
abort: unknown revision 'a0c6bdcb72951d62fdb5f12bb74960a05e2e33f5'!
dbaron at ridley Linux (255) /builds/trunk/working/layout/tables $ hg diff .
abort: unknown revision 'a0c6bdcb72951d62fdb5f12bb74960a05e2e33f5'!
dbaron at ridley Linux (255) /builds/trunk/working/layout/tables $ hg tip
changeset:   700:cd0960d5df37
tag:         qtip
tag:         rtl-inline-abs-pos-fix
tag:         tip
user:        L. David Baron <dbaron at dbaron.org>
date:        Fri Feb 22 15:41:44 2008 -0800
summary:     Fix bad handling of absolutely positioned elements that used to be inline.  b=419076

dbaron at ridley Linux (0) /builds/trunk/working/layout/tables $ hg qpop
abort: local changes found, refresh first
dbaron at ridley Linux (255) /builds/trunk/working/layout/tables $ hg diff .
abort: unknown revision 'a0c6bdcb72951d62fdb5f12bb74960a05e2e33f5'!
dbaron at ridley Linux (255) /builds/trunk/working/layout/tables $ hg tip
changeset:   700:cd0960d5df37
tag:         qtip
tag:         rtl-inline-abs-pos-fix
tag:         tip
user:        L. David Baron <dbaron at dbaron.org>
date:        Fri Feb 22 15:41:44 2008 -0800
summary:     Fix bad handling of absolutely positioned elements that used to be inline.  b=419076

dbaron at ridley Linux (0) /builds/trunk/working/layout/tables $ hg rollback
no rollback information available
dbaron at ridley Linux (0) /builds/trunk/working/layout/tables $ hg tip
changeset:   700:cd0960d5df37
tag:         qtip
tag:         rtl-inline-abs-pos-fix
tag:         tip
user:        L. David Baron <dbaron at dbaron.org>
date:        Fri Feb 22 15:41:44 2008 -0800
summary:     Fix bad handling of absolutely positioned elements that used to be inline.  b=419076

dbaron at ridley Linux (0) /builds/trunk/working/layout/tables $ hg parent
abort: unknown revision 'a0c6bdcb72951d62fdb5f12bb74960a05e2e33f5'!

-- 
L. David Baron                                 http://dbaron.org/
Mozilla Corporation                       http://www.mozilla.com/