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: Gnus branch Date: Wed, 18 Aug 2004 14:48:18 +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 1092833384 5635 80.91.224.253 (18 Aug 2004 12:49:44 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 18 Aug 2004 12:49:44 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 18 14:49:29 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 1BxPse-0006vZ-00 for ; Wed, 18 Aug 2004 14:49:29 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BxPwr-0008Cq-CO for ged-emacs-devel@m.gmane.org; Wed, 18 Aug 2004 08:53:49 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1BxPwh-0008C2-DF for emacs-devel@gnu.org; Wed, 18 Aug 2004 08:53:39 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1BxPwf-0008BK-Bo for emacs-devel@gnu.org; Wed, 18 Aug 2004 08:53:38 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1BxPwf-0008BA-5w for emacs-devel@gnu.org; Wed, 18 Aug 2004 08:53:37 -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 1BxPrx-0003SN-Dj; Wed, 18 Aug 2004 08:48:45 -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 i7ICmIjl012056; Wed, 18 Aug 2004 14:48:18 +0200 (MEST) Original-Received: by lumberjack.physik.uni-ulm.de (Postfix, from userid 170) id 96E0E18172; Wed, 18 Aug 2004 14:48:18 +0200 (CEST) Original-To: Richard Stallman Mail-Followup-To: Richard Stallman , emacs-devel@gnu.org X-Face: .*T0'iU(sujq_j9\J>-d4fg; N/1++U#U$_5ii6k.=|"-n'?5O:Hyz&wi'-!I~,}7~GgT=0S /&-R5sbkNy5+Xo1y{Tw2KKxi@Xh"g@]Qc|.U<*]WDd)qvGowFDvfU1F]{EDho:7P0@|oOD=Bc{K4?> WP68K[Mx:}=`ZT'6g4'f+g?;`vri2!)xGy}3:=l'(/Cea0l4lo^H5#@/Z3ev In-Reply-To: (Richard Stallman's message of "Fri, 13 Aug 2004 19:58:31 -0400") User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux) X-DCC-sonic.net-Metrics: gemini 1156; Body=4 Fuz1=4 Fuz2=4 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:26301 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:26301 On Sat, Aug 14 2004, Richard Stallman wrote: > The idea was not to lose changes that occured in the trunk, right? > > Yes. The useful changes in the trunk were going to be merged into the > branch. > > When that is done, we want to move the new Gnus into trunk. Is it > done? I have installed your change (mark `mailcap-mime-data' as risky) in the branch and in the Gnus repository (trunk and v5_10 branch). Some other (maybe) important changes (by Stefan Monnier, Juanma Barranquero, Kim F. Storm, Sam Steingold, ...) have not been installed yet. (When this is done, I'll import those changes back to the Gnus repository, too.) I'm not sure how to handle the ChangeLog entries from Emacs/trunk: lisp/gnus/ChangeLog has entries from 2004-06-29 back to 1998-08-29. Most of those are no longer relevant after the import of Gnus v5_10 branch. Even worse, after installing the ChangeLog entries from Gnus v5_10 branch (which has to be done), we would have non-monotonic entries. Is it okay to move the Emacs/trunk entries to lisp/gnus/ChangeLog.2 (or should they be removed)? In lisp/gnus/ChangeLog, we'd only have the entries belonging to Oort Gnus aka Gnus 5.10. Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- PGP key available via WWW http://rsteib.home.pages.de/