[p4] ignoring the donor file's changes

Ben Holland ben.holland at thirdlight.com
Fri Nov 2 07:25:00 PDT 2007


Hello All,

A question regarding the consequences of "ignoring the donor file's  
changes" when integrating.

Sometimes when I'm integrating the work from a developer's codeline  
into our QA codeline I might have cause to 'Select Target' or, in  
other words, ignore the developer's work because it is not required.  
This produces the desired results for the QA codeline - the file  
remains unchanged in QA - but when the developer integrates back from  
QA to his codeline (to get any fixes made by the QA process) then his  
changes remain intact *in his codeline*. In fact the relevant file is  
not even picked up by a `p4 integ` command because perforce considers  
there to be nothing to do.

However, I don't want this behaviour. My definition of "developer's  
work is not required" is not required *for the whole project* whereas  
perforce's definition seems to be not required for the QA codeline.  
How do I tell perforce that the developer's work should be removed  
when he integrates the QA changes back to his codeline?

I hope that makes sense. Thanks in advance,

Ben




More information about the perforce-user mailing list