Mercurial > hg
view tests/test-diff-newlines.t @ 24393:77eace2a63cb
obsolete: avoid infinite loop from obs-cycle in divergence (issue4126)
As for other currently in place cycle detection, arbitrarily cut the first
obsolescence link that create a cycle avoiding the infinite loop. This will have
to be made more deterministic in the future but we do not really care right now.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 19 Mar 2015 13:00:44 -0700 |
parents | c63a09b6b337 |
children | aaa1f8f514cf |
line wrap: on
line source
$ hg init $ $PYTHON -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")' $ hg ci -Ama -d '1 0' adding a $ echo clean diff >> a $ hg ci -mb -d '2 0' $ hg diff -r0 -r1 diff -r 107ba6f817b5 -r 310ce7989cdc a --- a/a Thu Jan 01 00:00:01 1970 +0000 +++ b/a Thu Jan 01 00:00:02 1970 +0000 @@ -1,2 +1,3 @@ confuse str.splitlines embedded\r (no-eol) (esc) newline +clean diff