[PATCH STABLE] annotate: do not poorly split lines at CR (issue5798)

[Matt Harbison]

On Wed, 21 Feb 2018 07:49:41 -0500, Yuya Nishihara <yuya at tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1519215245 -32400
> #      Wed Feb 21 21:14:05 2018 +0900
> # Branch stable
> # Node ID 24b17a714a92c8fe860db5f6d0d49c23293deec6
> # Parent  c19e66dacaa184feba31136c18a369ba995ddfe4
> annotate: do not poorly split lines at CR (issue5798)

Should this difference be conditionalized away, or is it  
important/unexpected?

$ ./run-tests.py --local -t9000 -j9 test-annotate.t

--- c:/Users/Matt/projects/hg/tests/test-annotate.t
+++ c:/Users/Matt/projects/hg/tests/test-annotate.t.err
@@ -913,14 +913,14 @@
    $ hg ci -m1

    $ hg annotate -r0 a | substcr
-  0: 0a[CR]0b[CR]
-  0: 0c[CR]0d[CR]
+  0: 0a[CR]0b
+  0: 0c[CR]0d
    0: 0e
    0: 0f
    0: 0g
    $ hg annotate -r1 a | substcr
-  0: 0a[CR]0b[CR]
-  1: 1c[CR]1d[CR]
+  0: 0a[CR]0b
+  1: 1c[CR]1d
    0: 0e
    1: 1f
    0: 0g