From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-15?Q?Andreas_R=F6hler?= Newsgroups: gmane.emacs.help Subject: Re: ediff-merge ancestor refinement Date: Sun, 17 Jul 2011 11:03:45 +0200 Message-ID: <4E22A571.3090506@easy-emacs.de> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1310893946 9466 80.91.229.12 (17 Jul 2011 09:12:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 17 Jul 2011 09:12:26 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sun Jul 17 11:12:19 2011 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QiNOd-0001Lu-Co for geh-help-gnu-emacs@m.gmane.org; Sun, 17 Jul 2011 11:12:19 +0200 Original-Received: from localhost ([::1]:43490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QiNOc-0000JG-B6 for geh-help-gnu-emacs@m.gmane.org; Sun, 17 Jul 2011 05:12:18 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:49366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QiNGP-0006q8-KM for help-gnu-emacs@gnu.org; Sun, 17 Jul 2011 05:03:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QiNGO-0000uY-8N for help-gnu-emacs@gnu.org; Sun, 17 Jul 2011 05:03:49 -0400 Original-Received: from moutng.kundenserver.de ([212.227.126.171]:52871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QiNGN-0000uR-Fz for help-gnu-emacs@gnu.org; Sun, 17 Jul 2011 05:03:48 -0400 Original-Received: from [192.168.178.27] (brln-4dbc6ccd.pool.mediaWays.net [77.188.108.205]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MF8Xf-1QftLV0XiF-00GKTh; Sun, 17 Jul 2011 11:03:46 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686; de; rv:1.9.2.18) Gecko/20110616 SUSE/3.1.11 Thunderbird/3.1.11 In-Reply-To: X-Provags-ID: V02:K0:FnAHxTUEZLOkOsu7PH1hbP/a/xasCAssRLpuNUzTGNj nfZB+J4hJSCGITlwzelJlrxCN4PDZg2UWv9qgMIdVrRLJnbYUV BzPW8AHl468JJAFR4HvenkV3Zwlos/JEm7cI1fYQ5F9sPOFFfZ 6iL/00VuNpxiNbKHcEF5hQoh+rOJH12eyruYx0inBtorExfJp6 93H/REftT6lBbC8vz4FxLSkshZjA27pzW6BOTHEV64= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.126.171 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:81625 Archived-At: Am 14.07.2011 22:09, schrieb Dave Abrahams: > > Hi, > > When I'm doing an ediff-merge, it shows refinement regions of A > with-respect-to B. But what I'm *really* interested in, when I have a > conflict, is to see the difference between each of the final buffers and > their ancestor. For example, I had to resolve this merge conflict today: > > <<<<<<< variant A > if (ActiveBlocks.size()> AddedTo) { > ArrayRef Add(&ActiveBlocks[AddedTo], > ActiveBlocks.size() - AddedTo); > addThroughConstraints(Intf, Add); >>>>>>>> variant B > if (ActiveBlocks.size() == AddedTo) > break; > addThroughConstraints(Cand.Intf, > ArrayRef(ActiveBlocks).slice(AddedTo)); > ####### Ancestor > if (ActiveBlocks.size() == AddedTo) > break; > addThroughConstraints(Intf, > ArrayRef(ActiveBlocks).slice(AddedTo)); > ======= end > > If you look really carefully, you can see that variant B added "Cand." > in the 3rd line. But it was really hard for me to see that. Once I did > see it, the merge was trivial. Wouldn't it be possible to highlight > diffs in A and B with-respect-to the Ancestor buffer? > > Hmm, I see we have a face for something like that: > > ,---- > | Face: ediff-fine-diff-Ancestor > | > | Documentation: > | Face for highlighting the refinement of the selected diff in the ancestor buffer. > | At present, this face is not used and no fine differences are computed for the > | ancestor buffer. > `---- > > Is this especially hard to code or something? > Hi, reads like a useful request for me. But wrong list. Either a bug report or sending it to emacs-devel seems TRT. Thanks, Andreas