c) create a parallel, updated checkout of the current trunk and work on
differences, maybe also reverting some other users' changes I don't agree
with because they conflict too deeply with my work and my patches are better
that theirs ;P