working with MQ rejected files

[Weijun Wang]

and remove the .rej files forever.

Stefan Rusek wrote:
> On Tue, Mar 3, 2009 at 1:17 AM, 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?
>>
> 
> Sorry my comment was more than a little ambiguous. I don't make any
> changes to the .rej files. I manually make the changes in the .rej
> file to the file being patched. After that is done, you simply run 'hg
> qrefresh'
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial