From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/58931 Path: main.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.gnus.general Subject: Re: pop3.el itegration with netrc.el Date: Mon, 18 Oct 2004 08:22:11 +0900 Sender: ding-owner@lists.math.uh.edu Message-ID: <877jppx74s.fsf@tc-1-100.kawasaki.gol.ne.jp> References: <4n7jpu4o7d.fsf@lifelogs.com> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1098055358 26183 80.91.229.6 (17 Oct 2004 23:22:38 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 17 Oct 2004 23:22:38 +0000 (UTC) Original-X-From: ding-owner+M7469@lists.math.uh.edu Mon Oct 18 01:22:34 2004 Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13] ident=mail) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CJKME-0001Xe-00 for ; Mon, 18 Oct 2004 01:22:34 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu ident=lists) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1CJKM3-0004Nj-00; Sun, 17 Oct 2004 18:22:23 -0500 Original-Received: from util2.math.uh.edu ([129.7.128.23]) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1CJKLy-0004NZ-00 for ding@lists.math.uh.edu; Sun, 17 Oct 2004 18:22:18 -0500 Original-Received: from justine.libertine.org ([66.139.78.221] ident=postfix) by util2.math.uh.edu with esmtp (Exim 4.30) id 1CJKLx-0000VA-LO for ding@lists.math.uh.edu; Sun, 17 Oct 2004 18:22:17 -0500 Original-Received: from main.gmane.org (main.gmane.org [80.91.229.2]) by justine.libertine.org (Postfix) with ESMTP id 0E1223A01F3 for ; Sun, 17 Oct 2004 18:22:17 -0500 (CDT) Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1CJKLw-0000RS-00 for ; Mon, 18 Oct 2004 01:22:16 +0200 Original-Received: from yokohama2-61-203-152-190.ap.0038.net ([61.203.152.190]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 18 Oct 2004 01:22:16 +0200 Original-Received: from miles by yokohama2-61-203-152-190.ap.0038.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 18 Oct 2004 01:22:16 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-To: ding@gnus.org Original-Lines: 26 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: yokohama2-61-203-152-190.ap.0038.net System-Type: i686-pc-linux-gnu Cancel-Lock: sha1:/mnbkJxwirNyaHsY1rI4eNqvbW4= Precedence: bulk Xref: main.gmane.org gmane.emacs.gnus.general:58931 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:58931 Reiner Steib writes: > I don't know if it is inconvenient for Miles if we install a change in > v5-10 and trunk at the same time. The automatic merge usually deals with ignoring completely identical changes, so they're not generally a problem. If the code actually has to be different for the trunk and v5-10 then there will be a conflict, but I'll usually just notice that it's essentially the same code, and drop the merge for that hunk -- which is easier than actually having to fix the code myself! So far it hasn't been much of a problem; as usual (see my previous post...) the main annoyance is ChangeLogs: I try to eliminate redundant ChangeLog entries, but often this takes searching around. The main thing that would help me is if when you install in both places, try to make sure the ChangeLog text is _identical_, as much as possible. Thanks, -Miles -- ===== (^o^; (())) *This is the cute octopus virus, please copy it into your sig so it can spread.