From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: Re: A request: Moving away from ChangeLog Date: Tue, 1 Jun 2010 16:58:57 +0200 Message-ID: References: <2151275B-C80E-4B40-9022-8C9054020163@gmail.com> <871vd5dkqu.fsf@saadawi.sbszh.ch> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=WINDOWS-1252; format=flowed; delsp=yes Content-Transfer-Encoding: quoted-printable Return-path: Received: from [140.186.70.92] (port=40833 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJUIp-0001ur-CQ for emacs-orgmode@gnu.org; Tue, 01 Jun 2010 12:26:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJUIn-0004KH-Vu for emacs-orgmode@gnu.org; Tue, 01 Jun 2010 12:26:55 -0400 Received: from mail-ew0-f216.google.com ([209.85.219.216]:42137) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJUIn-0004IT-Px for emacs-orgmode@gnu.org; Tue, 01 Jun 2010 12:26:53 -0400 Received: by mail-ew0-f216.google.com with SMTP id 8so1263659ewy.8 for ; Tue, 01 Jun 2010 09:26:53 -0700 (PDT) In-Reply-To: <871vd5dkqu.fsf@saadawi.sbszh.ch> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Christian Egli Cc: emacs-orgmode@gnu.org Hi Christian, are we ready to install org-taskjuggler.el into Org-mode? Where do you want it, core or contrib? I did not yet hear from you that the FSF assignment process is done, could you please update me on that? Thanks. - Carsten On May 21, 2010, at 11:10 PM, Christian Egli wrote: > Hi all > > John Wiegley writes: > >> The Emacs ChangeLog is a file which predates the existence of freely >> available, project-wide version control. It was a way to see, in one >> place, the stream of changes occurring in a project -- something =20 >> which >> RCS could not do for you. > > The only problem is that we need to have a Changelog for upstream, =20 > i.e. > Emacs. > >> However, in this modern era of project-wide, atomic commits, the >> ChangeLog is not only an archaism, but is a continuous source of =20 >> merge >> conflicts. For example, when I reverted Russell's latest change -- a >> one-liner that was minor in the extreme -- I had to do with a merge >> conflict in lisp/ChangeLog. > > If the real problem you're trying to solve is the merge conflicts you > get with the Changelog files then the solution might be Bruno Haible=92s= > git merge driver for GNU-style ChangeLog files[1] (available in =20 > gnulib[2]). > > Automatic generation of the Changelog file sounds like a fine solution > and I'm all for it, but when it comes down to the actual =20 > requirements of > the Changelog (such as file and especially function names) things =20 > don't > look that rosy anymore (doesn't work outside of Emacs, can no longer =20= > use > M-x add-change-log-entry, etc). > > So before pouring out the baby with the bathwater maybe we should at > least try if the git merge driver solves the main problem we have with > the Changelog files. > > Thanks > Christian > > Footnotes: > [1] http://www.mail-archive.com/bug-gnulib@gnu.org/msg09183.html > [2] = http://git.savannah.gnu.org/gitweb/?p=3Dgnulib.git;a=3Dblob;f=3Dlib/git-me= rge-changelog.c > > --=20 > Christian Egli > Swiss Library for the Blind, Visually Impaired and Print Disabled > Grubenstrasse 12, CH-8045 Z=FCrich, Switzerland > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode - Carsten