[p4] integrating when destination has been deleted

Robert Cowham robert at vaccaperna.co.uk
Thu Aug 31 05:33:45 PDT 2006


> Imagine if, rather than have a branch or delete just 
> automatically apply, you had to resolve it and do an "accept 
> theirs" or an "accept yours" such that from that point on you 
> would not have to revisit the integration and you wouldn't 
> have had to modify a branch spec. 
> Integrating an add with "accept theirs" would make the file 
> present and with "accept yours" would have the file missing. 
> Integrating a delete would make the file missing with "accept 
> theirs" and present with "accept yours".
> 
> That is the way I believe it should behave, 

Yes, yes, yes - get's my vote!!

> making directory versioning unnecessary.

Robert


More information about the perforce-user mailing list