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: Changes to emacs-23 branch and the trunk Date: Tue, 31 Aug 2010 20:05:15 +0300 Message-ID: <83hbiak910.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1283274207 303 80.91.229.12 (31 Aug 2010 17:03:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Aug 2010 17:03:27 +0000 (UTC) Cc: schwab@linux-m68k.org, monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: Kenichi Handa Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 31 19:03:25 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 1OqUF1-0004R0-6u for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 19:03:23 +0200 Original-Received: from localhost ([127.0.0.1]:46199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqUF0-00008A-PS for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 13:03:22 -0400 Original-Received: from [140.186.70.92] (port=37425 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqUEs-000082-Fh for emacs-devel@gnu.org; Tue, 31 Aug 2010 13:03:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqUEq-0006Qw-UG for emacs-devel@gnu.org; Tue, 31 Aug 2010 13:03:14 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:37229) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqUEq-0006QU-Np for emacs-devel@gnu.org; Tue, 31 Aug 2010 13:03:12 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0L8100E000IPMT00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Tue, 31 Aug 2010 20:03:11 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.126.202.93]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L8100EIQ0P8O800@a-mtaout22.012.net.il>; Tue, 31 Aug 2010 20:03:10 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:129506 Archived-At: > From: Kenichi Handa > Date: Tue, 31 Aug 2010 21:37:19 +0900 > Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org > > 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). You don't _want_ to cherry-pick in this case, because bzr does not track cherry-picks in its history. So cherry-picking would create potential merge conflicts when Stefan or Chong will later merge from the release branch. Avoiding such conflicts was the motivation behind the procedure suggested by Stefan.