tests: unify test-diff-newlines
authorAdrian Buehlmann <adrian@cadifra.com>
Thu, 02 Sep 2010 11:20:23 +0200
changeset 12143 bf840a3d1af2
parent 12142 a55e3c50868f
child 12144 be9c4131a8f4
tests: unify test-diff-newlines
tests/test-diff-newlines
tests/test-diff-newlines.out
tests/test-diff-newlines.t
--- a/tests/test-diff-newlines	Wed Sep 01 15:23:21 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-hg init
-python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a
-hg ci -Ama -d '1 0'
-echo clean diff >> a
-hg ci -mb -d '2 0'
-hg diff -r0 -r1
--- a/tests/test-diff-newlines.out	Wed Sep 01 15:23:21 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-adding a
-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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-diff-newlines.t	Thu Sep 02 11:20:23 2010 +0200
@@ -0,0 +1,18 @@
+  $ 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
+