Posted 03 August 2011 - 09:12 PM
I have a question about the error that I see, while performing p4 resolve on a file.
Operation 'user-resolve' failed.
//BRANCH/PATH/filename is missing from the rev table!
Can someone please let me know what does this error means and how to fix it ?
Thanks in advance.
Posted 04 August 2011 - 12:27 AM
Posted 04 August 2011 - 06:34 PM
Posted 01 January 2020 - 06:05 PM
The best path forward is probably going to be to revert (use the -k flag if you want to preserve local changes) and then re-open the file for whatever you were doing. If you were integrating and some revisions of the source (or the base) got obliterated while you were resolving, you'll want to re-run integrate so it can figure out what needs to be merged (if anything) out of whatever's left and what the new best base revision is. If it was a normal edit and a revision you were resolving against got obliterated, you might not need to do anything at all other than re-open it (although you should double-check your diff to make sure it still makes sense and doesn't include any changes that were supposed to have been obliterated).
0 user(s) are reading this topic
0 members, 0 guests, 0 anonymous users