[p4] Flagging text to ignore in integration?

[Ivey, William]

> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com]On Behalf Of 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.

My eperience is that if you are consistent with your integrations
Perforce recognizes branch-specific changes like this and does
the right thing when you let it merge. It doesn't see them as
conflicts and retains changes made directly to the target files
since the last integration.

-Wm