From MAILER-DAEMON Tue Feb 19 14:09:40 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1U7sZQ-0001ps-JU
	for mharc-bug-diffutils@gnu.org; Tue, 19 Feb 2013 14:09:40 -0500
Received: from eggs.gnu.org ([208.118.235.92]:52717)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bbell@robin.thebellsplace.net>) id 1U7sZE-0001Pz-3x
	for bug-diffutils@gnu.org; Tue, 19 Feb 2013 14:09:38 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bbell@robin.thebellsplace.net>) id 1U7sZ9-0006CL-7M
	for bug-diffutils@gnu.org; Tue, 19 Feb 2013 14:09:27 -0500
Received: from srv08.macroped.com ([74.54.75.218]:39076)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bbell@robin.thebellsplace.net>) id 1U7sZ8-0006BP-WC
	for bug-diffutils@gnu.org; Tue, 19 Feb 2013 14:09:23 -0500
Received: from c-75-68-118-125.hsd1.nh.comcast.net ([75.68.118.125]:48189
	helo=robin) by srv08.macroped.com with esmtp (Exim 4.80)
	(envelope-from <bbell@robin.thebellsplace.net>)
	id 1U7rNZ-0005BU-Nh; Tue, 19 Feb 2013 12:53:21 -0500
Received: by robin (Postfix, from userid 1000)
	id B6259200C15; Tue, 19 Feb 2013 12:53:24 -0500 (EST)
Date: Tue, 19 Feb 2013 12:53:24 -0500
From: Bob Bell <b_diffutils@thebellsplace.com>
To: Paul Eggert <eggert@cs.ucla.edu>
Message-ID: <20130219175324.GB3751@robin.thebellsplace.net>
References: <20120927185844.GK5273@robin.thebellsplace.net>
	<20121004052741.GD5273@robin.thebellsplace.net>
	<506D2080.4030705@cs.ucla.edu>
	<20121006220431.GA3678@robin.thebellsplace.net>
	<20121019163147.GJ15585@robin.thebellsplace.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <20121019163147.GJ15585@robin.thebellsplace.net>
X-Editor: Vim http://www.vim.org/
User-Agent: Mutt/1.5.21 (2010-09-15)
X-AntiAbuse: This header was added to track abuse,
	please include it with any abuse report
X-AntiAbuse: Primary Hostname - srv08.macroped.com
X-AntiAbuse: Original Domain - gnu.org
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - robin.thebellsplace.net
X-Get-Message-Sender-Via: srv08.macroped.com: acl_c_relayhosts_text_entry:
	admin@thebellsplace.com|thebellsplace.com
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 74.54.75.218
Cc: bug-diffutils@gnu.org
Subject: Re: [bug-diffutils] Getting all versions, but skipping overlaps
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Feb 2013 19:09:38 -0000

This is something that would really make merging easier for me.  Should 
I work on coding up a solution of my own?  It would take a lot of work 
to become familiar with the code develop an approach, but I could try 
that if I knew it wouldn't be in vain.

Thanks.

On Fri, Oct 19, 2012 at 12:31:47PM -0400, Bob Bell wrote:
>Paul, apologies for top-quoting, but do you have any thoughts regarding
>the email I sent below?
>
>On Sat, Oct 06, 2012 at 06:04:31PM -0400, Bob Bell wrote:
>>On Wed, Oct 03, 2012 at 10:37:04PM -0700, Paul Eggert wrote:
>>> On 10/03/2012 10:27 PM, Bob Bell wrote:> what I'd really like is 
>>to display the merges > >> file, bracketing the conflicting 
>>changes, NOT including when FILE0 and > >> FILE1 made identical 
>>changes, but when there *IS* a conflicting change, > >> I'd like to 
>>see FILE0, FILE1 *and* FILE2/FILEC.
>>> > Something like that sounds plausible, yes.  Can you give a 
>>brief
>>> example of input files, and what the output would look like,
>>> compared to what it looks like with the various options now?
>>> That'd help us understand exactly what you're proposing.
>>
>>Excellent.  I'm trying to think of the best way to illustrate this, with
>>attaching 6 different files (let me know if you'd like that).  I'll
>>try this approach:
>>
>>We have three files: fileA, fileB and fileC.  fileA was the original
>>file, with 6 lines, from "line 1" through "line 6".  fileB and fileC
>>began as copies of fileA.  Then, fileB changed "line 2" to "line
>>two", while fileC changed "line 2" to "line too".  Both fileB and
>>fileC changed "line eight" to "line ocho".
>>
>>The output of `diff3 -m -X fileC fileA fileB` is:
>>line 1
>><<<<<<< fileC
>>line too
>>=======
>>line two
>>>>>>>>> fileB
>>line 3
>>line 4
>>line cinco
>>line 6
>>
>>The output of `diff3 -m -A fileC fileA fileB` is:
>>line 1
>><<<<<<< fileC
>>line too
>>||||||| fileA
>>line 2
>>=======
>>line two
>>>>>>>>> fileB
>>line 3
>>line 4
>><<<<<<< fileA
>>line 5
>>=======
>>line cinco
>>>>>>>>> fileB
>>line 6
>>
>>My DESIRED output in this situation, perhaps from "-m -A -X", or
>>something new like "-m -X -2", is:
>>line 1
>><<<<<<< fileC
>>line too
>>||||||| fileA
>>line 2
>>=======
>>line two
>>>>>>>>> fileB
>>line 3
>>line 4
>>line cinco
>>line 6
>>
>>I'd be happen to answer any more questions about this.  I really think
>>that it would be beneficial in a number of circumstances I've
>>encountered.
>>
>>-- Bob
>>


