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

Yuya Nishihara yuya at tcha.org
Wed Jul 11 10:22:29 EDT 2018


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/

> >> +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.


More information about the Mercurial-devel mailing list