[p4] Integrate around deleted revisions
william_ivey at bmc.com
Mon Jul 14 10:30:16 PDT 2008
I don't believe re-adding a deleted file is default behavior,
you have to use -d or -Dx to get that to happen.
As far as what happens to renamed files, that's because files
aren't really renamed - the old name still has its own existence,
it's just (currently) deleted. Bringing it back might be
something you'd want to do in some cases.
Integrating with a branch spec, though, will let you integrate to
the new name and ignore the old one. (I've toyed with the idea of
creating a tool to backtrack apparent renames and create the
branch spec after the fact, but the need hasn't been great enough
here to really spend the time on it.)
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Evgeny
Greetings Perforce Users,
Most of you are probably aware that when using "p4 integrate" perforce
will ignore deleted files, and add the files right back where they
should not be. And it gets even worse if the files were renamed
instead of just deleted, perforce will not know to integrate changes
into the renamed file - and will add a file with the old name.
Do any of you have some scripts or any other solutions that make work
around this problem?
perforce-user mailing list - perforce-user at perforce.com
More information about the perforce-user