Mercurial > hg

view tests/test-diff-newlines.t @ 25615:dc707fb35550

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
archive: report the node as "{p1node}+" when archiving a dirty wdir() This is more useful than reporting all 'f's, allowing the archive to be diffed against a specific revision to see what changed.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 16 Jun 2015 23:14:45 -0400
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