Date: Sat, 5 Apr 2008 18:13:03 +0200 From: Max Laier <max@love2party.net> To: freebsd-hackers@freebsd.org Cc: Ed Schouten <ed@80386.nl>, Roman Divacky <rdivacky@freebsd.org> Subject: Re: Perforce and `p4 diff2' against the origin Message-ID: <200804051813.03312.max@love2party.net> In-Reply-To: <20080405160312.GA66126@freebsd.org> References: <20080405145038.GE5934@hoeg.nl> <20080405160312.GA66126@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804051813.03312.max>