[PATCH V2] patch: don't separate \r and \n when colorizing diff output

Sune Foldager sune.foldager at me.com
Wed Jul 11 10:26:25 EDT 2018


> On 11 Jul 2018, at 16.22, Yuya Nishihara <yuya at tcha.org> wrote:
> 
>> On Wed, 11 Jul 2018 16:10:32 +0200, Sune Foldager wrote:
>> It’s not in the repo as far as I can see, but ok then...
> 
> Maybe you aren't based on the hg-committed repo?
> 
> https://www.mercurial-scm.org/repo/hg-committed/

Never heard of it, so no :p. 

> 
>>>> +trailing whitespace
>>>> +
>>>> +  $ sed -i 's/^dd$/dd \r/' a
>>> 
>>> +  tests/test-diff-color.t:56:
>>> +   >   $ sed -i 's/^dd$/dd \r/' a
>>> +   don't use 'sed -i', use a temporary file
>>> +  tests/test-diff-color.t:71:
>>> +   >   $ sed -i 's/\s*\r$//' a
>>> +   don't use 'sed -i', use a temporary file
>>> +  [1]
> 
> Also please fix the check-code failure.

Hm what’s wrong with -i? At any rate, I don’t have time to do this today. 

/Sune


More information about the Mercurial-devel mailing list