[p4] diff between two revisions

[Jay Glanville]

I think what you're getting confused here with is the difference between
the revision of a file and the change list number that revision is in.

In SVN, there is no difference between the two.  However, in Perforce,
both the file has a revision number, and that file's revision is in a
change list, that also has a number, that is most likely different then
the file's revision number.  (talk about run-on sentences)

So, you executed 
  p4 changes Makefile
This listed off all the change lists that makefile was in (8, 1186,
1499).  Now, if you do
  p4 describe -s 1186
This will list the files, and their revision numbers, that are in change
list 1186.  It will look something like this:
   ...
   ... //depot/path/Makefile#2 edit
   ...
Do it again for change list 1499 (lets say it returned #3)

Now you can execute the command
  p4 diff2 Makefile#2 Makefile#3

Hope this helps.

---
Jay Dickon Glanville


> -----Original Message-----
> From: perforce-user-bounces at perforce.com 
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Jeff Sparks
> Sent: January 30, 2007 11:55 AM
> To: perforce-user at perforce.com
> Subject: Re: [p4] diff between two revisions
> 
> 
> 
> Thanks.  Just so I understand the rationale, what exactly is 
> wrong with the use of '#'?  'p4 help revisions' states
> 
>     #rev - A revision number.
>     @change - A change number: the revision as of that change.
> 
> Could you explain the meaning of the p4 output shown when I 
> use '#' instead?  It is the sort-of-half-works aspect which 
> threw me; otherwise, I may have tried something different like '@'.
> 
> 
> "Vinny Murphy (vmurphy)" <vmurphy at cisco.com> wrote: Do "p4 
> diff2 Makefile at 1499 Makefile at 1186" 
> 
> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of Jeff Sparks
> Sent: Tuesday, January 30, 2007 11:31 AM
> To: perforce-user at perforce.com
> Subject: [p4] diff between two revisions
> 
> Sorry, I'm sure this is obvious but I haven't found an answer after
> almost an hour of googling.  I just want the diff between two 
> revisions,
> the p4 equivalent of
> 
>     svn diff -r1499:1186 Makefile
> 
> I've tried things like
> 
> terra% p4 changes Makefile
> Change 1499 on 2007/01/16 by jeff at terra 'blah'
> Change 1186 on 2007/01/11 by jeff at terra 'blah blah'
> Change 8 on 2006/11/30 by peter at firma 'initial'
> terra% p4 diff Makefile#1499 Makefile#1186
> Makefile#1499 - file(s) up-to-date.
> Makefile#1186 - file(s) up-to-date.
> terra% p4 diff2 Makefile#1499 Makefile#1186 No file(s) at 
> that revision.
> 
> but I'm just flailing away.  I can't believe I can't figure this out.
> What am I missing?
> --Jeff
> 
>  
> ---------------------------------
> Need Mail bonding?
> Go to the Yahoo! Mail Q&A for great tips from Yahoo! Answers users.
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
> 
> 
>  
> ---------------------------------
> Now that's room service! Choose from over 150,000 hotels 
> in 45,000 destinations on Yahoo! Travel to find your fit.
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>