From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: Re: merge emacs Gnus changes (was: nndb.el requires tcp) Date: Sat, 18 Sep 2004 09:16:28 -0400 Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Message-ID: <20040918131628.GA29956@fencepost> 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> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1095513445 13503 80.91.229.6 (18 Sep 2004 13:17:25 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 18 Sep 2004 13:17:25 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 18 15:17:19 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 1C8f5b-0004DS-00 for ; Sat, 18 Sep 2004 15:17:19 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C8fBN-00077G-KC for ged-emacs-devel@m.gmane.org; Sat, 18 Sep 2004 09:23:17 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1C8fB5-00075f-67 for emacs-devel@gnu.org; Sat, 18 Sep 2004 09:22:59 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1C8fB3-000756-Ck for emacs-devel@gnu.org; Sat, 18 Sep 2004 09:22:58 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1C8fB3-00074p-1z for emacs-devel@gnu.org; Sat, 18 Sep 2004 09:22:57 -0400 Original-Received: from [199.232.76.164] (helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.34) id 1C8f4m-0005Tj-Lx for emacs-devel@gnu.org; Sat, 18 Sep 2004 09:16:28 -0400 Original-Received: from miles by fencepost.gnu.org with local (Exim 4.34) id 1C8f4m-0000HP-2V; Sat, 18 Sep 2004 09:16:28 -0400 Original-To: Ding List , Emacs development Content-Disposition: inline In-Reply-To: <20040916134545.GB300@fencepost> User-Agent: Mutt/1.3.28i Blat: Foop 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:27226 gmane.emacs.gnus.general:58503 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:27226 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). > > 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). -Miles -- Next to fried food, the South has suffered most from oratory. -- Walter Hines Page