Mercurial > hg

view tests/test-diff-newlines.t @ 14497:ea585f2b1adc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: restore mq guards after rebasing (issue2107) Guards on rebased mq patches were lost. This patch restores them after the qimporting step.
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Sat, 26 Mar 2011 13:05:17 +0100
parents 05fffd665170
children cf0f3cb8a332
line wrap: on
line source

  $ 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