From: Michael J Gruber <git@drmicha.warpmail.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Ondrej Certik <ondrej@certik.cz>,
Michael J Gruber <git@drmicha.warpmail.net>,
Git Mailing List <git@vger.kernel.org>,
Fabian Seoane <fabian@fseoane.net>
Subject: Re: git fast-export | git fast-import doesn't work
Date: Wed, 26 Nov 2008 17:44:37 +0100 [thread overview]
Message-ID: <492D7CF5.1020202@drmicha.warpmail.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0811261739110.30769@pacific.mpi-cbg.de>
Johannes Schindelin venit, vidit, dixit 26.11.2008 17:40:
> Hi,
>
> On Wed, 26 Nov 2008, Ondrej Certik wrote:
>
>> I am also trying to make the example simpler. I tried to squash the
>> first uninteresting ~1500 commits into one, but "git rebase -i" uterrly
>> fails after squashing about 600 commits. Still investigating.
>
> 1500... wow.
>
> The best idea would probably be to just "edit" the first, delete the rest
> of the 1500, and then 'git read-tree -u -m <last-of-the-1500-commits>"' on
> the command line (when git rebase stops after the "edit" command).
>
> rebase -i was _never_ meant for such _massive_ interactions; that's just
> too much for a shell script.
Or chop the DAG with grafts.
Removing the tags one by one I noticed that for several of them, removal
of the tag increases the number of commits on the connected DAG
component containing master (in the ex/imported repo), and that one
reaches the correct number with still a few tags left in there. Yet, the
topology is wrong in several places; I think all of them can be
attributed to missing parent info (which even creates new roots in some
places).
Looking at the source I suspect that fast-export fails to denote
parenthood in the case of yet unmarked parents (last for-loop of
handle_commit() in builtin_fast_export.c). But I don't really know that
code at all.
Michael
P.S.: That git repo itself is a product of
hg-fast-export|git-fast-import, right?
next prev parent reply other threads:[~2008-11-26 16:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-25 16:44 git fast-export | git fast-import doesn't work Ondrej Certik
2008-11-25 17:31 ` Michael J Gruber
2008-11-25 20:41 ` Miklos Vajna
2008-11-25 23:39 ` Ondrej Certik
2008-11-25 23:53 ` david
2008-11-25 23:44 ` Ondrej Certik
2008-11-25 17:34 ` Peter Baumann
2008-11-26 0:14 ` Johannes Schindelin
2008-11-26 9:35 ` Ondrej Certik
2008-11-26 10:18 ` Ondrej Certik
2008-11-26 15:35 ` Michael J Gruber
2008-11-26 15:50 ` Ondrej Certik
2008-11-26 16:35 ` Johannes Sixt
2008-11-27 2:05 ` Ondrej Certik
2009-05-03 19:06 ` Ondrej Certik
2008-11-26 16:40 ` Johannes Schindelin
2008-11-26 16:44 ` Michael J Gruber [this message]
2008-11-26 17:08 ` Johannes Schindelin
2008-12-07 11:25 ` Alexander Gavrilov
2008-12-08 18:13 ` Johannes Schindelin
2008-11-26 17:21 ` Ondrej Certik
2008-11-27 8:18 ` Andreas Ericsson
2008-11-26 10:18 ` Michael J Gruber
2008-11-26 12:46 ` Johannes Schindelin
2008-11-26 13:03 ` Ondrej Certik
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=492D7CF5.1020202@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=fabian@fseoane.net \
--cc=git@vger.kernel.org \
--cc=ondrej@certik.cz \
/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.