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: Marge from emacs-24 Date: Fri, 21 Sep 2012 09:07:59 -0400 Message-ID: References: <831uhwzgm3.fsf@gnu.org> <87k3voqdic.fsf@gnu.org> <83sjabyhnl.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1348232906 6379 80.91.229.3 (21 Sep 2012 13:08:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 21 Sep 2012 13:08:26 +0000 (UTC) Cc: Chong Yidong , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 21 15:08:30 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TF2y4-0005XR-25 for ged-emacs-devel@m.gmane.org; Fri, 21 Sep 2012 15:08:28 +0200 Original-Received: from localhost ([::1]:38938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2xz-0000gj-8R for ged-emacs-devel@m.gmane.org; Fri, 21 Sep 2012 09:08:23 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:36357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2xs-0000gT-5U for emacs-devel@gnu.org; Fri, 21 Sep 2012 09:08:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF2xn-0002D6-Hk for emacs-devel@gnu.org; Fri, 21 Sep 2012 09:08:16 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:58673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2xf-0002Bb-Od; Fri, 21 Sep 2012 09:08:03 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAG6Zu09MCocG/2dsb2JhbABEtBGBCIIVAQEEAVYjEAs0EhQYDSSIHAW6CZBEA6MzgViDBQ X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="199628311" Original-Received: from 76-10-135-6.dsl.teksavvy.com (HELO pastel.home) ([76.10.135.6]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 21 Sep 2012 09:08:03 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 9FDDE591B8; Fri, 21 Sep 2012 09:07:59 -0400 (EDT) In-Reply-To: <83sjabyhnl.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 21 Sep 2012 10:11:26 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:153434 Archived-At: >> > A couple of critical bugfixes were committed to the emacs-24 branch >> > lately, but the last merge from there was almost 3 weeks ago. Can it >> > be merged again, please? >> Done. > Thanks. BTW, normally anyone can do such a merge. Basically, you should be able to do something like: M-x load-file RET .../admin/bzrmerge RET M-x cd RET .../trunk RET M-x bzrmerge RET .../emacs-24 RET ... hopefully everything works ... ... take-a look-at-the result and when everything looks good ... bzr commit -m 'Merge from emacs-24' Stefan