Perforce will not transfer deleted files
I am using perforce and I have a folder ../dev
with my code, a folder ../trunk
with tested code, and a folder ../rel
for code ready to be deployed to production. The way I work is what I am working on ../dev
and when I have a stable release I go to ../trunk
. After testing, I grabbed ../trunk
and forked it into ../rel
.
I forked ../dev
before accidentally ../rel
, so I went ahead and marked to delete the folder ../rel
. Then I tried to pipe ../trunk
to ../rel
, but perforce doesn't say "Unable to fill in target path when files already exist." So it seems that even if I delete the files that were mistakenly forked before ../rel
, they still exist and I cannot overwrite them with the files ../trunk
.
What can I do?
Use the "force integration" flag:
p4 integrate -f ../ dev /...../ rel / ...