From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 26 May 2008 01:49:05 GMT
Subject: Re: [PATCH] builtin-fast-export: Only output a single parent per line
Message-ID: <20080526014904.GZ29038@spearce.org>
In-Reply-To: <7vskw7jh7c.fsf@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> wrote:
> Pieter de Bie <pdebie@ai.rug.nl> writes:
> 
> > According to the git-fast-import man-page, you can only put a single
> > committish per merge: line, like this:
> >
> >   merge :10
> >   merge :11
> >
> > However, git-fast-export puts all parents on a single line, like this:
> >
> >   merge :10 :11
> >
> > This may be fine with git-fast-import,...
> 
> 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.

-- 
Shawn.