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: Fri, 20 Aug 2004 17:08:12 -0400
Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Message-ID: <E1ByGcO-0005Uy-1d@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>
	<E1BxrIE-0004Nu-BO@fencepost.gnu.org>
	<jwvpt5ndm31.fsf-monnier+emacs@gnu.org>
Reply-To: rms@gnu.org
NNTP-Posting-Host: deer.gmane.org
X-Trace: sea.gmane.org 1093036149 30231 80.91.224.253 (20 Aug 2004 21:09:09 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Fri, 20 Aug 2004 21:09:09 +0000 (UTC)
Cc: Reiner.Steib@gmx.de, emacs-devel@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 20 23:09:04 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 1ByGdE-0003U9-00
	for <ged-emacs-devel@m.gmane.org>; Fri, 20 Aug 2004 23:09:04 +0200
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33)
	id 1ByGhY-00044J-M0
	for ged-emacs-devel@m.gmane.org; Fri, 20 Aug 2004 17:13:32 -0400
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1ByGh7-0003lL-QK
	for emacs-devel@gnu.org; Fri, 20 Aug 2004 17:13:05 -0400
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1ByGh7-0003l1-4p
	for emacs-devel@gnu.org; Fri, 20 Aug 2004 17:13:05 -0400
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1ByGh7-0003kk-1j
	for emacs-devel@gnu.org; Fri, 20 Aug 2004 17:13:05 -0400
Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1ByGcO-0000zi-Nl
	for emacs-devel@gnu.org; Fri, 20 Aug 2004 17:08:12 -0400
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.34)
	id 1ByGcO-0005Uy-1d; Fri, 20 Aug 2004 17:08:12 -0400
Original-To: Stefan Monnier <monnier@iro.umontreal.ca>
In-reply-to: <jwvpt5ndm31.fsf-monnier+emacs@gnu.org> (message from Stefan
	Monnier on 19 Aug 2004 14:26:18 -0400)
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:26353
X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26353

    Just to clarify: my suggestion is to first merge the gnus branch on the
    trunk and then re-install the local changes that haven't made their way to
    the Gnus repository yet.

This would be a recipe for losing changes.  What I have asked
people to do, and what Reiner offered to do, is to merge our
changes into Gnus in the branch, and only afterward put this
into the trunk.

I do not want our changes to be at any moment lost from the trunk.