[p4] Getting base file used for merge

[Leonard, William C]

The "p4 integrate -f -n -o" worked for me.  Note, though, that I had to specify a specific revision of the target file also, because other changes have been made to the target file after the suspect integration.

Many thanks for the help!


William Leonard
Executive Manager
Security, Government & Infrastructure (SG&I) Division
Intergraph Corporation
P.O. Box 6695, Huntsville, AL 35824-0695 USA 
P 1.256.730.8167   F 1.256.730.1717
bill.leonard at intergraph.com, www.intergraph.com

-----Original Message-----
From: Robert Cowham [mailto:robert at vizim.com] 
Sent: Thursday, September 25, 2008 9:06 AM
To: Leonard, William C
Subject: RE: [p4] Getting base file used for merge

Look at the Revision Graph and the Integrations tab for the particular
merge.

That is the output of "p4 integrated"

You can either calculate the base file yourself, or potentially repeat the
integration with -f -n -o and the same range of source files to see what
Perforce produces ?