git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How to deal with mixed tree?

From
HHHolger Hellmuth <hellmuth@ira.uka.de>
Date
Nov 22, 2011, 11:35 UTC
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:
Show 8 quoted lines
> 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)

Previous: Pascal ObryNext: Pascal Obry
Message 2 of 8 in “How to deal with mixed tree?”
  1. Pascal ObryNov 22, 2011
  2. Holger HellmuthNov 22, 2011
  3. Pascal ObryNov 22, 2011
  4. Holger HellmuthNov 22, 2011
  5. Pascal ObryNov 22, 2011
  6. Holger HellmuthNov 22, 2011
  7. Pascal ObryNov 22, 2011
  8. Junio C HamanoNov 22, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.