Generally Warlock is assumed to be his "classic" self, which is circa Infinity Gauntlet. His first incarnation was "Him" who wasn't nearly as smart and versatile as he'd eventually become. The only difference after that was whether or not he had the soul gem, though his power set stayed roughly the same regardless. Only recently has he undergone another significant change...enough to be considered a new incarnation.