I apologize if this is a FAQ, I didn't see it in the support area or the archives...

From windows I'd like to diff a file in my workspace with the head revision. The option to do this is ghosted in p4win and p4 diff -f complains "file(s) not on client". The file is definitely on the filesystem but perforce doesn't think so. When I sync from HEAD Perforce warns me that it can't clobber the writable version. I don't want to force the sync because I don't want to lose my changes. In CVS I could have done an 'update' which would have merged in any changes from the repository.

How does one normally handle this situation in Perforce? I expect it to come up frequently here, so the obvious "move the file, sync, replace the file" seems pretty silly. It also seems silly to open the file for edit and do resolv just to be able to do a diff.

What am I missing?

John-Mason Shackelford

Software Developer Pearson Educational Measurement - eMeasurement Group

2510 North Dodge St. Iowa City, IA 52245 ph. 319-354-9200x6214 john-mason.shackelford at pearson.com http://etest.ncspearson.com

**************************************************************************** This email may contain confidential material. If you were not an intended recipient, Please notify the sender and delete all copies. We may monitor email to and from our network. ****************************************************************************