tests/test-diff-newlines.t
author Patrick Mezard <pmezard@gmail.com>
Sun, 07 Nov 2010 18:14:42 +0100
changeset 12935 98b79c892768
parent 12143 bf840a3d1af2
child 12942 05fffd665170
permissions -rw-r--r--
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e) - Handle 'subset' argument - Stop returning the null rev from p1 and parents, as in the non-dirstate case - Order parents as in the non-dirstate case (ascending revs)

  $ hg init

  $ python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
  $ 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
newline
  +clean diff