[p4] How to make a change I know I'll have to back out later?

[Kaelin Colclasure]

Greetings,

I need to make a modestly extensive set of changes to work around a bug in
another subsystem. It will touch a number of methods in several source
files -- basically adding 3 to a dozen lines of code to each. Eventually,
when the bug is fixed, I'll then need to remove all of those lines again --
but without affecting any subsequent changes that have been layered on top
of the work-around.

I suppose when the time comes I can try to make a patch file for the head
revisions by checking out the old versions as of the change preceding the
work-around from Perforce. But it seems like there should be a "smarter" way
that's less prone to confusion and error.

Any suggestions?

-- Kaelin