From owner-svn-soc-all@FreeBSD.ORG  Thu Jun 28 02:59:17 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 6D91C106564A
	for <svn-soc-all@FreeBSD.org>; Thu, 28 Jun 2012 02:59:15 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Thu, 28 Jun 2012 02:59:15 +0000
Date: Thu, 28 Jun 2012 02:59:15 +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: <20120628025915.6D91C106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r238440 - 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:59:17 -0000

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

Log:

Modified:
  soc2012/jhagewood/diff/TODO

Modified: soc2012/jhagewood/diff/TODO
==============================================================================
--- soc2012/jhagewood/diff/TODO	Thu Jun 28 02:53:19 2012	(r238439)
+++ soc2012/jhagewood/diff/TODO	Thu Jun 28 02:59:14 2012	(r238440)
@@ -30,7 +30,8 @@
 	  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.
+- BUG: BSD diff seg faults when another longopt is used with '--side-by-side'. FIX: When passing args to sdiff for side-by-side mode, only the 
+	short option '-y' was excluded. Added '--side-by-side' as an exception also.
 
 - line formats: