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: make change-history on non-master branches Date: Sun, 20 Dec 2015 13:21:00 -0800 Organization: UCLA Computer Science Department Message-ID: <56771BBC.6070403@cs.ucla.edu> References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> <83egfn9nmp.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 1450646492 27162 80.91.229.3 (20 Dec 2015 21:21:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 20 Dec 2015 21:21:32 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 20 22:21:23 2015 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 1aAlPu-0007Ge-Uk for ged-emacs-devel@m.gmane.org; Sun, 20 Dec 2015 22:21:23 +0100 Original-Received: from localhost ([::1]:42069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAlPt-0000ct-OH for ged-emacs-devel@m.gmane.org; Sun, 20 Dec 2015 16:21:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAlPh-0000cm-2F for emacs-devel@gnu.org; Sun, 20 Dec 2015 16:21:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aAlPg-0006Db-88 for emacs-devel@gnu.org; Sun, 20 Dec 2015 16:21:08 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:36223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAlPa-0006DF-L4; Sun, 20 Dec 2015 16:21:02 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 0049B160017; Sun, 20 Dec 2015 13:21:01 -0800 (PST) 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 7tVBxSCadXZr; Sun, 20 Dec 2015 13:21:01 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 5051D160193; Sun, 20 Dec 2015 13:21:01 -0800 (PST) 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 yQ5kHWGp_czX; Sun, 20 Dec 2015 13:21:01 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 3020C160017; Sun, 20 Dec 2015 13:21:01 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.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:196571 Archived-At: Glenn Morris wrote: > Over a month has passed with no merge from release branch to master. > > Still, at least we seem to have finally found a way to get more people > to use the release branch!;) The *exact same* thought had occurred to me, and that's why fixing merges has been lower priority for me. I have made only a bit of progress since my last proposed patch in this area, and will eventually propose a revised patch. Perhaps the best bet will be for me to just do a merge, which will undoubtedly have problems, and then we can fix the problems and come up with a revised merge procedure after that. It may well take two or more merges to get it right.