socsvn commit: r238438 - soc2012/jhagewood/diff

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Thu Jun 28 02:47:58 2012
New Revision: 238438
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238438

Log:

Modified:
  soc2012/jhagewood/diff/TODO
  soc2012/jhagewood/diff/diff-test.sh

Modified: soc2012/jhagewood/diff/TODO
==============================================================================
--- soc2012/jhagewood/diff/TODO	Thu Jun 28 02:39:33 2012	(r238437)
+++ soc2012/jhagewood/diff/TODO	Thu Jun 28 02:47:58 2012	(r238438)
@@ -30,6 +30,7 @@
 	  of the file to see if it is ELF format. If so, the file is considered a text file.
 - With some files, modification times displayed in the timestamp for file1 are different than the time outputted by GNU diff. 
 - The -ignore-*-* options need some work.
+- BSD diff can only use one long option as an argument.
 
 - line formats:
 

Modified: soc2012/jhagewood/diff/diff-test.sh
==============================================================================
--- soc2012/jhagewood/diff/diff-test.sh	Thu Jun 28 02:39:33 2012	(r238437)
+++ soc2012/jhagewood/diff/diff-test.sh	Thu Jun 28 02:47:58 2012	(r238438)
@@ -75,6 +75,11 @@
 	# --left-column
 	$1 -y --left-column 1.txt 2.txt >> $2/lc.txt
 	$1 --side-by-side --left-column 1.txt 2.txt >> $2/lc.txt 
+	
+	# --suppress-common-lines
+	$1 -y --suppress-common-lines 1.txt 2.txt >> $2/scl.txt
+	$1 --side-by-side --suppress-common-lines 1.txt 2.txt >> $2/scl.txt
+
 
 	# --line-format
 	$1 --line-format="%l %% %c'T'" 1.txt 2.txt >> $2/lf.txt