corrupt repository after following mq merging instructions

Patrick Mézard pmezard at gmail.com
Fri Feb 29 01:23:57 CST 2008


L. David Baron a écrit :
> So to merge my mq patch queue, I've been avoiding using the good
> merging techniques documented in
> http://hgbook.red-bean.com/hgbookch12.html#x16-28900012.8 because I
> ended up with a bunch of problems the last time I tried.  I finally
> gave it another try, and I ended up with a corrupt repository.  Is
> this the result of a known bug?

Yes, that's both an mq (http://www.selenic.com/mercurial/bts/issue844) and a documentation bug: the hgbook says at the end of the merge process you can qpop the patches.N queue which is wrong. You have to qpop the rebased one first, then the patches.N. Mercurial development versions now prevent you from qpopping revisions with descendants.

--
Patrick Mézard


More information about the Mercurial mailing list