[p4] Integration question

[Williams, Kenneth (Ken) (TLR Corp)]

Hi,

Wondering about a good way to do a tricky integration.  I've got a codeline at //mainline/foo/ that I created a release branch for, at //release/foo/2.2/ .  After doing that, the code in //mainline/foo/ got heavily rearranged for version 3.0 (it's code from an external group), which I painstakingly implemented as branch/delete operations using P4Win's "rename" command.  Now I've made a few changes in //mainline/foo/ that I'd like to propagate to //release/foo/2.2/ *without* propagating the renames.

Is there some way to do this automatically?  Will I need to set up a branch spec that includes all [relevant] mappings between old locations and new locations, or is there some way to avoid this?  The mapping is pretty complicated, and I've got no record of it except the actual branch/delete operations in the perforce history.

Any suggestions or alternate ways of thinking about this are appreciated.

 -Ken