From: Shawn Pearce <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Alexandre Julliard <julliard@winehq.org>,
Junio C Hamano <junkio@cox.net>,
git@vger.kernel.org
Subject: Re: [PATCH] xdl_merge(): fix a segmentation fault when refining conflicts
Date: Thu, 28 Dec 2006 23:16:26 -0500 [thread overview]
Message-ID: <20061229041626.GA12072@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0612281710350.19693@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Thank you Alexandre! I looked for the bug for quite some time, but
> was never close to the real culprit.
Thanks for fixing this!
> +<<<<<<< orig.txt
> +=======
> +Nam et si ambulavero in medio umbrae mortis,
> +non timebo mala, quoniam TU mecum es:
> +virga tua et baculus tuus ipsa me consolata sunt.
> +>>>>>>> new5.txt
As a side note I lately have noticed that xdl_merge is producing a
conflict like the above when one branch added the lower half and
the other branch didn't change anything in the area.
I haven't spent any time to try to reproduce it, or to see if RCS'
merge utility would automatically merge the file without producing
a conflict. But right now it does seem like xdl_merge is producing
conflicts when I didn't think it should be.
--
Shawn.
next prev parent reply other threads:[~2006-12-29 4:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-27 4:16 Segfault in xdl_merge is back Shawn Pearce
2006-12-27 6:49 ` Linus Torvalds
2006-12-27 8:24 ` Shawn Pearce
2006-12-27 11:22 ` Johannes Schindelin
2006-12-27 12:53 ` Alexandre Julliard
2006-12-28 16:13 ` [PATCH] xdl_merge(): fix a segmentation fault when refining conflicts Johannes Schindelin
2006-12-28 22:09 ` Junio C Hamano
2006-12-29 4:16 ` Shawn Pearce [this message]
2006-12-30 18:53 ` Johannes Schindelin
2006-12-30 19:47 ` Jakub Narebski
2006-12-31 1:09 ` Johannes Schindelin
2007-01-02 13:18 ` Jakub Narebski
2007-01-02 20:58 ` Johannes Schindelin
2007-01-02 21:11 ` Junio C Hamano
2007-01-02 21: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=20061229041626.GA12072@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=julliard@winehq.org \
--cc=junkio@cox.net \
/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).