From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
git@vger.kernel.org
Subject: Re: using xdl_merge(), was Re: Resolving conflicts
Date: Wed, 06 Dec 2006 01:48:45 -0800 [thread overview]
Message-ID: <7vwt5573sy.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vac22glzz.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Tue, 05 Dec 2006 11:50:56 -0800")
Junio C Hamano <junkio@cox.net> writes:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
>> On Tue, 5 Dec 2006, Linus Torvalds wrote:
>>
>>> - take every single merge in git (or the kernel, if you want even more)
>
> The attached is the script I am using. The test checks the
> output from 'master' (merge from RCS) and 'next' (with xdl-merge)
> and also tries to see how different the conflicts look like.
>
> In the git.git archive, there is no "clean" merge on which
> 'master' and 'next' did not agree. It is not a proof of
> correctness at all but it gives a sense of assurance.
And all merges in linux-2.6.git archive either result in
conflict with both 'merge' implementations, or cleanly resolves
the same way with both 'merge' implementations. I have not
compared the conflicted cases yet, but at least it gives me a
warm fuzzy feeling to see that autocommitted stuff are sensible.
next prev parent reply other threads:[~2006-12-06 9:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-01 7:06 Resolving conflicts Wink Saville
2006-12-01 7:30 ` Alan Chandler
2006-12-01 7:41 ` Wink Saville
2006-12-01 8:10 ` Alan Chandler
2006-12-01 7:39 ` Linus Torvalds
2006-12-01 7:52 ` Wink Saville
2006-12-01 7:57 ` Linus Torvalds
2006-12-01 8:00 ` Linus Torvalds
2006-12-01 8:13 ` Alan Chandler
2006-12-01 8:22 ` Wink Saville
2006-12-01 23:47 ` Alan Chandler
2006-12-02 3:04 ` Wink Saville
2006-12-02 4:30 ` Linus Torvalds
2006-12-02 7:55 ` Junio C Hamano
2006-12-02 10:49 ` using xdl_merge(), was " Johannes Schindelin
2006-12-05 17:58 ` Ramsay Jones
2006-12-05 18:28 ` Linus Torvalds
2006-12-05 18:43 ` Junio C Hamano
2006-12-05 18:53 ` Johannes Schindelin
2006-12-05 19:50 ` Junio C Hamano
2006-12-05 21:15 ` [PATCH] xdl_merge(): fix and simplify conflict handling Johannes Schindelin
2006-12-05 22:10 ` Junio C Hamano
2006-12-05 22:24 ` Johannes Schindelin
2006-12-05 22:54 ` Junio C Hamano
2006-12-05 22:27 ` Jakub Narebski
2006-12-05 22:27 ` Johannes Schindelin
2006-12-06 9:48 ` Junio C Hamano [this message]
2006-12-06 10:02 ` using xdl_merge(), was Re: Resolving conflicts Johannes Schindelin
2006-12-06 10:13 ` Junio C Hamano
2006-12-06 10:47 ` Johannes Schindelin
2006-12-05 18:36 ` Johannes Schindelin
2006-12-01 7:53 ` Linus Torvalds
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=7vwt5573sy.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=ramsay@ramsay1.demon.co.uk \
--cc=torvalds@osdl.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).