hg equivalent to "bk collapse"?
Giorgos Keramidas
keramida at ceid.upatras.gr
Mon Mar 19 22:40:32 UTC 2007
On 2007-03-19 15:36, Brendan Cully <brendan at kublai.com> wrote:
> > When I'm satisfied that it all works, and I want to push the patches
> > upstream, I pop them off the tip of the 'gker' repository, and I use 'hg
> > import' to make them real changesets on top of the tip.
> >
> > hg qpop -a
> > hg import .hg/patches/144361 && hg qdelete 144361
> > hg import .hg/patches/144342 && hg qdelete 144342
> >
> > Then I can either 'hg push' two changesets, or hg diff with the last
> > version of the trunk tip which I pulled and 'import' that diff.
>
> You might want to have a look at hg qimport -r and hg qdel -r, as well
> as qfold.
>
> qimport -r will convert existing hg changesets into mq patches, and
> qdel -r will convert applied mq patches into regular hg
> changesets. So, for instance, you could replace
>
> > hg qpop -a
> > hg import .hg/patches/144361 && hg qdelete 144361
> > hg import .hg/patches/144342 && hg qdelete 144342
>
> with hg qdel -r qbase:qtip (or whatever revs you want to commit).
Excellent! Thanks for the tip. I haven't really used qimport to
convert Hg changesets to MQ patches ever, but it looks like exactly
the thing I was looking for :)
More information about the Mercurial
mailing list