Perforce: File tampered with after resolve - edit or revert

Posted by fbrereto on Server Fault See other posts from Server Fault or by fbrereto
Published on 2011-08-18T22:27:30Z Indexed on 2012/09/01 9:40 UTC
Read the original article Hit count: 4901

Filed under:

perforce

|

p4

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?

© Server Fault or respective owner

Related posts about perforce

Integrating different branches from external sources into a single Mercurial repository

as seen on Programmers - Search for 'Programmers'
I'm currently working in a company using Perforce and am making way for distributed version control with Mercurial. I've had success importing Perforce history using the perfarce (quite a suitable name, I laugh every time I see/say it) however, this only works with a single branch at a time. Here's… >>> More
Online Perforce Repositories

as seen on Stack Overflow - Search for 'Stack Overflow'
Is anyone aware of of anybody offering hosted perforce servers? It doesn't have to be free - but preferably not too expensive! My understanding of Perforce is that it's free to use for personal projects, which mine is. Currently I have a perforce server setup on the same machine as the code is on… >>> More
How to speedup perforce auto resolve?

as seen on Stack Overflow - Search for 'Stack Overflow'
I would like to know how to speedup the perforce auto resolve when doing integration (merge yours and theirs if no conflicts exists). Currently is taking hours for ~5000 files when running it using a proxy server even if the proxy server has the files pre-cached. Also p4v interface doesn't give… >>> More
Extending Perforce to use a custom content diff tool for certain file extensions

as seen on Stack Overflow - Search for 'Stack Overflow'
I have various custom binary files stored in perforce and for many of the file types I have built a custom diff tool to show the content creators a diff of the actual changes to the file. E.g. If the file holds simple key value pairs as a compressed binary blob the diff tool would load each version… >>> More
Perforce command line only showing local users/changelists/workspaces, but P4V shows all

as seen on Stack Overflow - Search for 'Stack Overflow'
We are using P4 for free with two users. In the P4V admin gui I can see both myself and my partner as users, and in the P4V gui I can see all workspaces (clients) and all changelists (both mine and my partner's). From the command line, 'p4 users' only shows me, 'p4 clients' only shows my local workspace… >>> More

Related posts about p4

Convert p4 move to p4 integrate

as seen on Stack Overflow - Search for 'Stack Overflow'
Is there a simple way to convert a (large) list of p4 moves to p4 integrates? There are a lot of pending modifications to the moved files, so just reverting and instead integrating isn't an option. Perforce won't let you just revert the deleted file (which would leave the desired integration behind). >>> More
git-p4 submit fails with "Not a valid object name HEAD~261"

as seen on Stack Overflow - Search for 'Stack Overflow'
I've got a git repository that I'd like to mirror to a Perforce repository. I've downloaded the git-p4 script (the more recent version that doesn't give deprecation warnings), and have been working with that. I've figured out how to pull changes from Perforce, but I'm getting an error when I try to… >>> More
p4 sync as different user

as seen on Stack Overflow - Search for 'Stack Overflow'
How do you p4 sync as another user? >>> More
p4 sycn as different user

as seen on Stack Overflow - Search for 'Stack Overflow'
How do you p4 sync as another user? >>> More
understanding P4 describe / diff summary (-ds) option

as seen on Stack Overflow - Search for 'Stack Overflow'
Greetings P4 folks, I am trying to understand the P4 describe -ds output. I am assuming that this is the same as the p4 diff -ds output. Here is an example of the "Differences ..." block: ==== //depot/Groups/mygroup/trunk/main/FooBar.java#5 (text) ==== add 7 chunks 13 lines deleted 1 chunks 1 lines changed… >>> More