fbrereto's questions

I'm doing an integration in Perforce and am being met with the following:

p4 integrate -1 -d -i -t -r -b my_branchspec
//Foo/file.txt#6 - integrate from //Bar/file.txt#6
p4 resolve -am
/Foo/file.txt - merging //Bar/file.txt#6
/Foo/file.txt tampered with before resolve - edit or revert.

It seems no matter what I do, I am unable to make this issue go away: the next forward integration will show a similar message.

The file is a text file. I can confirm that the MD5 hash for both files before the integration takes place is the same. What other issues might be going on with this file that I can resolve to fix this nagging message?

I have an SVN repository hosted on a freemium site with a maximum repository size. As I approach this capacity I am aware of files I've checked in that I know I can remove permanently to free up disk space. How do I tell SVN that a file can not only be deleted, but it's history as well?

I have a Subversion repository with a series of third party libraries and sources. As new distributions of these libraries become available I want to completely replace the old version with the new. What's the best method to "overlay" a new drop of a directory on top of the older one?

I just set up a Perforce proxy server for work. I'm noticing the cache directory is filling up very quickly -- with files I know I will never need. For example, there is a 'sandbox' directory in the depot where users keep personal branches and other work; a p4 sync is causing the p4 proxy cache to grab these user's sandboxes when I'll never need them. I would create a symbolic link for the sandbox directory to /dev/null but then I wouldn't be caching my sandbox, which I am interested in.

Is there any way to tell the perforce proxy something to the effect of "if I haven't had to sync it, please don't cache it?"