[p4] Question regarding Diff.

[Chuck Karish]

On Jan 16, 2008 3:12 PM, Hari Kodungallur <hari.mailinglists at gmail.com> wrote:
> I have a question regarding doing diffs.
>
> This is the depot I have:
>
> //depot/branches/branch1/...
> //depot/branches/branch2/...   (branched from branch1)
>
>
> I am integrating all the changes in branch1 (there are lots of them)
> to branch2. After the integration is done and resolved, ideally the
> files in //depot/branches/branch1 should be exactly the same as the
> ones in my client workspace. Is there a way find out (before doing p4
> submit) whether they are the same using some diff command? Something
> like:
>
> <diff command>  //depot/branches/branch1  //my-client-workspace/branches/branch2

Brute force.  Check out the source branch into another directory
and use the operating system's diff command to compare the
two directories.

Once you convince yourself that p4 is doing the right thing
you can stop doing this.

> The 'diff' command seems to run the diff only against the
> corresponding file in the depot. And 'diff2' runs the command only on
> the server (depot). I am not able to find a solution where a client
> file is diff-ed against a depot file in a different branch.

-- 
Chuck Karish   karish at well.com   (415) 317-0182