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: Gnus branch
Date: Thu, 19 Aug 2004 14:05:42 -0400
Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Message-ID: <E1BxrIE-0004Nu-BO@fencepost.gnu.org>
References: <jwvwu04gc6f.fsf-monnier+emacs@gnu.org>
	<x5y8kj3nn4.fsf@lola.goethe.zz>
	<E1BvlwN-0003Hn-Ey@fencepost.gnu.org>
	<v9ekm4r4rx.fsf@marauder.physik.uni-ulm.de>
Reply-To: rms@gnu.org
NNTP-Posting-Host: deer.gmane.org
X-Trace: sea.gmane.org 1092938822 14898 80.91.224.253 (19 Aug 2004 18:07:02 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Thu, 19 Aug 2004 18:07:02 +0000 (UTC)
Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 19 20:06:39 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 1BxrJ8-00020Y-00
	for <ged-emacs-devel@m.gmane.org>; Thu, 19 Aug 2004 20:06:38 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33)
	id 1BxrNP-0003xo-34
	for ged-emacs-devel@m.gmane.org; Thu, 19 Aug 2004 14:11:03 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1BxrMv-0003k3-1G
	for emacs-devel@gnu.org; Thu, 19 Aug 2004 14:10:33 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1BxrMt-0003jQ-0D
	for emacs-devel@gnu.org; Thu, 19 Aug 2004 14:10:31 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1BxrMs-0003jN-O7
	for emacs-devel@gnu.org; Thu, 19 Aug 2004 14:10:30 -0400
Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1BxrIF-0005Bq-D8
	for emacs-devel@gnu.org; Thu, 19 Aug 2004 14:05:43 -0400
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34)
	id 1BxrIE-0004Nu-BO; Thu, 19 Aug 2004 14:05:42 -0400
Original-To: Reiner Steib <Reiner.Steib@gmx.de>
In-reply-to: <v9ekm4r4rx.fsf@marauder.physik.uni-ulm.de> (message from Reiner
	Steib on Wed, 18 Aug 2004 14:48:18 +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:26325
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26325

    I'm not sure how to handle the ChangeLog entries from Emacs/trunk:

Assuming that all the changes that we want are in the branch now,
and that the ChangeLog file in that branch describes those changes,
you should copy the ChangeLog file unmodified into the trunk
just as you copy the source files unmodified into the trunk.

However, it sounds like you're saying we have not yet reached that point:

    Some other (maybe) important changes (by Stefan Monnier, Juanma
    Barranquero, Kim F. Storm, Sam Steingold, ...) have not been installed
    yet.

Can you identify these changes and merge the ones we need
into the branch?