[p4] Automating the insertion of resolved files
brad.holt at autodesk.com
Wed Apr 23 17:16:11 PDT 2008
I'm surprised I haven't tried to figure this out previously. For better or worse, we have a system here whereby I have to handle many of the integrations and resolves for development. When doing a mass merge I've scripted up tool whereby (long story short) they can mail me back the correct version of the resolved content. I can then paste that into my graphical resolve tool (Araxis) and away we go. As I read it, this should possibly cause merge problems down the road if some of the changes made were done manually and the file is not reopened for edit. Neither the GUI tool or p4 complain when I hit that "Accept Merged" button.
Aside from that though, I need to understand where to paste in the resolved version of the file so that it will be picked up and overlaid in a "-am" resolve. Seems to get shunted into a temporary file location and worked on there before.
So in a nutshell, is the only safe way to take someone else's manual resolve (without knowing if the content was just interleaved or if there were manual edits) by copying over the file location in the client, reopening the integrated file for edit and accepting "Yours"?
More information about the perforce-user