corrupt repository after following mq merging instructions

Bryan O'Sullivan bos at serpentine.com
Thu Feb 28 22:56:19 CST 2008


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.

> Is
> this the result of a known bug?

I don't believe so, but the workflow around trying a merge of a patch
queue is complicated and fragile, to the extent that I simply don't use
it, and update patches by hand.

	<b


More information about the Mercurial mailing list