[p4] diff2 + added files?

Looney, James B james.b.looney at lmco.com
Tue Dec 4 08:01:18 PST 2007


I usually do that using labels.  I'll create a label in one workspace
(usually our mainline) and the second in a branch.  Then use p4 diff2 -q
//... at mainline_label //... at branch_label

If you're scripting it, I'd recommend adding the -G (marshaling) as it
makes the file organizing a LOT easier since it'll tell you which files
were added/deleted/modified without you having to parse each line
yourself.  The -q just suppresses the actual diff output and the header
info for identical files.

-James

> -----Original Message-----
> From: perforce-user-bounces at perforce.com 
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Sohail Somani
> Sent: Monday, December 03, 2007 6:01 PM
> To: perforce-user at perforce.com
> Subject: [p4] diff2 + added files?
> 
> Hi,
> 
> Is there any way to convince the p4 command to give me a unified diff 
> between two branches such that added and deleted files show up in the 
> output? For the life of me, I can't figure it out.
> 
> Thanks!
> 
> -- 
> Sohail Somani
> http://uint32t.blogspot.com
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
> 


More information about the perforce-user mailing list