From: Ben Clifford <benc@hawaga.org.uk>
To: Martin Langhoff <martin.langhoff@gmail.com>
Cc: Florian Weimer <fw@deneb.enyo.de>, git@vger.kernel.org
Subject: Re: Handling large files with GIT
Date: Mon, 13 Feb 2006 14:26:06 +1300 (NZDT) [thread overview]
Message-ID: <Pine.OSX.4.64.0602131416530.25089@piva.hawaga.org.uk> (raw)
In-Reply-To: <46a038f90602081435x49e53a1cgdc56040a19768adb@mail.gmail.com>
On Thu, 9 Feb 2006, Martin Langhoff wrote:
> I did suggest maildir, where GIT is bound to do well as the content
> of the emails doesn't change but they just move around a lot. Though
> yes, trees are going to be nasty.
I've been keeping maildir in git for a few months, with mail being
delivered into a git repo on one (permanently connected) host and me
merging that branch into a repo on my laptop for reading (the intention
being that I should be able to sync it back to the permanently connected
host as I sometimes read mail there.
Alas, the merge part of this absolutely sucks -- as time goes by, its
getting slower and slower (its taking an hour or so to do the merge, which
has got to the point of being barely usable -- if it wasn't for the neat
hack-value, I'd have given up on this by now).
I haven't really probed whats happening when I'm doing the merges in any
depth, but I see a lot of index manipulation happening (git update-index,
I think) to add and remove files where each invocation of that seems to be
taking almost a whole second.
I wonder if the present merge algorithms perform especially badly in the
case of a large number of files with lots of renames (and so lots of
adds/removes) but no content changes? The merge should be able to happen
entirely in the index, I think.
Perhaps one way to proceed would be for me to write a move-optimised merge
strategy where I flip the index round and instead of saying "how has the
content inside this filename changed?" I instead say "how has the filename
associated with this content <hash> changed?"
A special-case on top of a move-optimised merge might be some
maildir-aware filename handling that knows how to resolve conflicts when a
particular content-hash has been renamed to two different names (eg. when
one flag is added to a message in one repo and a different flag is added
to a message in another repo).
Any advice/thoughts/suggestions-that-this-is-a-stupid-thing-to-do would be
greatly appreciated.
--
next prev parent reply other threads:[~2006-02-13 1:43 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-08 9:14 Handling large files with GIT Martin Langhoff
2006-02-08 11:54 ` Johannes Schindelin
2006-02-08 16:34 ` Linus Torvalds
2006-02-08 17:01 ` Linus Torvalds
2006-02-08 20:11 ` Junio C Hamano
2006-02-08 21:20 ` Florian Weimer
2006-02-08 22:35 ` Martin Langhoff
2006-02-13 1:26 ` Ben Clifford [this message]
2006-02-13 3:42 ` Linus Torvalds
2006-02-13 4:57 ` Linus Torvalds
2006-02-13 5:05 ` Linus Torvalds
2006-02-13 23:17 ` Ian Molton
2006-02-13 23:19 ` Martin Langhoff
2006-02-14 18:56 ` Johannes Schindelin
2006-02-14 19:52 ` Linus Torvalds
2006-02-14 21:21 ` Sam Vilain
2006-02-14 22:01 ` Linus Torvalds
2006-02-14 22:30 ` Junio C Hamano
2006-02-15 0:40 ` Sam Vilain
2006-02-15 1:39 ` Junio C Hamano
2006-02-15 4:03 ` Sam Vilain
2006-02-15 2:07 ` Martin Langhoff
2006-02-15 2:05 ` Linus Torvalds
2006-02-15 2:18 ` Linus Torvalds
2006-02-15 2:33 ` Linus Torvalds
2006-02-15 3:58 ` Linus Torvalds
2006-02-15 9:54 ` Junio C Hamano
2006-02-15 15:44 ` Linus Torvalds
2006-02-15 17:16 ` Linus Torvalds
2006-02-16 3:25 ` Linus Torvalds
2006-02-16 3:29 ` Junio C Hamano
2006-02-16 20:32 ` Fredrik Kuivinen
2006-02-13 5:55 ` Jeff Garzik
2006-02-13 6:07 ` Keith Packard
2006-02-14 0:07 ` Martin Langhoff
2006-02-13 16:19 ` Linus Torvalds
2006-02-13 4:40 ` Martin Langhoff
2006-02-09 4:54 ` Greg KH
2006-02-09 5:38 ` Martin Langhoff
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=Pine.OSX.4.64.0602131416530.25089@piva.hawaga.org.uk \
--to=benc@hawaga.org.uk \
--cc=fw@deneb.enyo.de \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
/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).