[p4] Resolving changes to a deleted file?

Robin Charlton RCharlton at kelseus.com
Wed Mar 23 09:37:10 PST 2005


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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.perforce.com/pipermail/perforce-user/attachments/20050323/a203d4b3/attachment-0007.html>


More information about the perforce-user mailing list