[p4] Ghost integration

[Kevin Bailey]

A couple weeks ago I integrated some changes from another branch
to the one I commonly work in. (I only ever integrate between
these 2 branches.) I then proceeded to make some changes to some
of the files that were integrated as well as some others. Today,
when I went to integrate my changes back to the other branch,
all the changes integrated 2 weeks ago showed up as conflicts
(in the files that are part of both sets obviously.)

The strange part is that, despite the conflicts, p4 says my
branch was fully integrated. Yet, in mergep4.tcl during the
resolve, the base revision was not the one from 2 weeks ago; it
was something prior. There must be something very fundamentally
wrong with my understanding of p4 since I can't see how this can
be. Does anyone know how this is possible ?

For the record, I always sync both branches before an
integration, I never have anything opened prior to it, I always
run 'p4 integrate' twice to see if it requires -i or -d, and I
always run 'p4 resolve -as' followed by 'p4 resolve'.

I've already integrated my changes back to the other branch
(via 'accept theirs'). Is there some way to avoid the other
files from that fateful integration 2 weeks ago colliding
in the future ? Will 'p4 integrate -f' into my branch "fix"
things ?

-- 
"I appreciate that question because I, in the state of Texas,
had heard a lot of discussion about a faith-based initiative
eroding the important bridge between church and state."-George
Bush, Question and answer session with the press, Jan. 29, 2001

Separation, Junior, separation!