From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Resuming M-x gitmerge Date: Mon, 11 Jun 2018 12:14:36 -0400 Message-ID: References: <87h8mayz71.fsf@gmail.com> <83sh5uqc8w.fsf@gnu.org> <83fu1tqr1q.fsf@gnu.org> <83bmchqpo4.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1528733664 7529 195.159.176.226 (11 Jun 2018 16:14:24 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Jun 2018 16:14:24 +0000 (UTC) Cc: Stefan Monnier , Emacs developers To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 11 18:14:19 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 1fSPSV-0001q3-8K for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 18:14:19 +0200 Original-Received: from localhost ([::1]:49960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSPUc-0007LT-CN for ged-emacs-devel@m.gmane.org; Mon, 11 Jun 2018 12:16:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSPSq-0006UZ-3y for emacs-devel@gnu.org; Mon, 11 Jun 2018 12:14:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSPSp-00019A-78 for emacs-devel@gnu.org; Mon, 11 Jun 2018 12:14:40 -0400 Original-Received: from mail-ot0-x22b.google.com ([2607:f8b0:4003:c0f::22b]:42079) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSPSn-00018q-UU; Mon, 11 Jun 2018 12:14:38 -0400 Original-Received: by mail-ot0-x22b.google.com with SMTP id 92-v6so24415783otw.9; Mon, 11 Jun 2018 09:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=OcSpVzXpLt+btBHtgYzPG2rDq77+MRNPeE13skijx2U=; b=EcYbZAEUyFr7UTbrjLGYLlIB1Hq7Y+Ji+BeaAp7B2Qj0e/pmiLbV2f+Gze2DMqesvg 4EtbTGt+MMqXA/9EAGM6YIpnwH1plFAUt/wjxC9bSVQ5AqgRcyz+YG9Zy6FkVcmKYL8t Fk7LlcwwA/fXllAhF8Ddew1hnPElmgkVFg/+p9lKrEe18heTZtWxafovf4bUNtfR8FTA yr02YNFC6vENKouavlG3e8zA0T+F+z+4y1+jl66/CmxajmvlPPrGkO2VJsTy5rtauNNw 6AbGsuo1q9xLa1jar+i6ObmZa+14CKze10/oZsVgoLOFGY+scRZIe4wgHpL4ZR6xT+Ng xiEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=OcSpVzXpLt+btBHtgYzPG2rDq77+MRNPeE13skijx2U=; b=S1Ki7dWyUZZ/thhnn/O18FQRJr2uOgAIxRMp67SVNc+78liEreJ9cXyu9cD49uR5If ubEWdzBCrVELY03Htjtg7/JrCP9h4zvG7Vwn8yWEbOjnWB2o1CR1I7zwMkydVzSXP81X HYrLKNH9g1Ft5VdnVngaHmLPJUYcmiramog5w1LyDYNG7oWOa2XnkI115okFXJIrU4Ss 79pEPHUqfLclm98lw3rMHmcztRukjQz+yjIwi5++48cgras31TIienaxVl11lcyVL2aP rY4QN4L0dr+YcGsp9brBpZOhyCZ/6Enc4VtDf9qC89JIpyHx15nnD9CkakZ6ajmIgQ2H AyUw== X-Gm-Message-State: APt69E2wD+QFNDOxRzECm0/HHR0laT1ZYeHHLvyTlIa3EUoWM2Zx4DNI 0nc28dIWVjCUgj003H9cctO0pa5Jk33CrTiFjXI= X-Google-Smtp-Source: ADUXVKJEoHlKP3NA0fv7hXNkSPnjsjq9h103YVLc7InG7HU4m2yHc3K1WYyNdiYhlM9MeUrPmLUfJW54FbLgQyN63a4= X-Received: by 2002:a9d:94:: with SMTP id w20-v6mr10684510oti.248.1528733677251; Mon, 11 Jun 2018 09:14:37 -0700 (PDT) Original-Received: by 2002:a4a:3b84:0:0:0:0:0 with HTTP; Mon, 11 Jun 2018 09:14:36 -0700 (PDT) In-Reply-To: <83bmchqpo4.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c0f::22b 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:226225 Archived-At: On 11 June 2018 at 12:00, Eli Zaretskii wrote: >> 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=E2=89=A525. > > OK, but then why doesn't it work for Noam with the current versions of > Emacs? Miscommunication; when I said that I had "add resolved files" I considered using smerge to automatically to call 'git add' automatically as adding the resolved files (i.e., that gitmerge.el doesn't do it). Anyway, the real question is about the committing the merge it seems.