all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Daniel Martín" <mardani29@yahoo.es>
To: Eliza Velasquez <exv@google.com>
Cc: emacs-devel <emacs-devel@gnu.org>
Subject: Re: ediff merge wrapper
Date: Tue, 03 Nov 2020 10:23:29 +0100	[thread overview]
Message-ID: <m1blgedca6.fsf@yahoo.es> (raw)
In-Reply-To: <CAK1djOrtK8x_jdwsqZh1NaN3g6FtWKnDD_7nUU7goKkNCGYAPg@mail.gmail.com> (Eliza Velasquez's message of "Mon, 2 Nov 2020 12:01:33 -0800")

Eliza Velasquez <exv@google.com> writes:

> Hello,
>
> Internally at Google, we have a wrapper performing an ediff merge with
> emacs/emacsclient which blocks until the merge operation has
> completed. It automatically handles edge cases such as creating a new
> frame over ssh in tty mode or being invoked as an emacs subprocess. I
> think it would be really useful to upstream a tool like this, given
> that using emacs as a merge tool that can be invoked by software such
> as mercurial or perforce can be very fiddly or have unexpected
> behavior.
>
> The biggest caveat is that the internal tool is written in golang, and
> I imagine that you will want it to be rewritten to C. So before I go
> and do that, I would like to gauge interest in distributing such a
> wrapper alongside emacsclient and the like. What do you think?

I think it's an interesting wrapper, yes.  I assume the main use case is
a very big repository where merge sets can be very large, right?

We could discuss if it has enough applicability to be in the Emacs core
distribution, but it's something I'd definitely like to see, at least as
part of the Emacs/VCS free software community.  Thanks.



  reply	other threads:[~2020-11-03  9:23 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02 20:01 ediff merge wrapper Eliza Velasquez
2020-11-03  9:23 ` Daniel Martín [this message]
2020-11-03 16:42 ` chad
2020-11-03 16:47 ` Eli Zaretskii
2020-11-03 18:44   ` Eliza Velasquez
2020-11-05  2:18     ` Eliza Velasquez

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=m1blgedca6.fsf@yahoo.es \
    --to=mardani29@yahoo.es \
    --cc=emacs-devel@gnu.org \
    --cc=exv@google.com \
    /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.