emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Carsten Dominik <carsten.dominik@gmail.com>
To: Christian Egli <christian.egli@sbszh.ch>
Cc: emacs-orgmode@gnu.org
Subject: Re: Re: A request: Moving away from ChangeLog
Date: Tue, 1 Jun 2010 16:58:57 +0200	[thread overview]
Message-ID: <EDF6AA74-D630-41AF-B859-58A022A7E586@gmail.com> (raw)
In-Reply-To: <871vd5dkqu.fsf@saadawi.sbszh.ch>

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 <jwiegley@gmail.com> 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  
>> which
>> RCS could not do for you.
>
> The only problem is that we need to have a Changelog for upstream,  
> 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  
>> 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’s
> git merge driver for GNU-style ChangeLog files[1] (available in  
> 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  
> requirements of
> the Changelog (such as file and especially function names) things  
> don't
> look that rosy anymore (doesn't work outside of Emacs, can no longer  
> 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=gnulib.git;a=blob;f=lib/git-merge-changelog.c
>
> -- 
> Christian Egli
> Swiss Library for the Blind, Visually Impaired and Print Disabled
> Grubenstrasse 12, CH-8045 Zürich, 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

  parent reply	other threads:[~2010-06-01 16:26 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-21  9:06 A request: Moving away from ChangeLog John Wiegley
2010-05-21  9:41 ` John Wiegley
2010-05-21 12:15   ` Carsten Dominik
2010-05-21 12:50     ` John Wiegley
2010-05-21 13:47       ` Tassilo Horn
2010-05-21 15:06         ` John Wiegley
2010-05-21 15:39           ` Bernt Hansen
2010-05-21 15:46             ` John Wiegley
2010-05-21 16:01               ` Bernt Hansen
2010-05-21 16:32             ` Eric Schulte
2010-05-21 15:53           ` Carsten Dominik
2010-05-21 15:58             ` John Wiegley
2010-05-21 14:32       ` Carsten Dominik
2010-05-21 15:08         ` John Wiegley
2010-05-21 15:33         ` John Wiegley
2010-05-21 13:01     ` Ben Finney
2010-05-21 14:21       ` Carsten Dominik
2010-05-21 21:10 ` Christian Egli
2010-05-21 21:17   ` Julien Danjou
2010-06-01 14:58   ` Carsten Dominik [this message]
2010-06-02  7:44     ` Christian Egli
2010-06-02  9:32       ` Carsten Dominik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=EDF6AA74-D630-41AF-B859-58A022A7E586@gmail.com \
    --to=carsten.dominik@gmail.com \
    --cc=christian.egli@sbszh.ch \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).