Totally stuck (mq)

[Neal Becker]

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.