tests: don't include plain 'diff -U0' content in test-diff-unified.t stable
authorMads Kiilerich <mads@kiilerich.com>
Fri, 27 Jan 2012 02:59:59 +0100
branchstable
changeset 16012 10c8110d114b
parent 15997 a45516cb8d9f
child 16013 2a1d97630f7f
tests: don't include plain 'diff -U0' content in test-diff-unified.t The only purpose of 'diff -U0' was to show that 'hg diff -U0' did almost the same. Unfortunately 'diff -U0' on Solaris gives incorrect line numbers. Masking it with globs wouldn't it make sense, so removing it is the best solution.
tests/test-diff-unified.t
--- a/tests/test-diff-unified.t	Thu Jan 26 11:23:15 2012 -0600
+++ b/tests/test-diff-unified.t	Fri Jan 27 02:59:59 2012 +0100
@@ -107,17 +107,6 @@
   > c3
   > c4
   > EOF
-  $ diff -U0 f1 f2
-  --- f1	* (glob)
-  +++ f2	* (glob)
-  @@ -0,0 +1 @@
-  +c1
-  @@ -1,0 +3 @@
-  +c3
-  @@ -3 +4,0 @@
-  -c5
-  [1]
-
   $ mv f2 f1
   $ hg diff -U0 --nodates
   diff -r 55d8ff78db23 f1