From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: David Engster Newsgroups: gmane.emacs.bugs Subject: bug#29366: gitmerge to handle NEWS better Date: Tue, 12 Dec 2017 21:10:42 +0100 Message-ID: <87bmj31zct.fsf@engster.org> References: <6rpo7lnkp5.fsf@fencepost.gnu.org> <87fu8g26ra.fsf@engster.org> <0gbmj4et6b.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1513109478 30354 195.159.176.226 (12 Dec 2017 20:11:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 12 Dec 2017 20:11:18 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3.50 (gnu/linux) Cc: 29366@debbugs.gnu.org, monnier@iro.umontreal.ca To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Dec 12 21:11:09 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1eOqtR-0007TM-1M for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Dec 2017 21:11:09 +0100 Original-Received: from localhost ([::1]:60313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOqtX-0001sH-71 for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Dec 2017 15:11:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOqtN-0001rz-TP for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2017 15:11:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOqtK-0000zu-Pr for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2017 15:11:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eOqtK-0000zm-Lp for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2017 15:11:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eOqtK-0001YQ-CO for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2017 15:11:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: David Engster Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 12 Dec 2017 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29366 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29366-submit@debbugs.gnu.org id=B29366.15131094515953 (code B ref 29366); Tue, 12 Dec 2017 20:11:02 +0000 Original-Received: (at 29366) by debbugs.gnu.org; 12 Dec 2017 20:10:51 +0000 Original-Received: from localhost ([127.0.0.1]:58943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOqt8-0001Xx-TM for submit@debbugs.gnu.org; Tue, 12 Dec 2017 15:10:51 -0500 Original-Received: from randomsample.de ([5.45.97.173]:42268) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOqt7-0001Xn-OF for 29366@debbugs.gnu.org; Tue, 12 Dec 2017 15:10:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=GVeL3BZQPSIavVrAUWAQJ9PO9qt9M9I6SHdpDRKKJZw=; b=ZFTuUgpldCqTQ2p24yPYAsHL0s2GZIIriaXw22p/MsgSVSv4vDWORc4Mo87PW/u+I5dRlotiqeHKwnOkx0KIDo5Ed9HPdEZZ6d6mDnY8phS0IXgt3RZlXO2hBzLymiPu; Original-Received: from ip4d167df7.dynamic.kabel-deutschland.de ([77.22.125.247] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1eOqt5-00021z-KJ; Tue, 12 Dec 2017 21:10:47 +0100 In-Reply-To: <0gbmj4et6b.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 11 Dec 2017 18:33:32 -0500") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:141003 Archived-At: Glenn Morris writes: > David Engster wrote: > >> I'm not sure about that smerge stuff either, that was something I took >> over from bzrmerge. It may be that it is not functional. I hope I can >> make time to take a look at this in the coming days. > > Thanks! Here's my revised patch for this. It just does a commit after a > successful auto-conflict resolution. It seems to work... Indeed, that final commit was missing. It works for me as well. -David