From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog when merging from "upstream" Date: Sat, 07 Aug 2004 17:20:57 -0400 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: References: Reply-To: rms@gnu.org NNTP-Posting-Host: deer.gmane.org X-Trace: sea.gmane.org 1091913695 12399 80.91.224.253 (7 Aug 2004 21:21:35 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 7 Aug 2004 21:21:35 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 07 23:21:30 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 1BtYd8-0005TV-00 for ; Sat, 07 Aug 2004 23:21:30 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BtYgn-00063f-R3 for ged-emacs-devel@m.gmane.org; Sat, 07 Aug 2004 17:25:17 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1BtYge-00063O-Ew for emacs-devel@gnu.org; Sat, 07 Aug 2004 17:25:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1BtYgc-000634-Bu for emacs-devel@gnu.org; Sat, 07 Aug 2004 17:25:07 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BtYgb-00062u-NR for emacs-devel@gnu.org; Sat, 07 Aug 2004 17:25:05 -0400 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1BtYcc-0003EV-KI for emacs-devel@gnu.org; Sat, 07 Aug 2004 17:20:58 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34) id 1BtYcb-0004TO-N6; Sat, 07 Aug 2004 17:20:58 -0400 Original-To: Reiner Steib In-reply-to: (message from Reiner Steib on Thu, 05 Aug 2004 23:12:24 +0200) 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:26216 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26216 The change in Gnus is dated 2004-08-02. When I install the changes on 2004-08-06, should it read as follows? ,---- | 2004-08-06 Reiner Steib | | Sync with v5_10 branch: | | 2004-08-02 Reiner Steib | | * gnus.el (gnus-group, gnus-summary, gnus-summary-sort): Fix | custom-manual entries. | [...] `---- The whole thing should be dated with the date that you installed it. By the way, I am not sure whether "Sync with v5_10 branch" is meant to describe the 8/2 change in gnus.el, or whether they refer to two different changes. If the former, they should be together in one entry, to show they are talking about the same thing. If the latter, "Sync with v5_10 branch" is not sufficient, because ChangeLog needs to say what files and functions were changed and how.