From owner-freebsd-hackers@FreeBSD.ORG Sat Apr 5 16:03:45 2008 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04B951065670 for ; Sat, 5 Apr 2008 16:03:45 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (vlk.vlakno.cz [62.168.28.247]) by mx1.freebsd.org (Postfix) with ESMTP id 8D9DB8FC16 for ; Sat, 5 Apr 2008 16:03:44 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id C1F9267BF3F; Sat, 5 Apr 2008 18:03:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (vlk.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y6XJaXG7ezeu; Sat, 5 Apr 2008 18:03:13 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 252ED673BAE; Sat, 5 Apr 2008 18:03:13 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.2/8.14.2/Submit) id m35G3COc066158; Sat, 5 Apr 2008 18:03:12 +0200 (CEST) (envelope-from rdivacky) Date: Sat, 5 Apr 2008 18:03:12 +0200 From: Roman Divacky To: Ed Schouten Message-ID: <20080405160312.GA66126@freebsd.org> References: <20080405145038.GE5934@hoeg.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080405145038.GE5934@hoeg.nl> User-Agent: Mutt/1.4.2.3i Cc: FreeBSD Hackers Subject: Re: Perforce and `p4 diff2' against the origin X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Apr 2008 16:03:45 -0000 On Sat, Apr 05, 2008 at 04:50:38PM +0200, Ed Schouten wrote: > Hello everyone, > > Because my mpsafetty project in Perforce is going quite well, I'm > considering running some kind of cron job to generate nightly diffs, so > other people (interested friends, colleagues and others) to test my > work. > > I've read `p4 help diff2' and it seems you can run the following > command: > > p4 diff2 -b mpsafetty > > Unfortunately this command just does a braindead diff against the latest > FreeBSD vendor source, which is not useful in my case. I just want it to > generate a diff against the version I integrated. > > Is it possible to do this with Perforce? this is what I use p4 diff2 -du //depot/vendor/freebsd/src/sys/...@131880 //depot/projects/soc2007/rdivacky/linux_at/sys/... | ~/awkdiff you can adjust that to your needs