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: Emacs 23.2 released Date: Sat, 08 May 2010 14:57:54 -0400 Message-ID: References: <8739y3q7uy.fsf@stupidchicken.com> <83632yqqmy.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1273345090 12045 80.91.229.12 (8 May 2010 18:58:10 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 8 May 2010 18:58:10 +0000 (UTC) Cc: cyd@stupidchicken.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 08 20:58:09 2010 connect(): No such file or directory 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.69) (envelope-from ) id 1OApDy-0001jH-3X for ged-emacs-devel@m.gmane.org; Sat, 08 May 2010 20:58:06 +0200 Original-Received: from localhost ([127.0.0.1]:46976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OApDx-0005zl-Lw for ged-emacs-devel@m.gmane.org; Sat, 08 May 2010 14:58:05 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OApDs-0005zg-46 for emacs-devel@gnu.org; Sat, 08 May 2010 14:58:00 -0400 Original-Received: from [140.186.70.92] (port=48523 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OApDr-0005zY-01 for emacs-devel@gnu.org; Sat, 08 May 2010 14:57:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OApDp-0000I9-U3 for emacs-devel@gnu.org; Sat, 08 May 2010 14:57:58 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:9391 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OApDo-0000Hg-HN; Sat, 08 May 2010 14:57:56 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAFJR5UvO+LDv/2dsb2JhbACeF3K9RIUVBIwz X-IronPort-AV: E=Sophos;i="4.52,353,1270440000"; d="scan'208";a="63721546" Original-Received: from 206-248-176-239.dsl.teksavvy.com (HELO pastel.home) ([206.248.176.239]) by ironport2-out.pppoe.ca with ESMTP; 08 May 2010 14:57:55 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id DE46A814C; Sat, 8 May 2010 14:57:54 -0400 (EDT) In-Reply-To: <83632yqqmy.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 08 May 2010 19:56:05 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.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:124645 Archived-At: >> But feel free to revise your commits to the trunk and see if any of them >> might be good candidates for Emacs-23.3. > What is the recommended bzr procedure for backporting changes from the > trunk, without introducing possible conflicts in future merges from > the branch to the trunk? I don't think there's any magic bullet, sadly. Until now, I've been the one who did the merges, so it basically means more pain for me. One thing you can do to help me out is to label your backports as such, by starting the commit message with "Backport:". It won't make all problems disappear, but it gives me a few more options for how to deal with them (e.g.: merge up to the next non-backport, commit, then merge the next backport(s), "bzr revert .", commit, ...; this work particularly well if the backport-commits are contiguous). Stefan