From: Pierre Habouzit <madcoder@debian.org>
To: git@vger.kernel.org
Subject: [BUG (or misfeature?)] git checkout and symlinks
Date: Wed, 4 Jul 2007 22:35:41 +0200 [thread overview]
Message-ID: <20070704203541.GA13286@artemis.corp> (raw)
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
if in a branch [branch1] you track the file: dir1/file1.c
and in the branch [branch2] you track elsewhere/file1.c and dir1 be
symlink on elsewhere, then it's not possible to checkout the branch
[branch1] if your previous checkout was [branch2]. You have to manually
remove the symlink `dir1` else git complains that checkouting branch1
would overwrite dir1/file1.c.
I'm not sure how to fix this, and it's quite painful actually :)
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2007-07-04 20:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-04 20:35 Pierre Habouzit [this message]
2007-07-04 20:52 ` [BUG (or misfeature?)] git checkout and symlinks Junio C Hamano
2007-07-04 21:05 ` Pierre Habouzit
2007-07-04 22:23 ` $ " Pierre Habouzit
2007-07-12 8:04 ` Teach read-tree 2-way merge to ignore intermediate symlinks Junio C Hamano
2007-07-12 8:31 ` git-log --follow? Junio C Hamano
2007-07-12 10:44 ` Johannes Schindelin
2007-07-12 17:49 ` Linus Torvalds
2007-07-12 18:45 ` Junio C Hamano
2007-07-12 19:01 ` Linus Torvalds
2007-07-12 12:40 ` Teach read-tree 2-way merge to ignore intermediate symlinks Pierre Habouzit
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=20070704203541.GA13286@artemis.corp \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
/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.