From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Fabian Ezequiel Gallina Newsgroups: gmane.emacs.devel Subject: Re: feature freeze decision needed + bzr cherrypick? Date: Sat, 29 Dec 2012 10:34:52 -0300 Message-ID: References: <83fw2pkn5w.fsf@gnu.org> <83ehi9kmxm.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1356788097 5965 80.91.229.3 (29 Dec 2012 13:34:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Dec 2012 13:34:57 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 29 14:35:14 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 1TowZF-00069O-MD for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2012 14:35:13 +0100 Original-Received: from localhost ([::1]:47417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TowZ0-00007a-SK for ged-emacs-devel@m.gmane.org; Sat, 29 Dec 2012 08:34:58 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:34535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TowYx-00007U-H2 for emacs-devel@gnu.org; Sat, 29 Dec 2012 08:34:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TowYw-0003H1-Kg for emacs-devel@gnu.org; Sat, 29 Dec 2012 08:34:55 -0500 Original-Received: from mail-ia0-f178.google.com ([209.85.210.178]:59591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TowYv-0003Gn-8x; Sat, 29 Dec 2012 08:34:53 -0500 Original-Received: by mail-ia0-f178.google.com with SMTP id k25so9649160iah.9 for ; Sat, 29 Dec 2012 05:34:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=1Y8rmV+3w1lGX8Lma2zfUcoU1TEs3F9TRVpEr7OSZOU=; b=QONMXXWfYKYSfD1PwbtFhHYCDMN5ypOO5YxoOdCW/XtA2e1/ZyyRhDbOP5ZsOpN/b/ 51hB6+aDPp1nUHj+6qTEHvxJlU2EAJ8bEniLXxmTH9PNn1XNpbGlUCybneCcSvZ3jN8N vGUi4yrMMobcWUl3aBXZ+uGvLN2vhHxH3xRw99ga1QqaJyS6ehyXzNjjvRf8WhwywPO1 OBORt6eCDM/8b7Zrr8z1amc86sk8l2+VCthJTvrRKyS5lOJTQ+uyQE7SyuolBZMsivA3 35h+IMXvh52B0jTIWNqgmapaZ6hoBVb2B2nlwvVWtHrFtxryNaNMk1Nhe2bohzAnPT32 tpLw== Original-Received: by 10.50.40.229 with SMTP id a5mr32004784igl.59.1356788092560; Sat, 29 Dec 2012 05:34:52 -0800 (PST) Original-Received: by 10.64.9.143 with HTTP; Sat, 29 Dec 2012 05:34:52 -0800 (PST) In-Reply-To: <83ehi9kmxm.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.178 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:155991 Archived-At: 2012/12/29 Eli Zaretskii : >> 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. That's good, thanks for the tip. Regards, Fabi=E1n