From: Holger Hellmuth <hellmuth@ira.uka.de>
To: Pascal Obry <pascal@obry.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: How to deal with mixed tree?
Date: Tue, 22 Nov 2011 12:35:51 +0100 [thread overview]
Message-ID: <4ECB8917.8010305@ira.uka.de> (raw)
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)
next prev parent reply other threads:[~2011-11-22 11:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-22 11:21 How to deal with mixed tree? Pascal Obry
2011-11-22 11:35 ` Holger Hellmuth [this message]
2011-11-22 14:20 ` Pascal Obry
2011-11-22 15:08 ` Holger Hellmuth
2011-11-22 15:21 ` Pascal Obry
2011-11-22 16:14 ` Holger Hellmuth
2011-11-22 17:29 ` Pascal Obry
2011-11-22 18:29 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ECB8917.8010305@ira.uka.de \
--to=hellmuth@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=pascal@obry.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.