[p4] Flagging text to ignore in integration?

[Donald MacLeod]

Anyone know any tricks for flagging specific text, or lines, to be ignored in a whole-branch integration?
For example, in-code version numbers that are to be kept different between the two branches,
while other stuff in the same files is to be considered for integration.
(Something along the lines of the Rules in e.g. Beyond Compare)
Next best would be a way to find which files in the integration changelist are only there because
the different version numbers were picked up. Then these can be reverted.
 
thanks!



 <http://www.iesve.com/> 

Dr Donald Macleod  
Software Engineer  

T: +44 (0) 141 945 8500 
F: +44 (0) 141 945 8501 
 <http://www.iesve.com/> http://www.iesve.com 


**Design, Simulate + Innovate with the <Virtual Environment>**


Integrated Environmental Solutions Limited. Registered in Scotland No. SC151456 
Registered Office - Helix Building, West Of Scotland Science Park, Glasgow G20 0SP


 <http://www.iesve.com/disclaimer.html> Email Disclaimer