Mercurial > public > mercurial-scm > hg

diff tests/test-highlight.t @ 20598:e57e2da803aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
solaris: diff -u emits "No differences encountered" Solaris diff -u isn't silent when two files are identical, and tests that don't account for that will fail. Fix those tests, and introduce a check that prevents reintroduction.
author Danek Duvall <danek.duvall@oracle.com>
date Wed, 19 Feb 2014 13:46:49 -0800
parents 544848ef65f2
children 9ea9e94c7492
line wrap: on
line diff
--- a/tests/test-highlight.t	Fri Feb 14 00:34:20 2014 +0100
+++ b/tests/test-highlight.t	Wed Feb 19 13:46:49 2014 -0800
@@ -522,7 +522,7 @@
   $ echo "" >> b
   $ echo "" >> b
   $ echo "" >> b
-  $ diff -u b a
+  $ cmp b a || diff -u b a
 
 hgweb filerevision, raw
 
@@ -531,7 +531,7 @@
   $ echo "200 Script output follows" > b
   $ echo "" >> b
   $ hg cat primes.py >> b
-  $ diff -u b a
+  $ cmp b a || diff -u b a
 
 hgweb highlightcss friendly