working with MQ rejected files

[Stefan Rusek]

On Mon, Mar 2, 2009 at 7:19 AM, bardy <bardiku at gmail.com> wrote:
> It seems very hard to work with  MQ rejected files.
>
> can anyone say something about what to do next if ther's some reject files ?
> what's the common steps ?

Each .rej file shows the parts of the diff that could not be applied
to the file. I generally open up the .rej files in a text editor and
manually make the changes in the .rej files. It generally isn't hard,
though if you have a lot of conflicts, it can be quite a chore.

If you know the revision off of which you made your patch originally,
you could rebase the mq changesets, which will bring up your merge
tool to deal with conflicts.

hg up -C <base of patch>
hg qpush
hg rebase -d tip -s qtip
hg qrefresh