From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: python.el fixes for Emacs 22 Date: Wed, 13 Feb 2008 14:19:10 -0500 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1202930377 2380 80.91.229.12 (13 Feb 2008 19:19:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Feb 2008 19:19:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 13 20:19:57 2008 Return-path: 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 1JPN97-000081-Bp for ged-emacs-devel@m.gmane.org; Wed, 13 Feb 2008 20:19:53 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JPN8d-0004ao-DV for ged-emacs-devel@m.gmane.org; Wed, 13 Feb 2008 14:19:23 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JPN8Y-0004Wo-HK for emacs-devel@gnu.org; Wed, 13 Feb 2008 14:19:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JPN8V-0004ON-Qs for emacs-devel@gnu.org; Wed, 13 Feb 2008 14:19:18 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JPN8V-0004O2-Mz for emacs-devel@gnu.org; Wed, 13 Feb 2008 14:19:15 -0500 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JPN8R-0007Z7-T9; Wed, 13 Feb 2008 14:19:12 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ao8CAEbRskdMCpK7/2dsb2JhbACuIH8 X-IronPort-AV: E=Sophos;i="4.25,347,1199682000"; d="scan'208";a="14447642" Original-Received: from smtp.pppoe.ca ([65.39.196.238]) by ironport2-out.pppoe.ca with ESMTP; 13 Feb 2008 14:19:10 -0500 Original-Received: from pastel.home ([76.10.146.187]) by smtp.pppoe.ca (Internet Mail Server v1.0) with ESMTP id TVG64810; Wed, 13 Feb 2008 14:19:10 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 5A23E828E; Wed, 13 Feb 2008 14:19:10 -0500 (EST) In-Reply-To: (Richard Stallman's message of "Wed, 13 Feb 2008 11:32:56 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. 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: , 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:88970 Archived-At: > 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. That branch is there specifically for that purpose. If you want to know more, read up on "vendor branch" (the original motivation for writing CVS in the first place). (info "(cvs)Tracking sources") Basically, you have to commit the new version on that DAVELOVE branch, and then use "cvs update -j -j" on the trunk (or in the 22 branch) to bring the changes that need to be merged. Stefan