How to deal with mixed tree?

From: Pascal Obry <pascal@obry.net>
Date: Nov 22, 2011, 11:21 UTC
Message-ID: <CA+9ZNic-9U0nP1NGL0shUijnxdhaoEHwyxWM8rOzR2B6Qjq6zQ@mail.gmail.com>

A project P1 is under Git.

A project P2 is under Subversion.

P2 in fact replace a sub-directory (say SD) in P1. The project P2 is a replacement (extension) of the code in P1.

How to deal with this?

If you clone P1, remove SD in P1 to replace it by P2:

   $ git diff

   -> will display all the changes in SD, is there a way to avoid that?

   $ git merge (between branches) will try to merge changes in SD

I'd like to really tell Git to ignore SD as if it was not there. Any solution?

Thanks, Pascal.

-- 
--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|              http://www.obry.net
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595