From mboxrd@z Thu Jan  1 00:00:00 1970
Path: main.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: ChangeLog when merging from "upstream"
Date: Wed, 11 Aug 2004 16:35:23 -0400
Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Message-ID: <E1Buzoh-000784-2f@fencepost.gnu.org>
References: <v9hdrh5lxj.fsf@marauder.physik.uni-ulm.de>
	<E1BtYcb-0004TO-N6@fencepost.gnu.org>
	<v9657q22s2.fsf@marauder.physik.uni-ulm.de>
Reply-To: rms@gnu.org
NNTP-Posting-Host: deer.gmane.org
X-Trace: sea.gmane.org 1092256557 8249 80.91.224.253 (11 Aug 2004 20:35:57 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Wed, 11 Aug 2004 20:35:57 +0000 (UTC)
Cc: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 11 22:35:46 2004
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Original-Received: from lists.gnu.org ([199.232.76.165])
	by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian))
	id 1Buzp3-00007A-00
	for <ged-emacs-devel@m.gmane.org>; Wed, 11 Aug 2004 22:35:45 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33)
	id 1Buzsv-0003fF-8C
	for ged-emacs-devel@m.gmane.org; Wed, 11 Aug 2004 16:39:45 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Buzsm-0003fA-Bt
	for emacs-devel@gnu.org; Wed, 11 Aug 2004 16:39:36 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Buzsl-0003ey-V1
	for emacs-devel@gnu.org; Wed, 11 Aug 2004 16:39:36 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Buzsl-0003ev-Qf
	for emacs-devel@gnu.org; Wed, 11 Aug 2004 16:39:35 -0400
Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Buzoh-0008LH-QX
	for emacs-devel@gnu.org; Wed, 11 Aug 2004 16:35:23 -0400
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34)
	id 1Buzoh-000784-2f; Wed, 11 Aug 2004 16:35:23 -0400
Original-To: Reiner Steib <reiner.steib@gmx.de>
In-reply-to: <v9657q22s2.fsf@marauder.physik.uni-ulm.de> (message from Reiner
	Steib on Tue, 10 Aug 2004 21:47:57 +0200)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: main.gmane.org gmane.emacs.devel:26240
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26240

    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.

Since Gnus has its own change log file, and since most of the Gnus
changes come from that source, we can treat it as the baseline, and
leave its dates alone.  That would be less work.