From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merging revisions into emacs24 from trunk Date: Thu, 06 Nov 2014 18:34:58 +0200 Message-ID: <83d290thhp.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1415291737 2061 80.91.229.3 (6 Nov 2014 16:35:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 6 Nov 2014 16:35:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: Kelvin White Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 06 17:35:30 2014 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 1XmQ1w-0007Wy-1G for ged-emacs-devel@m.gmane.org; Thu, 06 Nov 2014 17:35:28 +0100 Original-Received: from localhost ([::1]:54886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmQ1v-0000PI-Kv for ged-emacs-devel@m.gmane.org; Thu, 06 Nov 2014 11:35:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmQ1c-0000M9-4d for emacs-devel@gnu.org; Thu, 06 Nov 2014 11:35:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XmQ1V-0003Wx-K5 for emacs-devel@gnu.org; Thu, 06 Nov 2014 11:35:08 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:39099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmQ1V-0003Wm-9z; Thu, 06 Nov 2014 11:35:01 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NEM00100LURAM00@a-mtaout22.012.net.il>; Thu, 06 Nov 2014 18:35:00 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NEM0019LM2BB600@a-mtaout22.012.net.il>; Thu, 06 Nov 2014 18:35:00 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:176454 Archived-At: > Date: Thu, 6 Nov 2014 09:49:03 -0500 > From: Kelvin White > > Could someone point me in the right direction regarding > documentation or instruction on the correct way to merge > revisions from trunk into emacs-24 branch? Sorry, my previous reply was wrong; please ignore it. Are you asking how to cherry-pick using bzr? Because that's what you need to do: cherry-pick the commits you want, then commit. See admin/notes/repo under 'Backporting a bug-fix from the trunk to a branch (e.g. "emacs-24")'.