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: Wed, 25 Aug 2004 00:40:33 -0400
Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Message-ID: <E1BzpaL-0005hk-Fj@fencepost.gnu.org>
References: <jwvwu04gc6f.fsf-monnier+emacs@gnu.org>
	<v9zn4mlwoi.fsf@marauder.physik.uni-ulm.de>
	<E1Bz9hx-0003St-5X@fencepost.gnu.org>
	<v98yc6ouy0.fsf@marauder.physik.uni-ulm.de>
	<E1BzObj-00070K-RP@fencepost.gnu.org>
	<v9hdqsdir9.fsf@marauder.physik.uni-ulm.de>
Reply-To: rms@gnu.org
NNTP-Posting-Host: deer.gmane.org
X-Trace: sea.gmane.org 1093408857 14862 80.91.224.253 (25 Aug 2004 04:40:57 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Wed, 25 Aug 2004 04:40:57 +0000 (UTC)
Cc: emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 25 06:40:51 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 1Bzpac-0005bG-00
	for <ged-emacs-devel@m.gmane.org>; Wed, 25 Aug 2004 06:40:51 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33)
	id 1Bzpf8-0003Ng-Ac
	for ged-emacs-devel@m.gmane.org; Wed, 25 Aug 2004 00:45:30 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Bzpf0-0003Na-Kk
	for emacs-devel@gnu.org; Wed, 25 Aug 2004 00:45:22 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Bzpf0-0003NO-3O
	for emacs-devel@gnu.org; Wed, 25 Aug 2004 00:45:22 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Bzpez-0003NL-Vo
	for emacs-devel@gnu.org; Wed, 25 Aug 2004 00:45:22 -0400
Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1BzpaM-0003LF-GP
	for emacs-devel@gnu.org; Wed, 25 Aug 2004 00:40:34 -0400
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34)
	id 1BzpaL-0005hk-Fj; Wed, 25 Aug 2004 00:40:33 -0400
Original-To: Reiner Steib <Reiner.Steib@gmx.de>
In-reply-to: <v9hdqsdir9.fsf@marauder.physik.uni-ulm.de> (message from Reiner
	Steib on Tue, 24 Aug 2004 10:48:10 +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:26473
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26473

    Adding the Gnus related man/*.texi files (and the related changes in
    Makefile.in/makefile.w32-in) to the trunk would lead to
    inconsistencies.  The documentation would not correspond to the Gnus
    code on the trunk.  I don't think this is a good idea.
    Similar for etc/*NEWS.

I don't think it is a problem to have those inconsistencies temporarily,
but you can also wait and do these after the new Gnus files go in.

The point is that these files need to be merged *into* the trunk.