From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Jeff King <peff@peff.net>,
"Shawn O. Pearce" <spearce@spearce.org>,
git@vger.kernel.org
Subject: Re: RFC: Flat directory for notes, or fan-out? Both!
Date: Wed, 11 Feb 2009 13:16:06 -0800 [thread overview]
Message-ID: <7vljscd695.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0902112152270.10279@pacific.mpi-cbg.de> (Johannes Schindelin's message of "Wed, 11 Feb 2009 21:57:23 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Even the merging should not pose any problem at all; we need a custom
> merge driver anyway, and there is no reason whatsoever why we should not
> just teach the merge driver to remove the slashes before comparing the
> filie names.
Once you start talking about "remove the slashes", you are assuming that
the custom merge algorithm must look at *all the paths* in the two trees
being merged, and it is a sign that your thinking is so trapped in the
inefficient way the current merge-recursive and unpack-trees based merge
works, and cannot think about the possibility that there could be more
efficient way to do merges. Not very good.
If you have a fixed boundary and if most subtrees are the same between two
notes during a merge, we can do the same optimization as we do for two
input "diff-tree" codepath. If the top of a subtree matches, we do not
even have to look at their subtree. But that is true only if you do not
remove the slashes and allow a random hierarchy.
next prev parent reply other threads:[~2009-02-11 21:17 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-09 21:12 RFC: Flat directory for notes, or fan-out? Both! Johannes Schindelin
2009-02-10 7:58 ` Boyd Stephen Smith Jr.
2009-02-10 13:16 ` Jeff King
2009-02-11 1:58 ` Boyd Stephen Smith Jr.
2009-02-11 2:35 ` Linus Torvalds
2009-02-11 3:30 ` Sam Vilain
2009-02-11 3:54 ` Linus Torvalds
2009-02-11 5:05 ` Sam Vilain
2009-02-11 12:35 ` Johannes Schindelin
2009-02-10 12:18 ` Jeff King
2009-02-10 12:59 ` Johannes Schindelin
2009-02-10 13:10 ` Jeff King
2009-02-10 13:32 ` Johannes Schindelin
2009-02-10 15:58 ` Junio C Hamano
2009-02-10 16:48 ` Shawn O. Pearce
2009-02-10 16:48 ` Johannes Schindelin
2009-02-10 16:56 ` Shawn O. Pearce
2009-02-10 17:31 ` Johannes Schindelin
2009-02-10 18:35 ` Junio C Hamano
2009-02-10 19:09 ` Shawn O. Pearce
2009-02-10 21:10 ` Johannes Schindelin
2009-02-10 22:16 ` Thomas Rast
2009-02-10 22:26 ` Thomas Rast
2009-02-10 22:32 ` Junio C Hamano
2009-02-11 20:02 ` Jeff King
2009-02-11 20:57 ` Johannes Schindelin
2009-02-11 21:16 ` Junio C Hamano [this message]
2009-02-11 23:05 ` Johannes Schindelin
2009-02-10 16:44 ` Shawn O. Pearce
2009-02-10 17:09 ` Johannes Schindelin
2009-02-10 17:17 ` Shawn O. Pearce
2009-02-11 3:19 ` Sam Vilain
2009-02-11 1:14 ` Sam Vilain
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=7vljscd695.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=spearce@spearce.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 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 NNTP newsgroup(s).