From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: Re: Syncing Gnus with Emacs and back Date: Thu, 14 Oct 2004 16:47:40 +0900 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: References: <20041009211043.GA8161@fencepost> <20041009211907.GC8161@fencepost> <20041010225828.GA31829@fencepost> <87is9gj8v5.fsf@jurta.org> <20041012150351.GA24206@fencepost> <20041013225128.GB8391@fencepost> Reply-To: Miles Bader NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1097740137 11268 80.91.229.6 (14 Oct 2004 07:48:57 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 14 Oct 2004 07:48:57 +0000 (UTC) Cc: ding@gnus.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Oct 14 09:48:50 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CI0Lx-0006zV-00 for ; Thu, 14 Oct 2004 09:48:50 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CI0T2-0004TG-CT for ged-emacs-devel@m.gmane.org; Thu, 14 Oct 2004 03:56:08 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CI0Sg-0004T7-5e for emacs-devel@gnu.org; Thu, 14 Oct 2004 03:55:46 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CI0Sf-0004Sk-6p for emacs-devel@gnu.org; Thu, 14 Oct 2004 03:55:45 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CI0Se-0004SZ-Rc for emacs-devel@gnu.org; Thu, 14 Oct 2004 03:55:44 -0400 Original-Received: from [202.32.8.202] (helo=tyo202.gate.nec.co.jp) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CI0L3-0002ty-ND; Thu, 14 Oct 2004 03:47:54 -0400 Original-Received: from mailgate4.nec.co.jp (mailgate53.nec.co.jp [10.7.69.184]) by tyo202.gate.nec.co.jp (8.11.7/3.7W01080315) with ESMTP id i9E7ljn00923; Thu, 14 Oct 2004 16:47:45 +0900 (JST) Original-Received: (from root@localhost) by mailgate4.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id i9E7liH00831; Thu, 14 Oct 2004 16:47:44 +0900 (JST) Original-Received: from edtmg02.lsi.nec.co.jp ([10.26.16.202]) by mailsv.nec.co.jp (8.11.7/3.7W-MAILSV-NEC) with ESMTP id i9E7lix03578; Thu, 14 Oct 2004 16:47:44 +0900 (JST) Original-Received: from mcsss2.ucom.lsi.nec.co.jp (localhost [127.0.0.1]) by edtmg02.lsi.nec.co.jp (8.12.10/8.12.10) with ESMTP id i9E7lgDv013279; Thu, 14 Oct 2004 16:47:42 +0900 (JST) Original-Received: from mctpc71 (mctpc71.ucom.lsi.nec.co.jp [10.30.118.121]) by mcsss2.ucom.lsi.nec.co.jp (8.12.10/8.12.8/EDcg v2.01-mc/1046780839) with ESMTP id i9E7lfwt022030; Thu, 14 Oct 2004 16:47:41 +0900 (JST) Original-Received: by mctpc71 (Postfix, from userid 31295) id E3F2E4A6; Thu, 14 Oct 2004 16:47:40 +0900 (JST) Original-To: emacs-devel@gnu.org System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: <20041013225128.GB8391@fencepost> (Miles Bader's message of "Wed, 13 Oct 2004 18:51:28 -0400") Original-Lines: 20 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 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 Xref: main.gmane.org gmane.emacs.devel:28379 gmane.emacs.gnus.general:58855 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:28379 Ok, I've implemented something so that future merges into Gnus, and into the Emacs trunk[*] will have log messages like: Merge from $MERGE_VERSION $MERGE_LOG $CHANGELOG Where $MERGE_LOG is the same sort of log that has been used up until now, and $CHANGELOG is an aggregation of any new ChangeLog entries present in the merge. [*] Merges into Emacs branches will _not_ use this style; I thought they might be too verbose, as such merges tend to contain large numbers of changes, so such an aggregate changelog is less useful. -Miles -- We live, as we dream -- alone....