From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de> Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog when merging from "upstream" Date: Tue, 10 Aug 2004 21:47:57 +0200 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: References: Reply-To: Reiner Steib NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1092167386 2507 80.91.224.253 (10 Aug 2004 19:49:46 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 10 Aug 2004 19:49:46 +0000 (UTC) Cc: Emacs development Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 10 21:49:37 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 1Buccq-0008Mz-00 for ; Tue, 10 Aug 2004 21:49:36 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bucgf-0001SP-BM for ged-emacs-devel@m.gmane.org; Tue, 10 Aug 2004 15:53:33 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1Bucg1-0001Ed-T4 for emacs-devel@gnu.org; Tue, 10 Aug 2004 15:52:54 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1Bucfz-0001Dm-Sn for emacs-devel@gnu.org; Tue, 10 Aug 2004 15:52:53 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1Bucfz-0001DZ-Of for emacs-devel@gnu.org; Tue, 10 Aug 2004 15:52:51 -0400 Original-Received: from [134.60.1.1] (helo=mail-new.rz.uni-ulm.de) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1Bucbj-0005Zr-KS; Tue, 10 Aug 2004 15:48:29 -0400 Original-Received: from lumberjack.physik.uni-ulm.de (lumberjack.physik.uni-ulm.de [134.60.10.173]) by mail.uni-ulm.de (8.12.11/8.12.11) with ESMTP id i7AJlvWI018153; Tue, 10 Aug 2004 21:47:57 +0200 (MEST) Original-Received: by lumberjack.physik.uni-ulm.de (Postfix, from userid 170) id 491D718170; Tue, 10 Aug 2004 21:47:57 +0200 (CEST) Mail-Followup-To: rms@gnu.org, emacs-devel@gnu.org Original-To: Richard Stallman X-Face: mtjf/D:es1T0wHO:&CJ'ZXe"l; 3C--rw\z!{`eFwL){|]RpI+4{u25L=5C /0>KuGeTsk<~<&NE-AKV1560e!+RJeyWmSskkrJm?[vUV#66{T_m|Ae<||Ku#Mk5`y&O`n~z2; n8eP J5#2h@2eQgV@E70IY_0WlEx!"&giy{+\%h1LJox$zv@/l%ZmU4^tZA>xQpnkUBVC5.jpg#0'(+2?Rs )NAr:>3<=WxHE$ktbLysDIM5TbmHu*3 (Richard Stallman's message of "Sat, 07 Aug 2004 17:20:57 -0400") User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux) X-DCC-sonic.net-Metrics: gemini 1156; Body=2 Fuz1=2 Fuz2=2 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:26233 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26233 On Sat, Aug 07 2004, Richard Stallman wrote: > 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. Okay. > 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. The former. > If the latter, "Sync with v5_10 branch" is not sufficient, because > ChangeLog needs to say what files and functions were changed and how. That means that for the importing the v5_10 branch done by Andreas Schwab (installed on 2004-07-22), we will have to add Gnus' lisp/ChangeLog in lisp/gnus/ChangeLog. And there, all dates should be replaced with 2004-07-22. Note that the changes from Gnus 5.9 to 5.10 (from the year 2000 upto 2004-07-22) span more than two thousand entries. Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- PGP key available via WWW http://rsteib.home.pages.de/