From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: ediff merge wrapper
Date: Tue, 03 Nov 2020 18:47:17 +0200
Message-ID: <838sbicrqi.fsf@gnu.org>
References: <CAK1djOrtK8x_jdwsqZh1NaN3g6FtWKnDD_7nUU7goKkNCGYAPg@mail.gmail.com>
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="21502"; mail-complaints-to="usenet@ciao.gmane.io"
Cc: emacs-devel@gnu.org
To: Eliza Velasquez <exv@google.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Nov 03 17:49:28 2020
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane-mx.org
Original-Received: from lists.gnu.org ([209.51.188.17])
	by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.92)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1kZzUu-0005Ud-73
	for ged-emacs-devel@m.gmane-mx.org; Tue, 03 Nov 2020 17:49:28 +0100
Original-Received: from localhost ([::1]:43428 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1kZzUt-0005pt-9T
	for ged-emacs-devel@m.gmane-mx.org; Tue, 03 Nov 2020 11:49:27 -0500
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46894)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>) id 1kZzSv-0003Rh-Bx
 for emacs-devel@gnu.org; Tue, 03 Nov 2020 11:47:25 -0500
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:47023)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <eliz@gnu.org>)
 id 1kZzSu-00035S-Tr; Tue, 03 Nov 2020 11:47:24 -0500
Original-Received: from [176.228.60.248] (port=3119 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <eliz@gnu.org>)
 id 1kZzSu-0003O2-B7; Tue, 03 Nov 2020 11:47:24 -0500
In-Reply-To: <CAK1djOrtK8x_jdwsqZh1NaN3g6FtWKnDD_7nUU7goKkNCGYAPg@mail.gmail.com>
 (message from Eliza Velasquez on Mon, 2 Nov 2020 12:01:33 -0800)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Original-Sender: "Emacs-devel"
 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Xref: news.gmane.io gmane.emacs.devel:258650
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/258650>

> From: Eliza Velasquez <exv@google.com>
> Date: Mon, 2 Nov 2020 12:01:33 -0800
> 
> 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.

Can you describe the use of this tool in more detail, and what
enhancements it implements beyond what emacsclient provides?  I don't
think I understand that from your short description.

Thanks.