From owner-freebsd-current@FreeBSD.ORG  Wed Jun 13 00:19:39 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: current@FreeBSD.org
Delivered-To: freebsd-current@FreeBSD.ORG
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8145B16A400
	for <current@FreeBSD.org>; Wed, 13 Jun 2007 00:19:39 +0000 (UTC)
	(envelope-from jmg@hydrogen.funkthat.com)
Received: from hydrogen.funkthat.com (gate.funkthat.com [69.17.45.168])
	by mx1.freebsd.org (Postfix) with ESMTP id 45C2913C458
	for <current@FreeBSD.org>; Wed, 13 Jun 2007 00:19:39 +0000 (UTC)
	(envelope-from jmg@hydrogen.funkthat.com)
Received: from hydrogen.funkthat.com (u7ia8wv2f6vl6tpu@localhost.funkthat.com
	[127.0.0.1])
	by hydrogen.funkthat.com (8.13.6/8.13.3) with ESMTP id l5D0JcgP038523; 
	Tue, 12 Jun 2007 17:19:38 -0700 (PDT)
	(envelope-from jmg@hydrogen.funkthat.com)
Received: (from jmg@localhost)
	by hydrogen.funkthat.com (8.13.6/8.13.3/Submit) id l5D0Jbeg038522;
	Tue, 12 Jun 2007 17:19:37 -0700 (PDT) (envelope-from jmg)
Date: Tue, 12 Jun 2007 17:19:37 -0700
From: John-Mark Gurney <gurney_j@resnet.uoregon.edu>
To: "Bruce M. Simpson" <bms@FreeBSD.org>
Message-ID: <20070613001936.GT4602@funkthat.com>
Mail-Followup-To: "Bruce M. Simpson" <bms@FreeBSD.org>,
	FreeBSD Tinderbox <tinderbox@freebsd.org>, current@freebsd.org,
	i386@freebsd.org
References: <20070612171440.D497C73068@freebsd-current.sentex.ca>
	<466EE1E4.2090908@FreeBSD.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <466EE1E4.2090908@FreeBSD.org>
User-Agent: Mutt/1.4.2.1i
X-Operating-System: FreeBSD 5.4-RELEASE-p6 i386
X-Files: The truth is out there
X-URL: http://resnet.uoregon.edu/~gurney_j/
X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html
Cc: i386@FreeBSD.org, FreeBSD Tinderbox <tinderbox@FreeBSD.org>,
	current@FreeBSD.org
Subject: Re: [head tinderbox] failure on i386/i386
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: John-Mark Gurney <gurney_j@resnet.uoregon.edu>
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2007 00:19:39 -0000

Bruce M. Simpson wrote this message on Tue, Jun 12, 2007 at 19:11 +0100:
> I love p4 diff2, not. The userland files were of course missing. I am 
> about to commit them now.
> 
> It seems 'p4 diff2 -u' is not a panacea and one still needs to grep the 
> output without -u to see files which are on one branch but not the other.

You have looked at the makediff.pl script that's been making it's rounds
right?  Like at freefall:~gnn/makediff.pl

This generates a complete patch compatible diff via diff2 w/ the necessary
new files, etc..

-- 
  John-Mark Gurney				Voice: +1 415 225 5579

     "All that I will do, has been done, All that I have, has not."