[p4] Resolving changes to a delete file?

Paul Andrei pandrei at foliage.com
Wed Mar 23 08:34:34 PST 2005


You can integrate the two files even after rename.

In P4Win:
- select the file you want to integrate from
- choose "Integrate Using -> Filespec" and then
- enter the renamed filename in the Target Filespec

Paul Andrei


Robin Charlton wrote:

> I want to integrate changes between 2 files on different branches but
> the destination file no longer exists (as it has been renamed).
> 
> It seems to me in this instance there are 2 options: 1) recreate the
> file 2) discard the change
> 
>> From p4win only option 1 seems to be possible. However I want to
>> resolve the situation by discarding the change. (I can manually
>> recreate the change if necessary).
> 
> How do I do this?
> 
> Thanks! - Robin Charlton rcharlton at kelseus.com
> 
> _______________________________________________ Come to the 2005
> Perforce User Conference, April 14 & 15 in Las Vegas. Learn more:
> http://www.perforce.com/conf
> 
> 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