[p4] Can integrations work when files are renamed?

Stephen Vance steve at vance.com
Fri Jun 16 14:27:00 PDT 2006


The more I think about it, the less I think that's possible. You can't 
merge into a newly branched file because there's nothing on the server 
to merge into until you submit. You could downgrade the file to an add 
then copy your file over it, but you would lose the integration history 
relationship between yours and the new one on your branch and you would 
run the risk of stomping on other people's changes. You could mitigate 
the latter by manually using a merge tool to merge the changes. You 
would have to use 'p4 print' to get the base into your workspace.

Steve

Sam Roberts wrote:
> I was hoping to find a way that wouldn't involve submitting a workspace
> that doesn't build. I'll keep trying.
>
> Thanks for your suggestions,
> Sam
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>   


More information about the perforce-user mailing list