Change 5888

Richard Geiger committed this change into //guest/richard_geiger/utils/cvs2p4/bin

This fixes a subtle and heinous bug whereby imports done before
a file gets a local change on "main" will be lost (even though
the local change will reflect the contents of those "lost"
revisions)

cc: releng@ironport.com, ehuss@ironport.com