[p4] integrating when destination has been deleted

[Robert Cowham]

job000036 apparently for those who want to add their name to the list...

Robert 

> -----Original Message-----
> From: David Jones [mailto:drj at ravenbrook.com] 
> Sent: 31 August 2006 16:10
> To: Robert Cowham
> Cc: 'Stephen Vance'; 'Weintraub, David'; medellre at yahoo.com; 
> perforce-user at perforce.com
> Subject: Re: [p4] integrating when destination has been deleted
> 
> 
> On 31 Aug 2006, at 13:33, Robert Cowham wrote:
> 
> >> 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!!
> 
> Mine too.
> 
> This could also naturally fix the perforce misfeature whereby 
> fixes that have been applied to files on branches no longer 
> get accounted for if the file is deleted on the branch then 
> integed (back into the mainline for example).
> 
> drj