[p4] diff2 + added files?

Ken Williams ken.williams at thomson.com
Tue Dec 4 11:37:00 PST 2007




On 12/4/07 11:01 AM, "Sohail Somani" <sohail at taggedtype.net> wrote:

> Unfortunately, I don't think I was clear enough! What I want to do is
> take a diff of the two branches for the purposes of code review. So I
> want all the added and removed content, including *added* and *deleted*
> files. 

In other words, similar to the -N flag from Gnu diff.

I don't know of any built-in way.  None of the following work:

   p4 diff2 -u
   p4 diff2 -u -dN
   p4 diff2 -duN

The best I can think of is to pipe the output of 'p4 diff2 -du' (NOT -u) to
a process that will turn lines like "==== <none> - //depot/foo#9 ====' into
the '+' lines you want, and remove the rest of the "====" lines.

 -Ken

-- 
Ken Williams
Research Scientist
The Thomson Corporation
Eagan, MN


More information about the perforce-user mailing list