From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Olivier Marin <dkr+ml.git@free.fr>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] builtin-rerere: fix conflict markers parsing
Date: Mon, 7 Jul 2008 14:02:20 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0807071400180.18205@racer> (raw)
In-Reply-To: <1215434568-30456-1-git-send-email-dkr+ml.git@free.fr>
Hi,
On Mon, 7 Jul 2008, Olivier Marin wrote:
> From: Olivier Marin <dkr@freesurf.fr>
>
> When a conflicting file contains a line that begin with "=======", rerere
> failed to parse conflict markers. This result to a wrong preimage file and
> an unexpected error for the user.
>
> This patch enforce parsing rules so that markers match in the right order
> and update tests to match the above fix.
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.
Ciao,
Dscho
next prev parent reply other threads:[~2008-07-07 13:05 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 [this message]
2008-07-07 13:55 ` Olivier Marin
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=alpine.DEB.1.00.0807071400180.18205@racer \
--to=johannes.schindelin@gmx.de \
--cc=dkr+ml.git@free.fr \
--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