From: Ilya Basin <basinilya@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git mailing list <git@vger.kernel.org>,
Ray Chen <rchen@cs.umd.edu>, Eric Wong <normalperson@yhbt.net>
Subject: Re[2]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()
Date: Wed, 1 May 2013 23:51:04 +0400 [thread overview]
Message-ID: <455264907.20130501235104@gmail.com> (raw)
In-Reply-To: <7vhaim8w48.fsf@alter.siamese.dyndns.org>
JCH> ...and you want to perform a merge on the
JCH> Git side of that branch with another Git branch that does have real
JCH> contents in that directory, you would want the result to say "This
JCH> directory no longer is just for a placeholder", but you cannot say
JCH> that globally by updating the config file
Placeholder files are managed when fetching from SVN. SVN doesn't
support Git-like merges.
JCH> comment line "# added by git-svn only to keep the directory" and
JCH> consider a directory that has nothing but .gitignore that consists
JCH> of only that exact comment line an "added placeholder" directory to
JCH> work it around.
Sounds good, but it's not I who decided to use the config file.
--
next prev parent reply other threads:[~2013-05-01 19:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 5:09 [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list() Ilya Basin
2013-05-01 8:31 ` Re[2]: " Ilya Basin
2013-05-01 17:09 ` Junio C Hamano
2013-05-01 19:51 ` Ilya Basin [this message]
2013-05-01 21:30 ` Eric Wong
2013-05-01 21:53 ` Junio C Hamano
2013-05-02 2:49 ` Eric Wong
2013-05-02 17:31 ` Re[2]: " Ilya Basin
2013-05-02 20:40 ` Eric Wong
2013-05-03 5:26 ` Re[2]: " Ilya Basin
2013-05-03 6:42 ` Re[3]: " Ilya Basin
2013-05-06 8:14 ` Re[4]: " Ilya Basin
2013-05-06 8:58 ` Re[3]: " Ilya Basin
2013-05-09 1:05 ` Eric Wong
2013-05-28 12:57 ` Re[4]: " Ilya Basin
2013-05-02 18:59 ` Ray Chen
2013-05-02 3:51 ` Re[2]: " Ilya Basin
2013-05-02 20:09 ` Eric Wong
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=455264907.20130501235104@gmail.com \
--to=basinilya@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=normalperson@yhbt.net \
--cc=rchen@cs.umd.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).