From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Resuming M-x gitmerge Date: Mon, 11 Jun 2018 19:00:11 +0300 Message-ID: <83bmchqpo4.fsf@gnu.org> References: <87h8mayz71.fsf@gmail.com> <83sh5uqc8w.fsf@gnu.org> <83fu1tqr1q.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1528732916 21740 195.159.176.226 (11 Jun 2018 16:01:56 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Jun 2018 16:01:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 11 18:01:52 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fSPGQ-0005XK-C9 for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 18:01:50 +0200 Original-Received: from localhost ([::1]:49839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSPIX-0006Nx-8t for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 12:04:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSPEm-0004cL-DE for emacs-devel@gnu.org; Mon, 11 Jun 2018 12:00:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSPEh-0002Qi-Jo for emacs-devel@gnu.org; Mon, 11 Jun 2018 12:00:08 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSPEh-0002Qe-Gl; Mon, 11 Jun 2018 12:00:03 -0400 Original-Received: from [176.228.60.248] (port=2103 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fSPEg-0000UJ-VJ; Mon, 11 Jun 2018 12:00:03 -0400 In-reply-to: (message from Stefan Monnier on Mon, 11 Jun 2018 11:46:53 -0400) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:226223 Archived-At: > From: Stefan Monnier > Date: Mon, 11 Jun 2018 11:46:53 -0400 > > >> I think it's a new (default?) behaviour change in smerge-mode as of > >> Emacs 25. Anyway, it doesn't matter for M-x gitmerge, because > >> gitmerge-repo-clean checks for both staged and unstaged changes. > >> Therefore it seems that you *must* "add resolved files and commit the > >> merge yourself" in order to proceed. > > That's an annoyance. Why was the default changed, and why cannot > > IIUC the change referred to is that before Emacs-25, VC didn't > automatically "git add" when finishing an smerge session. > IOW the annoyance affects Emacs<25 rather than Emacsā‰„25. OK, but then why doesn't it work for Noam with the current versions of Emacs?