From: Dave Abrahams <dave@boostpro.com>
To: help-gnu-emacs@gnu.org
Subject: ediff-merge ancestor refinement
Date: Thu, 14 Jul 2011 16:09:08 -0400 [thread overview]
Message-ID: <m27h7kpqu3.fsf@boostpro.com> (raw)
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<unsigned> Add(&ActiveBlocks[AddedTo],
ActiveBlocks.size() - AddedTo);
addThroughConstraints(Intf, Add);
>>>>>>> variant B
if (ActiveBlocks.size() == AddedTo)
break;
addThroughConstraints(Cand.Intf,
ArrayRef<unsigned>(ActiveBlocks).slice(AddedTo));
####### Ancestor
if (ActiveBlocks.size() == AddedTo)
break;
addThroughConstraints(Intf,
ArrayRef<unsigned>(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?
--
Dave Abrahams
BoostPro Computing
http://www.boostpro.com
next reply other threads:[~2011-07-14 20:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-14 20:09 Dave Abrahams [this message]
2011-07-17 9:03 ` ediff-merge ancestor refinement Andreas Röhler
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=m27h7kpqu3.fsf@boostpro.com \
--to=dave@boostpro.com \
--cc=help-gnu-emacs@gnu.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.