From owner-freebsd-hackers@FreeBSD.ORG Sat Apr 5 16:15:29 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 B30CE106567A for ; Sat, 5 Apr 2008 16:15:29 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.186]) by mx1.freebsd.org (Postfix) with ESMTP id 28E218FC21 for ; Sat, 5 Apr 2008 16:15:28 +0000 (UTC) (envelope-from max@love2party.net) Received: from vampire.homelinux.org (dslb-088-064-181-110.pools.arcor-ip.net [88.64.181.110]) by mrelayeu.kundenserver.de (node=mrelayeu8) with ESMTP (Nemesis) id 0ML31I-1JiB392bze-0003rz; Sat, 05 Apr 2008 18:15:27 +0200 Received: (qmail 84898 invoked from network); 5 Apr 2008 16:14:27 -0000 Received: from myhost.laiers.local (192.168.4.151) by ns1.laiers.local with SMTP; 5 Apr 2008 16:14:27 -0000 From: Max Laier Organization: FreeBSD To: freebsd-hackers@freebsd.org Date: Sat, 5 Apr 2008 18:13:03 +0200 User-Agent: KMail/1.9.9 References: <20080405145038.GE5934@hoeg.nl> <20080405160312.GA66126@freebsd.org> In-Reply-To: <20080405160312.GA66126@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200804051813.03312.max@love2party.net> X-Provags-ID: V01U2FsdGVkX1/M1KTmTb03+tkyxntX3N0h8T2utEpips+6Ujz p9aqnll44igRdRxBGonQeXSccXPhnDWNYn8zcTqinyZql6/IvZ D7/xkIK8qzVelufGnRuew== Cc: Ed Schouten , Roman Divacky 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:15:29 -0000 On Saturday 05 April 2008 18:03:12 Roman Divacky wrote: > 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 The @rev to use can be obtained with: p4 changes -m 1 -i -u importer ... while inside your branched directory. Yes, this is an expensive command. You should rather check out the latest rev on the vendor tree before doing an IFC and record that rev into the IFC commit message. -- /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News