From: Junio C Hamano <gitster@pobox.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Pieter de Bie <pdebie@ai.rug.nl>,
git@vger.kernel.org, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH] builtin-fast-export: Only output a single parent per line
Date: Sun, 25 May 2008 22:19:36 -0700 [thread overview]
Message-ID: <7v7idhej6f.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080526014904.GZ29038@spearce.org> (Shawn O. Pearce's message of "Sun, 25 May 2008 21:49:05 -0400")
"Shawn O. Pearce" <spearce@spearce.org> writes:
> Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> Is it fine for even git-fast-import? fast-import.c: parse_merge() seems
>> to suggest that it also wants one parent per "merge " line.
>
> fast-import wants the same as bzr-fast-import; one parent per
> merge line. If git-fast-import was doing anything with multiple
> per line it was probably dropping everything after the first. :-(
>
> This was a bug in fast-export; I'm glad Pieter has fixed it.
Unfortunately, t9301 does not pass with the "fix".
next prev parent reply other threads:[~2008-05-26 5:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-24 23:21 [PATCH] builtin-fast-export: Only output a single parent per line Pieter de Bie
2008-05-25 1:38 ` Junio C Hamano
2008-05-26 1:49 ` Shawn O. Pearce
2008-05-26 5:19 ` Junio C Hamano [this message]
2008-05-26 5:24 ` Junio C Hamano
2008-05-26 5:30 ` Shawn O. Pearce
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=7v7idhej6f.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pdebie@ai.rug.nl \
--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).