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: feature freeze decision needed + bzr cherrypick? Date: Sat, 29 Dec 2012 15:28:05 +0200 Message-ID: <83ehi9kmxm.fsf@gnu.org> References: <83fw2pkn5w.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1356787710 3335 80.91.229.3 (29 Dec 2012 13:28:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Dec 2012 13:28:30 +0000 (UTC) Cc: emacs-devel@gnu.org To: galli.87@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 29 14:28:46 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 1TowSu-0002Oy-NE for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2012 14:28:40 +0100 Original-Received: from localhost ([::1]:44011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TowSf-0006BK-Ok for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2012 08:28:25 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:33601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TowSd-0006BF-MY for emacs-devel@gnu.org; Sat, 29 Dec 2012 08:28:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TowSb-0001nS-RJ for emacs-devel@gnu.org; Sat, 29 Dec 2012 08:28:23 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:52907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TowSb-0001nL-JE for emacs-devel@gnu.org; Sat, 29 Dec 2012 08:28:21 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MFS00H00NZ5XJ00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sat, 29 Dec 2012 15:27:56 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MFS00HPBO2JUU30@a-mtaout22.012.net.il>; Sat, 29 Dec 2012 15:27:56 +0200 (IST) In-reply-to: <83fw2pkn5w.fsf@gnu.org> 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:155989 Archived-At: > Date: Sat, 29 Dec 2012 15:23:07 +0200 > From: Eli Zaretskii > Cc: emacs-devel@gnu.org > > > Date: Sat, 29 Dec 2012 10:16:04 -0300 > > From: Fabian Ezequiel Gallina > > > > Is there anything similar to git's cherrypick? > > Yes. Something like this: > > cd emacs-24 > bzr merge -r 111365..111367 ../trunk > bzr ci -m "Backported revisions 111366 and 111367 from trunk." Btw, bzr doesn't track cherrypicks, so the "Backported" part of the commit message is important, as it is used by admin/bzrmerge.el to exclude such revisions when the branch is merged onto the trunk.