Marco, Jim and Arthur are absolutely right. Try your super-best to question gently your manager and understand what they really want. Maybe then the solution to the problem could be far easier than this.....I've personally had a painful experience maintaining "dual checkins" (that is what hopefully this situation is termed as). Better separate out the directories and use Makefile's features cleverly.
-Chaitanya
