From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 May 2008 05:19:36 GMT
Subject: Re: [PATCH] builtin-fast-export: Only output a single parent per line
Message-ID: <7v7idhej6f.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080526014904.GZ29038@spearce.org>

"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".