From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/58508 Path: main.gmane.org!not-for-mail From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de> Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: Re: merge emacs Gnus changes Date: Sun, 19 Sep 2004 21:40:37 +0200 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: References: <01c49720$Blat.v2.2.2$b48fff20@zahav.net.il> <01c49729$Blat.v2.2.2$ea11b9a0@zahav.net.il> <20040910140108.GA16207@fencepost> <20040916133826.GA300@fencepost> <20040916134545.GB300@fencepost> <20040918131628.GA29956@fencepost> 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 1095622877 10213 80.91.229.6 (19 Sep 2004 19:41:17 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 19 Sep 2004 19:41:17 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 19 21:41:04 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 1C97YV-0002gJ-00 for ; Sun, 19 Sep 2004 21:41:03 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C97eL-0006tr-EL for ged-emacs-devel@m.gmane.org; Sun, 19 Sep 2004 15:47:05 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1C97eE-0006tk-Dh for emacs-devel@gnu.org; Sun, 19 Sep 2004 15:46:58 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1C97eC-0006tY-Oc for emacs-devel@gnu.org; Sun, 19 Sep 2004 15:46:58 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C97eA-0006tV-Oo for emacs-devel@gnu.org; Sun, 19 Sep 2004 15:46:56 -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 1C97Y8-0008P8-NU for emacs-devel@gnu.org; Sun, 19 Sep 2004 15:40:41 -0400 Original-Received: from lumberjack.physik.uni-ulm.de (lumberjack.physik.uni-ulm.de [134.60.10.173]) by mail.uni-ulm.de (8.13.1/8.13.1) with ESMTP id i8JJebq2029066; Sun, 19 Sep 2004 21:40:37 +0200 (MEST) Original-Received: by lumberjack.physik.uni-ulm.de (Postfix, from userid 170) id 9BB5618167; Sun, 19 Sep 2004 21:40:37 +0200 (CEST) Mail-Followup-To: Ding List , Emacs development Original-To: Ding List , Emacs development X-Face: P05mdcZT&lL[-s2=mw~RsllZ0zZAb?vdE}.s (Miles Bader's message of "Sat, 18 Sep 2004 09:16:28 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/21.3.50 (gnu/linux) X-DCC-sonic.net-Metrics: gemini 1156; Body=2 Fuz1=2 Fuz2=2 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:27282 gmane.emacs.gnus.general:58508 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:58508 On Sat, Sep 18 2004, Miles Bader wrote: > On Thu, Sep 16, 2004 at 09:45:45AM -0400, Miles Bader wrote: >> > My assumption (so far) is that all fixes on the v5-10 branch are >> > already on the trunk in some form (often a modified form of >> > course). This is the case for most fixes, of course. After the release of 5.10.6 bug fixing was (mainly) done on the trunk. Only in the last few weeks bug fixes have been ported back to v5-10. There are at least the following situations were such merges make sense: - New bug fixes committed by the Gnus developers. E.g. my last two changes in v5-10. - Changes from Emacs' repository (or did you already merge those in the Gnus trunk, too?) - My next change: Adding ":version" to all new defcustoms. This will give a couple of rejects in gnus-sum.el, gnus-group.el and gnus-art.el. I can resolve those manually in case you want to skip them. >> BTW I _can_ do such merges, but there should be some guideline. > > I've merged all changes to date (v5-10 -> gnus trunk). > > I assume there will probably be relatively few changes on the > branch, so I'll just merge anything I see in the future too (the > main effort is eliminating duplicates [especially in the ChangeLog], > but that's not too hard with such a low volume). This makes sense, I think. Thanks a lot! Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/