[p4] diff2 + added files?

[David Weintraub]

On Dec 3, 2007 8:00 PM, Sohail Somani <sohail at taggedtype.net> wrote:

> 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.
>

Don't know if this helps you, but the regular Unix diff (well, the GNU
version) does a diff between two directories. If you have a workspace with
both branches in it, you could use that to diff the two branches:
$ cd ~/p4views/myview
$ diff -R -u MyProd/BRANCH_1 MyProd/BRANCH_2

If you're on Windows, download Cygwin. If you're on Solaris or HP/UX, try
the diffdir or dirdiff commands.

--
David Weintraub
qazwart at gmail.com