From: Olivier Marin <dkr+ml.git@free.fr>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] builtin-rerere: fix conflict markers parsing
Date: Mon, 07 Jul 2008 15:55:04 +0200 [thread overview]
Message-ID: <48722038.1010203@free.fr> (raw)
In-Reply-To: <alpine.DEB.1.00.0807071400180.18205@racer>
Johannes Schindelin a écrit :
>
> So what about
>
> <<<<<<< This hunk contains =====
> anythin
> =======
>
> Hello
> =======
> somethin else
> >>>>>>> problem!
>
>
> If you fix it, I think you should do it properly, and analyze the index.
If I read the code correctly, this case is not a problem at all because what
is important is the content between <<< and >>> : even if you match the wrong
=== marker, you will match the first one only, then parsing will success and
preimage file will be OK. Also because we always match in the same order the
sha1 will be the same.
Anyway, I do not know how to match the right === marker.
Olivier.
next prev parent reply other threads:[~2008-07-07 13:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-07 12:42 [PATCH] builtin-rerere: fix conflict markers parsing Olivier Marin
2008-07-07 13:02 ` Johannes Schindelin
2008-07-07 13:55 ` Olivier Marin [this message]
2008-07-07 14:06 ` Johannes Schindelin
2008-07-07 14:44 ` Olivier Marin
2008-07-07 15:29 ` Johannes Schindelin
2008-07-07 17:39 ` Junio C Hamano
2008-07-08 7:52 ` Re* " Junio C Hamano
2008-07-08 10:42 ` Olivier Marin
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=48722038.1010203@free.fr \
--to=dkr+ml.git@free.fr \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).