From: Clemens Buchacher <drizzd@aon.at>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Marat Radchenko <marat@slonopotamus.org>,
Michael J Gruber <git@drmicha.warpmail.net>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] hash binary sha1 into patch id
Date: Fri, 13 Aug 2010 23:58:01 +0200 [thread overview]
Message-ID: <20100813215801.GA24534@localhost> (raw)
In-Reply-To: <20100813213726.GB2516@burratino>
[-- Attachment #1: Type: text/plain, Size: 764 bytes --]
On Fri, Aug 13, 2010 at 04:37:26PM -0500, Jonathan Nieder wrote:
>
> FWIW what I was imagining was some structured binary format:
>
> With A some long string, patch 1:
>
> A --> AAA
>
> Patch 2:
>
> AA --> AAA
>
> Ideally one would want an attempt to apply patch 2 to result in a
> conflict. Probably that is far-fetched.
Actually, rebase will try to merge the respective branches and it
will typically succeed, because the post-images are the same. It
will fail due to conflict only if yet another patch has been
applied upstream on top of patch 1.
But that is also how textual changes behave. So for the sake of
consistency, it makes sense to require the pre-images to be the
same. I will resend an appropriate patch tomorrow.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2010-08-13 21:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-13 9:40 [PATCH] hash binary sha1 into patch id Clemens Buchacher
2010-08-13 20:00 ` Jonathan Nieder
2010-08-13 21:23 ` Clemens Buchacher
2010-08-13 21:37 ` Jonathan Nieder
2010-08-13 21:58 ` Clemens Buchacher [this message]
2010-08-15 7:20 ` [PATCH v2] " Clemens Buchacher
2010-08-15 7:56 ` Jonathan Nieder
2010-09-10 5:17 ` Marat Radchenko
2010-09-10 8:16 ` Clemens Buchacher
2010-10-13 7:46 ` Marat Radchenko
2010-10-13 9:17 ` Marat Radchenko
2010-10-13 21:10 ` Clemens Buchacher
2010-10-14 7:19 ` Marat Radchenko
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100813215801.GA24534@localhost \
--to=drizzd@aon.at \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=marat@slonopotamus.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).