From: Holger Hellmuth <hellmuth@ira.uka.de>
Date: Tue, 22 Nov 2011 11:35:51 GMT
Subject: Re: How to deal with mixed tree?
Message-ID: <4ECB8917.8010305@ira.uka.de>
In-Reply-To: <CA+9ZNic-9U0nP1NGL0shUijnxdhaoEHwyxWM8rOzR2B6Qjq6zQ@mail.gmail.com>

On 22.11.2011 12:21, Pascal Obry wrote:
> 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?

Remove SD in P1, make a logical link from P2 to SD, add SD to 
.git/info/exclude

(see "Bug report - local (and git ignored) file silently removed after 
checkout" on the mailing list why exclude is better than .gitignore at 
the moment)