From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: make change-history on non-master branches Date: Thu, 19 Nov 2015 09:35:50 +0100 Message-ID: References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> <83egfn9nmp.fsf@gnu.org> <83bnar9mcd.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447922180 20697 80.91.229.3 (19 Nov 2015 08:36:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Nov 2015 08:36:20 +0000 (UTC) Cc: Glenn Morris , 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 Thu Nov 19 09:36:13 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 1ZzKhE-0000dN-Id for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2015 09:36:00 +0100 Original-Received: from localhost ([::1]:40171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzKhD-0006Sg-Od for ged-emacs-devel@m.gmane.org; Thu, 19 Nov 2015 03:35:59 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzKhA-0006PX-NI for emacs-devel@gnu.org; Thu, 19 Nov 2015 03:35:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzKh9-0000OK-QM for emacs-devel@gnu.org; Thu, 19 Nov 2015 03:35:56 -0500 Original-Received: from mx2.suse.de ([195.135.220.15]:46801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzKh5-0000NX-Ri; Thu, 19 Nov 2015 03:35:51 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Original-Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 24CC6ABE5; Thu, 19 Nov 2015 08:35:27 +0000 (UTC) X-Yow: Yow! Is my fallout shelter termite proof? In-Reply-To: <83bnar9mcd.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 18 Nov 2015 20:46:58 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 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:194776 Archived-At: Eli Zaretskii writes: >> From: Glenn Morris >> Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org >> Date: Wed, 18 Nov 2015 13:28:08 -0500 >> >> Eli Zaretskii wrote: >> >> > Right. But if we merge ChangeLog.2 from the release branch to master, >> > then this will produce a mess when "make change-history" is run on >> > master, no? I mean, some entries will appear twice, once after >> > corrections, the other without. No? >> >> Quite possibly. I don't know exactly what happens if the commit hash >> from the ChangeLog.2 footer were to get merged between branches. You get a merge conflict. > Perhaps Git gurus could help us out? Andreas, any suggestions? You need to resolve the merge conflict one way or the other. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."