From owner-svn-soc-all@FreeBSD.ORG  Sun Jun 10 03:35:18 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 9C96E106564A
	for <svn-soc-all@FreeBSD.org>; Sun, 10 Jun 2012 03:35:16 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sun, 10 Jun 2012 03:35:16 +0000
Date: Sun, 10 Jun 2012 03:35:16 +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: <20120610033516.9C96E106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237395 - in soc2012/jhagewood/diff: . 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: Sun, 10 Jun 2012 03:35:18 -0000

Author: jhagewood
Date: Sun Jun 10 03:35:16 2012
New Revision: 237395
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237395

Log:

Modified:
  soc2012/jhagewood/diff/diff/diff.c
  soc2012/jhagewood/diff/hagewood-diff.patch

Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c	Sun Jun 10 03:33:47 2012	(r237394)
+++ soc2012/jhagewood/diff/diff/diff.c	Sun Jun 10 03:35:16 2012	(r237395)
@@ -129,7 +129,6 @@
 	{ "report-identical-files",	no_argument,		NULL,	's' },
 	{ "initial-tab",		no_argument,		NULL,	'T' },
 	{ "expand-tabs",		no_argument,		NULL,	't' },
-/* XXX: -u is incompatible with GNU version */
 	{ "unified",			optional_argument,	NULL,	'U' },
 	{ "version",			no_argument,		NULL,	'v' },
 /* XXX: UNIMPLEMENTED

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Sun Jun 10 03:33:47 2012	(r237394)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Sun Jun 10 03:35:16 2012	(r237395)
@@ -1,3 +1,14 @@
+diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c
+--- jhagewood/diff/diff-orig/diff.c	2012-06-10 03:31:05.000000000 -0400
++++ jhagewood/diff/diff/diff.c	2012-06-10 03:35:06.000000000 -0400
+@@ -129,7 +129,6 @@ static struct option longopts[] = {
+ 	{ "report-identical-files",	no_argument,		NULL,	's' },
+ 	{ "initial-tab",		no_argument,		NULL,	'T' },
+ 	{ "expand-tabs",		no_argument,		NULL,	't' },
+-/* XXX: -u is incompatible with GNU version */
+ 	{ "unified",			optional_argument,	NULL,	'U' },
+ 	{ "version",			no_argument,		NULL,	'v' },
+ /* XXX: UNIMPLEMENTED
 diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
 --- jhagewood/diff/diff-orig/diffreg.c	2012-06-10 03:31:05.000000000 -0400
 +++ jhagewood/diff/diff/diffreg.c	2012-06-10 03:31:05.000000000 -0400