From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Generating ChangeLog files. Date: Fri, 03 Jan 2014 12:12:35 +0200 Message-ID: <83a9fdxtkc.fsf@gnu.org> References: <20140102095347.6834E381D0C@snark.thyrsus.com> <8761q1ljny.fsf@gmail.com> <87lhyxqztz.fsf@gmx.de> <10213981.FjEGGXvRcv@descartes> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1388743966 32429 80.91.229.3 (3 Jan 2014 10:12:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Jan 2014 10:12:46 +0000 (UTC) Cc: thierry.volpiatto@gmail.com, michael.albinus@gmx.de, emacs-devel@gnu.org To: =?utf-8?Q?R=C3=BCdiger?= Sonderfeld Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 03 11:12:50 2014 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 1Vz1kI-0003Lt-1g for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 11:12:50 +0100 Original-Received: from localhost ([::1]:48974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1kH-0003QT-Eu for ged-emacs-devel@m.gmane.org; Fri, 03 Jan 2014 05:12:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1k9-0003Q9-Ch for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:12:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vz1k4-0004QI-5E for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:12:41 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:48172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vz1k3-0004P2-Tf for emacs-devel@gnu.org; Fri, 03 Jan 2014 05:12:36 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0MYT00B00LIKLJ00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Fri, 03 Jan 2014 12:12:34 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MYT00BTGLOYHD80@a-mtaout23.012.net.il>; Fri, 03 Jan 2014 12:12:34 +0200 (IST) In-reply-to: <10213981.FjEGGXvRcv@descartes> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:167139 Archived-At: > From: R=C3=BCdiger Sonderfeld > Date: Fri, 03 Jan 2014 10:31:39 +0100 > Cc: Michael Albinus , > =09Thierry Volpiatto >=20 > I usually write patches on a branch and rebase them when they are r= eady to be=20 > pushed. This always causes merge conflicts for the ChangeLog. (Ma= ybe [1]=20 > could help a bit.) There should be no merge conflicts with ChangeLog files. I see an absolute zero of them. git-merge-changelog and the changelog_merge plugin in bzr make this not an issue. > E.g., GNU Octave replaced ChangeLog with an auto-generated ChangeLo= g from=20 > commit messages and they seem to be quite happy with that solution. I've seen a couple of projects that eliminated ChangeLogs. In every single case, the result was a drastic deterioration in the quality of the commit log information. > I know the topic has been discussed several times and it seems a bi= t pointless=20 > to start the discussion again. But in my opinion ChangeLogs are an= even=20 > bigger issue than the VC because at least I can work around the lat= ter by=20 > using git-bzr. As pointed out above, you should be able to resolve the former as well, in no time.