Totally stuck (mq)

Chris Mason chris.mason at ORACLE.COM
Fri Apr 18 14:03:59 UTC 2008


On Friday 18 April 2008, Neal Becker wrote:
> On Friday 18 April 2008, Andrei Vermel wrote:
> > > And then?
> >
> > hg qpop -a
> > hg merge
> > hg qpush -a
> >
> > As Chris Mason rightfully says update -C forgets all local changes.
> > I am assuming you refreshed your patches before the pull -u.
>
> I found this whole process really confusing.
>
> Here's what I did, that I believe worked:
>
> 1) Convert each mq to diff using hg qpush, hg qdiff > some-file.diff
> 2) Make a new clone of the upstream repo
> 3) Apply each of my saved diffs to my new repo.
>
> I didn't see any path to get this straigtened out from within hg, which is
> IMO, a problem.

Ah, I misunderstood your problem.  I thought you had not qrefreshed before the 
pull and there were local changes you wanted to save before merging.

You could have:

hg update -C qtip
hg qpop -a
hg update tip-from-merged-head
# merge here
hg qpush -a

-chris



More information about the Mercurial mailing list