From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: python.el fixes for Emacs 22
Date: Wed, 13 Feb 2008 11:32:56 -0500
Message-ID: <E1JPKXY-0005a4-TI@fencepost.gnu.org>
References: <E1JOYo5-00081A-VF@fencepost.gnu.org>
	<jwvtzkf34rt.fsf-monnier+emacs@gnu.org>
	<E1JOfvK-000665-14@fencepost.gnu.org>
	<jwvk5layiyc.fsf-monnier+emacs@gnu.org>
	<E1JOzBf-0006ZZ-2c@fencepost.gnu.org>
	<jwvmyq5am6x.fsf-monnier+emacs@gnu.org>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: ger.gmane.org 1202920406 27895 80.91.229.12 (13 Feb 2008 16:33:26 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Wed, 13 Feb 2008 16:33:26 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 13 17:33:49 2008
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1JPKYA-0005cA-8f
	for ged-emacs-devel@m.gmane.org; Wed, 13 Feb 2008 17:33:34 +0100
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1JPKXg-0007Jt-9W
	for ged-emacs-devel@m.gmane.org; Wed, 13 Feb 2008 11:33:04 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JPKXb-0007Ip-6s
	for emacs-devel@gnu.org; Wed, 13 Feb 2008 11:32:59 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JPKXZ-0007HH-OY
	for emacs-devel@gnu.org; Wed, 13 Feb 2008 11:32:58 -0500
Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JPKXZ-0007HB-JM
	for emacs-devel@gnu.org; Wed, 13 Feb 2008 11:32:57 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1JPKXZ-00035u-C9
	for emacs-devel@gnu.org; Wed, 13 Feb 2008 11:32:57 -0500
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.67)
	(envelope-from <rms@gnu.org>)
	id 1JPKXY-0005a4-TI; Wed, 13 Feb 2008 11:32:56 -0500
In-reply-to: <jwvmyq5am6x.fsf-monnier+emacs@gnu.org> (message from Stefan
	Monnier on Tue, 12 Feb 2008 16:40:50 -0500)
X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:88951
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/88951>

    There are some differences between the two, but I believe they're all
    changes that we applied and the he preferred not to include in
    his version.  In any case we should strive to minimize the differences.

In that case, it makes sense to install his newer changes
into that branch, and also into the trunk -- in parallel.
It would not make sense to install them into the trunk FROM or VIA
that branch, because that way we would revert the changes he did
not accept from us.

Would someone please DTRT and then ack?