tests/test-diff-newlines.t
author Adrian Buehlmann <adrian@cadifra.com>
Thu, 24 Mar 2011 18:39:54 +0100
changeset 13754 ae157ca56cd5
parent 12942 05fffd665170
child 15522 cf0f3cb8a332
permissions -rw-r--r--
dirstate: check mtime when adding to _lastnormal - consistently use mtime as mapped to dirstate granularity (needed for filesystems like NTFS, which have sub-second resolution) - no need to add files with mtime < _lastnormaltime - improve comments

  $ 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\rnewline (esc)
  +clean diff