Rej File handling

[Patrick Mézard]

Hans Meine a écrit :
> On Wednesday 08 July 2009 16:24:35 Carlo Camerino wrote:
>> I often get rej files in mercurial, what are the best way to applies this,
>> from what i can see rej files are actually patches.
> 
> Exactly.  This is not a hg question, but simply concerns patching (i.e. "diff" 
> and "patch" usage), maybe you can find a good tutorial in the WWW.
> 
> These "reject" files contain parts of patches ("hunks") that were not 
> automatically applicable (due to changes in the source files, often just some 
> formatting), and your process of manually applying them (removing the "-" 
> lines and adding the "+" lines, checking what's appropriate) is the proper 
> solution.
> 
> There are also some tools which try more hard to apply patches (forgot the 
> names, I think "mpatch" or "mangle" or something might have been one), but 
> unless you know what you're doing, they're probably not of much help.

See also emacs diff-mode.

--
Patrick Mézard