From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/65108 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.gnus.general Subject: Re: etc/refcards/ and new-style backquotes Date: Fri, 31 Aug 2007 10:54:38 +0900 Organization: NEC Electronics Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1188525310 10964 80.91.229.12 (31 Aug 2007 01:55:10 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 31 Aug 2007 01:55:10 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M13619@lists.math.uh.edu Fri Aug 31 03:55:06 2007 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.50) id 1IQvix-0005sc-NI for ding-account@gmane.org; Fri, 31 Aug 2007 03:55:04 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1IQvip-0006lh-0J; Thu, 30 Aug 2007 20:54:55 -0500 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1IQvin-0006lN-5L for ding@lists.math.uh.edu; Thu, 30 Aug 2007 20:54:53 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.67) (envelope-from ) id 1IQvil-0005Zi-Pf for ding@lists.math.uh.edu; Thu, 30 Aug 2007 20:54:53 -0500 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1IQvik-0007W7-00 for ; Fri, 31 Aug 2007 03:54:50 +0200 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1IQvif-0005Np-0W for ding@gnus.org; Fri, 31 Aug 2007 03:54:45 +0200 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 31 Aug 2007 03:54:45 +0200 Original-Received: from miles.bader by fencepost.gnu.org with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 31 Aug 2007 03:54:45 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 49 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: fencepost.gnu.org System-Type: i686-pc-linux-gnu Blat: Foop Cancel-Lock: sha1:3qbUUaOjsNFlS85mfpLrhLIevuY= X-Spam-Score: -2.6 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:65108 Archived-At: Reiner Steib writes: >> [I _tentatively_ favor the latter, as it's always seemed to me that >> the changes to the 5.10 branch are sometimes a wee bit aggressive >> considering it's a release branch.] > > Do you have specific changes in mind? I don't recall that we > introduced any regressions or other problems. No. But some changes made on the 5.10 branch look a bit involved to me (and often differ in details from the same change on the trunk), and my impression is that the threshold for including a change on the 5.10 branch is kind of low (I think the same is true of the Emacs rel-22 branch, BTW). > I don't understand your argument here. As the Emacs trunk is open for > any changes now, it seems quite dangerous to me to sync changes from > Emacs trunk to gnus-5.10, isn't it? Well, in general you're right, though in practice it's maybe not a big deal -- almost every change made to Gnus on the Emacs trunk is basically pretty trivial (they're almost all spelling fixes and random stuff like that). > - gnus-5.10 <-> emacs-rel-22 > - gnus-trunk <-> emacs-trunk > - gnus-5.10 -> gnus-trunk and/or emacs-rel-22 -> emacs-trunk > > To ensure bug fixes also go into the development series. > "and/or", because both mostly do the same, if we have the two other > channels in place. > > Could you explain what kind of (new) problems you'd expect in this > scenario? Only that many changes will be showing up via multiple paths, and the simplistic mechanisms used to resolve such "conflicts" are fairly brittle. If the change rate on the branch(es) is low, it's not a big deal, but it's kind of annoying slogging through merging similar-but-not-quite-identical versions of the same change. Merging the Gnus trunk into the Emacs trunk of course needs someone (not me) to deal with the PGG mess. -Miles -- Suburbia: where they tear out the trees and then name streets after them.