From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
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 21:49:05 -0400 [thread overview]
Message-ID: <20080526014904.GZ29038@spearce.org> (raw)
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.
next prev parent reply other threads:[~2008-05-26 1:50 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 [this message]
2008-05-26 5:19 ` Junio C Hamano
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=20080526014904.GZ29038@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pdebie@ai.rug.nl \
/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.