From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Carsten Dominik Newsgroups: gmane.emacs.devel Subject: Re: Abolishing ChangeLog files (was: On the subject of Git, Bazaar, and the future of Emacs development) Date: Thu, 28 Mar 2013 12:05:08 +0100 Message-ID: References: <87y5d9p5td.fsf@dex.adm.naquadah.org> <87vc8dtbcb.fsf@lifelogs.com> <871ub1gmdf.fsf@engster.org> <87d2ulovd0.fsf@dex.adm.naquadah.org> <85r4j0h1ww.fsf@member.fsf.org> <85li98h1qx.fsf@member.fsf.org> <87ehf0b3x2.fsf@uwakimon.sk.tsukuba.ac.jp> <87obe3gaem.fsf@engster.org> <87ip4bj1ay.fsf_-_@earth.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (Mac OS X Mail 6.3 \(1503\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1364468714 2039 80.91.229.3 (28 Mar 2013 11:05:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Mar 2013 11:05:14 +0000 (UTC) Cc: emacs-devel@gnu.org To: Christopher Schmidt Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 28 12:05:41 2013 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 1ULAeK-0005Jj-NS for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 12:05:40 +0100 Original-Received: from localhost ([::1]:46132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULAdw-0003pJ-I1 for ged-emacs-devel@m.gmane.org; Thu, 28 Mar 2013 07:05:16 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULAdr-0003nG-Jq for emacs-devel@gnu.org; Thu, 28 Mar 2013 07:05:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULAdq-0002mo-7o for emacs-devel@gnu.org; Thu, 28 Mar 2013 07:05:11 -0400 Original-Received: from ezel.ic.uva.nl ([146.50.108.158]:59871) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULAdp-0002mb-WA for emacs-devel@gnu.org; Thu, 28 Mar 2013 07:05:10 -0400 Original-Received: from u016822.science.uva.nl (u016822.science.uva.nl [146.50.53.215]) (authenticated bits=0) by ezel.ic.uva.nl (8.13.8/8.13.8) with ESMTP id r2SB58r5018996 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Thu, 28 Mar 2013 12:05:08 +0100 In-Reply-To: <87ip4bj1ay.fsf_-_@earth.home> X-Mailer: Apple Mail (2.1503) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 146.50.108.158 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:158349 Archived-At: On 28 mrt. 2013, at 10:55, Christopher Schmidt = wrote: > David Engster writes: >> The most time consuming thing is fixing ChangeLogs (we don't have any >> in CEDET and generate them from commit logs). >=20 > I would like to suggest another change - how about removing ChangeLog > files from the development repository. I think these files are > redundant to the commit log of the vc. >=20 > Removing the files from the repository would clean diffs and reduce > merge conflicts. Considering distributed vc, a project's history = cannot > be thought of as to be list of consecutive increments. >=20 > Distributions of Emacs could include ChangeLog files generated from = the > vc commit log, of course. >=20 > Do I make sense? Are there any drawbacks? I think it makes sense. In fact, org-mode does already create ChangeLog entries automatically from git commit messages. We enforce commit message to have a section that does look just like a ChangeLog entry, and we extract these when the time is ripe for another merge with Emacs. Here is a recent example of such a commit message: = --------------------------------------------------------------------------= ---------------- org.el (org-store-link): Storing multiple links in the active region now = requires a triple prefix argument * org.el (org-store-link): Storing multiple links in the active region = now requires a triple prefix argument. Thanks to Matt Lundin for reporting bugs in this area. = --------------------------------------------------------------------------= ----------------- Indeed, this process does get rid of many conflicts, because the adding = of text to the beginning of a file (like ChangeLog) often causes merge conflicts. And = it avoids a lot of duplicate work. - Carsten=