From owner-svn-soc-all@FreeBSD.ORG  Thu Jun 28 02:48:00 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 9AA98106566B
	for <svn-soc-all@FreeBSD.org>; Thu, 28 Jun 2012 02:47:58 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Thu, 28 Jun 2012 02:47:58 +0000
Date: Thu, 28 Jun 2012 02:47:58 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120628024758.9AA98106566B@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238438 - soc2012/jhagewood/diff
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jun 2012 02:48:00 -0000

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