From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: make change-history on non-master branches Date: Wed, 18 Nov 2015 13:10:11 -0500 Message-ID: <9ta8qb5gcc.fsf@fencepost.gnu.org> References: <831tbqc4pc.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447870225 21703 80.91.229.3 (18 Nov 2015 18:10:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 18 Nov 2015 18:10:25 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 18 19:10: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 1Zz7BV-0003mv-3L for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 19:10:21 +0100 Original-Received: from localhost ([::1]:37425 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7BU-0001ro-GT for ged-emacs-devel@m.gmane.org; Wed, 18 Nov 2015 13:10:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7BP-0001oP-30 for emacs-devel@gnu.org; Wed, 18 Nov 2015 13:10:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz7BO-0006nh-CK for emacs-devel@gnu.org; Wed, 18 Nov 2015 13:10:15 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz7BM-0006nN-S0; Wed, 18 Nov 2015 13:10:12 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1Zz7BM-0002C9-3r; Wed, 18 Nov 2015 13:10:12 -0500 X-Spook: Pirates Waco, Texas initiative CESID ANC Weapons grade X-Ran: zCpr`}_RSh+8dx&4NWH[EDR6Lc:[]"CG6D8QPc~B`6sh&c:j_"n5WcvfX4VFVcxwfpA;ql X-Hue: red X-Attribution: GM In-Reply-To: <831tbqc4pc.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 16 Nov 2015 18:02:55 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:194732 Archived-At: Eli Zaretskii wrote: >> And the resulting ChangeLog.2 entries (and more importantly, any >> corrections) will have to be merged to master, just like in the old days? > > Maybe I'm missing something, but why do we have to merge it? Won't > "make change-history" create on each branch the file that branch > wants? > > If we can avoid merging, we could teach gitmerge.el skip that file. The issue is the hand-written corrections. Someone makes a commit to emacs-25. The commit log message has an error on it (eg wrong author). ChangeLog.2 is generated (to reiterate, currently it refuses to do so on non-master branches) and corrected. Now the correction needs to be propagated to master. If you make gitmerge.el ignore ChangeLog.2 you'll lose the corrections, or have to make them twice. BTW, gitmerge.el should not ignore any other (non-generated) ChangeLog.