Mercurial > hg

view tests/test-diff-newlines.t @ 25863:1b449b012073 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: diff -r on Solaris emits "Common subdirectories:" When using the -r option to Solaris diff, any directores that compare identically are mentioned in the output. We don't really care about these directories for the purposes of this test, so ignore them.
author Danek Duvall <danek.duvall@oracle.com>
date Mon, 20 Jul 2015 15:42:39 -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