working with MQ rejected files
David Frey
dpfrey at shaw.ca
Mon Mar 2 18:27:06 CST 2009
On Mon, 02 Mar 2009 19:17:54 -0500, 0000 vk <0000.vk at gmail.com> wrote:
> [...]
>
> 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.
>>
>
> but once you made the fix in the .rej file how do you apply it back? do
> you
> qimport the .rej file? or manually merge the changes back?
>
Just run hg qrefresh to recreate the patch.
More information about the Mercurial
mailing list