From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenichi Handa Newsgroups: gmane.emacs.devel Subject: Re: Changes to emacs-23 branch and the trunk Date: Tue, 31 Aug 2010 21:37:19 +0900 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1283258267 23400 80.91.229.12 (31 Aug 2010 12:37:47 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Aug 2010 12:37:47 +0000 (UTC) Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 31 14:37:42 2010 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 1OqQ5s-00010o-77 for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 14:37:40 +0200 Original-Received: from localhost ([127.0.0.1]:60474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqQ5r-0001QC-Ic for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 08:37:39 -0400 Original-Received: from [140.186.70.92] (port=48196 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqQ5g-0001OP-PF for emacs-devel@gnu.org; Tue, 31 Aug 2010 08:37:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqQ5c-0006PE-Dd for emacs-devel@gnu.org; Tue, 31 Aug 2010 08:37:28 -0400 Original-Received: from mx1.aist.go.jp ([150.29.246.133]:40505) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqQ5b-0006Os-Us for emacs-devel@gnu.org; Tue, 31 Aug 2010 08:37:24 -0400 Original-Received: from rqsmtp2.aist.go.jp (rqsmtp2.aist.go.jp [150.29.254.123]) by mx1.aist.go.jp with ESMTP id o7VCbKGe027077; Tue, 31 Aug 2010 21:37:20 +0900 (JST) env-from (handa@m17n.org) Original-Received: from smtp2.aist.go.jp by rqsmtp2.aist.go.jp with ESMTP id o7VCbKJk014646; Tue, 31 Aug 2010 21:37:20 +0900 (JST) env-from (handa@m17n.org) Original-Received: by smtp2.aist.go.jp with ESMTP id o7VCbJ29028717; Tue, 31 Aug 2010 21:37:19 +0900 (JST) env-from (handa@m17n.org) Original-Received: from handa by etlken with local (Exim 4.71) (envelope-from ) id 1OqQ5X-0003BM-HX; Tue, 31 Aug 2010 21:37:19 +0900 In-Reply-To: (message from Andreas Schwab on Tue, 31 Aug 2010 13:59:36 +0200) X-detected-operating-system: by eggs.gnu.org: Solaris 9 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:129497 Archived-At: In article , Andreas Schwab writes: > You are probably confusing merge with cherry-pick. Maybe. Then which part was wrong with the procedure given by Stefan, and what is the correct procedure? It seems that git has cherry-pick command but bzr doesn't (at least by that name). --- Kenichi Handa handa@m17n.org