From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 11:32:12 -0700 Organization: UCLA Computer Science Department Message-ID: <56F18FAC.30100@cs.ucla.edu> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <83zitr6civ.fsf@gnu.org> <83lh5b66jj.fsf@gnu.org> <8360wf5gmz.fsf@gnu.org> <83wpou4hb4.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1458671570 23197 80.91.229.3 (22 Mar 2016 18:32:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 18:32:50 +0000 (UTC) To: Stefan Monnier , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 19:32:42 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aiR6b-00066H-7U for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 19:32:37 +0100 Original-Received: from localhost ([::1]:38897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiR6a-00006I-P8 for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 14:32:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiR6I-0008Ua-2w for emacs-devel@gnu.org; Tue, 22 Mar 2016 14:32:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiR6E-0002g1-Lc for emacs-devel@gnu.org; Tue, 22 Mar 2016 14:32:17 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:60589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiR6E-0002fZ-H9 for emacs-devel@gnu.org; Tue, 22 Mar 2016 14:32:14 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 63107161232; Tue, 22 Mar 2016 11:32:13 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id EU5Aoa5lnXzB; Tue, 22 Mar 2016 11:32:12 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 6E9E5161234; Tue, 22 Mar 2016 11:32:12 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id p7IzCSYr1FlM; Tue, 22 Mar 2016 11:32:12 -0700 (PDT) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 54239161232; Tue, 22 Mar 2016 11:32:12 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202088 Archived-At: On 03/22/2016 09:30 AM, Stefan Monnier wrote: > We should probably remove > "merge" from bzrmerge-skip-regexp (and use "backport" as the main magic > keyword) or at least refine it to only match things like "don't merge". I tried gitmerge.el unchanged, found a similar bug with the proposed merge, removed "merge" from gitmerge-skip-regexp, redid the merge and found that it worked better this time, and committed the result into the master. The whole gitmerge.el business is still odd, though. What's up with merge commits like f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd whose commit message is merely "-"? Plus, ChangeLog generation is still broken in master. I'm becoming more inclined to install into master the patch I proposed in . Although this patch is merely a stopgap measure until someone figures out a better way to edit commit messages, it's clearly better than what we have now in 'master'.