From: Sam Vilain <sam@vilain.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Jeff King <peff@peff.net>, Andreas Ericsson <ae@op5.se>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, "Shawn O. Pearce" <spearce@spearce.org>
Subject: Re: [PATCH] contrib/fast-import: add perl version of simple example
Date: Wed, 19 Sep 2007 01:25:23 +1200 [thread overview]
Message-ID: <46EFD1C3.4080008@vilain.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0709181334210.28586@racer.site>
Johannes Schindelin wrote:
>> I personally want to be able to dump patches, including merges, to
>> git-format-patch format, in such a way that all other information (eg,
>> committer, date, etc) is preserved.
>>
>
> We already talked about that on IRC, and you have not even _begun_ to
> think about the fundamental issues with merges-in-a-patch. I mentioned a
> few on IRC, and am still awaiting your reply.
>
Well, you could store diffs from both parents, or a custom diff format
that marks different ancestors, etc. Sure, they wouldn't apply with
'patch', but that's the breaks.
I don't see the encoding of the information as such a fundamental and
insurmountable issue. Why do you consider it so?
Sam.
next prev parent reply other threads:[~2007-09-18 13:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-18 7:26 [PATCH] contrib/fast-import: add perl version of simple example Jeff King
2007-09-18 7:27 ` Jeff King
2007-09-18 10:16 ` Johannes Schindelin
2007-09-18 10:28 ` Andreas Ericsson
2007-09-18 10:30 ` Jeff King
2007-09-18 11:18 ` Johannes Schindelin
2007-09-18 11:28 ` Andreas Ericsson
2007-09-18 11:57 ` Sam Vilain
2007-09-18 12:36 ` Johannes Schindelin
2007-09-18 13:25 ` Sam Vilain [this message]
2007-09-18 11:17 ` Johannes Schindelin
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=46EFD1C3.4080008@vilain.net \
--to=sam@vilain.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--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 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.