From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
git@vger.kernel.org, Stefan Monnier <monnier@iro.umontreal.ca>
Subject: Re: git-core: conflictstyle=diff3 doesn't actually use diff3 compatible format
Date: Sat, 6 Mar 2010 13:57:32 +0100 [thread overview]
Message-ID: <36ca99e91003060457s6417f800uc7a3e126ee6b7d6f@mail.gmail.com> (raw)
In-Reply-To: <7vpr3itn89.fsf@alter.siamese.dyndns.org>
On Fri, Mar 5, 2010 at 23:31, Junio C Hamano <gitster@pobox.com> wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>>> I can't live without conflictstyle=diff3m and I'm very happy it exists.
>>> But it has a little problem: it uses "|||||||\n" as a separator for the
>>> ancestor version of the text, whereas diff3 uses "||||||| <ancestorname>\n".
>>> The difference is harmless for a human (tho the <ancestorname> can sometimes
>>> be useful, assuming it's meaningful), but it makes some tools fail to
>>> recognize the conflict markers properly.
>>> So please add a " BASE" or " ANCESTOR" after the "|||||||".
>>
>> No opinion on this myself. I’d be interested to hear from xdiff people
>> whether it should be easy to add the ancestor name to the output.
>
> I don't think there was any xdiff people involved in this area.
>
> I suspect that our tools actually rely on the common ancestor markers not
> having any extra cruft after them, so it would be introducing a bug if you
> change this output without changing the places that read them (I know
> about "rerere", but there may be others).
rerere needs an isspace() after the specified marker length. So I
assume it could live with extra cruft after the | marker and a space.
BTW: Am I right, that rerere would need to handle my new conflict style too?
Bert
next prev parent reply other threads:[~2010-03-06 12:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20100305215253.364.63583.reportbug@localhost>
2010-03-05 22:19 ` git-core: conflictstyle=diff3 doesn't actually use diff3 compatible format Jonathan Nieder
2010-03-05 22:31 ` Junio C Hamano
2010-03-06 12:57 ` Bert Wesarg [this message]
2010-03-06 19:03 ` Junio C Hamano
2010-03-08 4:54 ` Jonathan Nieder
2010-03-15 7:47 ` [PATCH/RFC 0/10] Add label for common ancestor to conflictstyle=diff3 Jonathan Nieder
2010-03-15 7:49 ` [PATCH 01/10] xdl_merge(): add optional ancestor label to diff3-style output Jonathan Nieder
2010-03-15 8:10 ` Junio C Hamano
2010-03-15 8:35 ` Jonathan Nieder
2010-03-15 8:37 ` Junio C Hamano
2010-03-15 7:51 ` [PATCH 02/10] merge-file --diff3: add a label for ancestor Jonathan Nieder
2010-03-15 7:52 ` [PATCH 03/10] ll_merge(): add ancestor label parameter for diff3-style output Jonathan Nieder
2010-03-15 7:55 ` [PATCH 04/10] checkout --conflict=diff3: add a label for ancestor Jonathan Nieder
2010-03-15 8:20 ` Junio C Hamano
2010-03-15 8:32 ` Jonathan Nieder
2010-03-15 7:56 ` [PATCH 05/10] merge_file(): add comment explaining behavior wrt conflict style Jonathan Nieder
2010-03-15 8:00 ` [PATCH 06/10] merge_trees(): add ancestor label parameter for diff3-style output Jonathan Nieder
2010-03-15 8:00 ` [PATCH 07/10] tests: document format of conflicts from checkout -m Jonathan Nieder
2010-03-15 8:01 ` [PATCH 08/10] checkout -m --conflict=diff3: add a label for ancestor Jonathan Nieder
2010-03-15 8:05 ` [PATCH 09/10] cherry-pick: " Jonathan Nieder
2010-03-15 8:07 ` [PATCH 10/10] merge-recursive: " Jonathan Nieder
2010-03-15 8:29 ` Junio C Hamano
2010-03-15 13:18 ` Stefan Monnier
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=36ca99e91003060457s6417f800uc7a3e126ee6b7d6f@mail.gmail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=monnier@iro.umontreal.ca \
/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 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 NNTP newsgroup(s).