[p4] Getting base file used for merge
peter.weldon at lollotec.com
Thu Oct 2 10:31:58 PDT 2008
On Thu, Oct 2, 2008 at 8:07 AM, Leonard, William C
<bill.leonard at intergraph.com> wrote:
> 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.
You cannot specify the target revision for the p4 integration command
directly - any revision specifier on the target is ignored. p4
integrate can only integrate to #head or if you specify the -h flag
#have. You'll need to sync the target manually to the required
revision and then use -h.
I initially had trouble understanding why the -f flag was required. It
appears that I did not really understand how the -f flag worked. I
always assumed it worked on the target's integration history but this
exercise shows that it looks at the source's integration history.
Sometimes you learn more trying to answer a question than when asking
More information about the perforce-user