From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#29366: gitmerge to handle NEWS better Date: Mon, 20 Nov 2017 13:16:41 -0500 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1511201836 18827 195.159.176.226 (20 Nov 2017 18:17:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 20 Nov 2017 18:17:16 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: monnier@iro.umontreal.ca, deng@randomsample.de To: 29366@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 20 19:17:11 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 1eGqd4-0004FV-51 for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Nov 2017 19:17:10 +0100 Original-Received: from localhost ([::1]:58776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGqd6-0000D2-8I for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Nov 2017 13:17:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGqcy-00008q-5o for bug-gnu-emacs@gnu.org; Mon, 20 Nov 2017 13:17:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGqcx-000852-AE for bug-gnu-emacs@gnu.org; Mon, 20 Nov 2017 13:17:04 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:40663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eGqcx-00084q-68 for bug-gnu-emacs@gnu.org; Mon, 20 Nov 2017 13:17:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eGqcw-0005NE-H9; Mon, 20 Nov 2017 13:17:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: deng@randomsample.de, monnier@iro.umontreal.ca, bug-gnu-emacs@gnu.org Resent-Date: Mon, 20 Nov 2017 18:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 29366 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: submit@debbugs.gnu.org X-Debbugs-Original-Xcc: deng@randomsample.de, monnier@iro.umontreal.ca Original-Received: via spool by submit@debbugs.gnu.org id=B.151120181420204 (code B ref -1); Mon, 20 Nov 2017 18:17:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 20 Nov 2017 18:16:54 +0000 Original-Received: from localhost ([127.0.0.1]:49342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eGqcn-0005FZ-OX for submit@debbugs.gnu.org; Mon, 20 Nov 2017 13:16:53 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:59381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eGqcm-0005AM-3p for submit@debbugs.gnu.org; Mon, 20 Nov 2017 13:16:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGqcd-0007y9-AN for submit@debbugs.gnu.org; Mon, 20 Nov 2017 13:16:47 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGqcd-0007y5-77 for submit@debbugs.gnu.org; Mon, 20 Nov 2017 13:16:43 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1eGqcb-0000qj-G1; Mon, 20 Nov 2017 13:16:41 -0500 X-Spook: Gangs Emergency CDC UN Fusion Center Majic Radiation X-Ran: 2@e&m2FN1!|V:$EyNWfL31NAACu 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:140152 Archived-At: Package: emacs Version: 25.3 Severity: wishlist Hi, Thanks for gitmerge.el, it's a great help. It would be nice if it could handle NEWS better. Currently etc/NEWS in the emacs-26 branch has been renamed to etc/NEWS.26 in master. Running M-x gitmerge, this is not detected. emacs-26:etc/NEWS changes are merged to master:etc/NEWS, resulting in a merge conflict every time NEWS is touched in emacs-26. Can gitmerge do something to help here?