From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ludo@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) Newsgroups: gmane.lisp.guile.devel Subject: Re: git and changelogs Date: Tue, 15 Jul 2008 20:54:04 +0200 Message-ID: <87bq0zger7.fsf@gnu.org> References: <873aoanjcl.fsf@ambire.localdomain> <49dd78620807111522p61119440n3638f8cb6f69cddc@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1216148076 3642 80.91.229.12 (15 Jul 2008 18:54:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 15 Jul 2008 18:54:36 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Tue Jul 15 20:55:24 2008 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KIpgD-0001sM-P1 for guile-devel@m.gmane.org; Tue, 15 Jul 2008 20:55:18 +0200 Original-Received: from localhost ([127.0.0.1]:45723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KIpfL-0006Ek-H8 for guile-devel@m.gmane.org; Tue, 15 Jul 2008 14:54:23 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KIpfF-0006Do-Qg for guile-devel@gnu.org; Tue, 15 Jul 2008 14:54:17 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KIpfE-0006Db-8i for guile-devel@gnu.org; Tue, 15 Jul 2008 14:54:17 -0400 Original-Received: from [199.232.76.173] (port=36255 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KIpfE-0006DY-3k for guile-devel@gnu.org; Tue, 15 Jul 2008 14:54:16 -0400 Original-Received: from main.gmane.org ([80.91.229.2]:38727 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KIpfD-0005OK-Pg for guile-devel@gnu.org; Tue, 15 Jul 2008 14:54:16 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1KIpf9-0006pq-I2 for guile-devel@gnu.org; Tue, 15 Jul 2008 18:54:11 +0000 Original-Received: from reverse-83.fdn.fr ([80.67.176.83]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 15 Jul 2008 18:54:11 +0000 Original-Received: from ludo by reverse-83.fdn.fr with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 15 Jul 2008 18:54:11 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 23 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: reverse-83.fdn.fr X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 28 Messidor an 216 de la =?iso-8859-1?Q?R=E9volution?= X-PGP-Key-ID: 0xEA52ECF4 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 821D 815D 902A 7EAB 5CEE D120 7FBA 3D4F EB1F 5364 X-OS: i686-pc-linux-gnu User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) Cancel-Lock: sha1:10DHP6zFyF1podJm6zGqfsEJEz0= X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:7379 Archived-At: Hi, "Neil Jerram" writes: > 2008/5/22 Thien-Thi Nguyen : >> >> There was discussion on Git + ChangeLog on the gnulib list about half a >> year back. I can't recall the outcome, but do remember one side effect >> was that someone wrote a merge program specifically for ChangeLog files, >> that could hook into Git somehow. > > Attached is my attempt (thus far) at such a program. BTW, Gnulib has two related scripts: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=modules/git-merge-changelog http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=modules/gitlog-to-changelog The former is helpful when using good old `ChangeLog' files with Git, while the latter is convenient when not using `ChangeLog' files. Thanks, Ludovic.