From: Marcus Brinkmann <m.brinkmann@semantics.de>
To: "David A. Greene" <greened@obbligato.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Dave Ware <davidw@realtimegenomics.com>, <git@vger.kernel.org>
Subject: Re: [PATCH] contrib/subtree: Split history with empty trees correctly
Date: Thu, 28 Jan 2016 05:06:47 +0100 [thread overview]
Message-ID: <56A993D7.3000107@semantics.de> (raw)
In-Reply-To: <87fuxil8cw.fsf@waller.obbligato.org>
On 01/28/2016 03:56 AM, David A. Greene wrote:
> Marcus Brinkmann <m.brinkmann@semantics.de> writes:
>
>> With my patch, "git subtree split -P" produces the same result (for my
>> data set) as "git filter-branch --subdirectory-filter", which is much
>> faster, because it selects the revisions to rewrite before rewriting.
>> As I am not using any of the advanced features of "git subtree", I will
>> just use "git filter-branch" instead.
>
> Heh. :)
>
> I hope to replace all that ugly split code with filter-branch as you
> describe but there are some cases where it differs. It may be that your
> changes fix some of that.
>
> Are you still able to do a re-roll on this?
I have to admit that my interest has declined steeply since discovering
that subtree-split and filter-branch --subtree-filter give different
results from "git svn" on the subdirectory. The reason is that git-svn
includes all commits for revisions that regular "svn log" gives on that
directory, which includes commits that serve as branch points only or
that are empty except for unhandled properties.
While empty commits for unhandled properties wouldn't be fatal, missing
branch points make "git svn" really unhappy when asked to rebuild .git/svn.
As migration from SVN is my main motivation at this point to use a
subtree filter at this point (git-svn is just very slow - about one week
on our repository), I am somewhat stuck and back to using git-svn.
Although hacking up something with filter-branch seems like a remote
option, it's probably nothing that generalizes.
It didn't help that "make test" in contrib/subtree gives me 27 out of 29
failed tests (with no indication how to figure out what exactly failed).
Oh well :)
Marcus
next prev parent reply other threads:[~2016-01-28 4:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 16:23 BUG: git subtree split gets confused on removed and readded directory Marcus Brinkmann
2016-01-15 23:44 ` Junio C Hamano
2016-01-17 19:34 ` David Ware
2016-01-17 23:23 ` David A. Greene
2016-01-20 1:17 ` [PATCH] contrib/subtree: Split history with empty trees correctly (was: Re: BUG: git subtree split gets confused on removed and readded directory) Marcus Brinkmann
2016-01-20 4:05 ` [PATCH] contrib/subtree: Split history with empty trees correctly David A. Greene
2016-01-20 11:22 ` Marcus Brinkmann
2016-01-28 2:55 ` David A. Greene
2016-01-24 13:07 ` Marcus Brinkmann
2016-01-28 2:56 ` David A. Greene
2016-01-28 4:06 ` Marcus Brinkmann [this message]
2016-02-03 2:34 ` David A. Greene
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=56A993D7.3000107@semantics.de \
--to=m.brinkmann@semantics.de \
--cc=davidw@realtimegenomics.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greened@obbligato.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).