I probably didn't provide enough detail in my original message. I can
do the downgrade without problem. The problem is, that when I do a
second integrate (p4 integrate B.java C.java), B.java doesn't exist yet
in the repository. I think this is because the first integration hasn't
been submitted.
J. Bowles wrote:
At 02:24 PM 7/3/2002 -0400, you wrote:
In order to rename a file, I do a "p4 integrate A.java B.java; p4
delete A.java" Now, for this java file to compile, I have to change
it, so I can do a "p4 edit B.java" and make my changes. The change
list now marks the file as an "add". Any reference to the branch is
lost in the changelist, thought it does seem to survive in the
repository.
Read up on "p4 help integrate". There's a section, which I'll indicate
in the HTML version of this e-mail, talking about downgrading the
operation so that a file opened for integrate can be modified prior to
submitting. (This is not to be confused with "p4 reopen".)
For renaming Java files, this is the exact mechanism to use for the
reasons you cite.
3 messages in com.perforce.perforce-user[p4] Multi-branching in one change list