From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Release branch plans Date: Tue, 03 Apr 2012 15:13:50 -0400 Message-ID: References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <83ty12hxoa.fsf@gnu.org> <83zkauc96p.fsf@gnu.org> <83y5qec658.fsf@gnu.org> <83mx6sd6vt.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333480450 2985 80.91.229.3 (3 Apr 2012 19:14:10 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 19:14:10 +0000 (UTC) Cc: cyd@gnu.org, Andreas Schwab , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 21:14:08 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 1SF9BA-0008Q7-OC for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 21:14:08 +0200 Original-Received: from localhost ([::1]:55467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF9BA-0001NM-06 for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 15:14:08 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF9B7-0001N1-Ul for emacs-devel@gnu.org; Tue, 03 Apr 2012 15:14:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF9B2-0003tV-B5 for emacs-devel@gnu.org; Tue, 03 Apr 2012 15:14:05 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:48881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF9B2-0003ol-5F; Tue, 03 Apr 2012 15:14:00 -0400 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id q33JDosm031519; Tue, 3 Apr 2012 15:13:50 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id B1D42B448F; Tue, 3 Apr 2012 15:13:50 -0400 (EDT) In-Reply-To: <83mx6sd6vt.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 03 Apr 2012 21:09:42 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4181=0 X-NAI-Spam-Version: 2.2.0.9309 : core <4181> : streams <743568> : uri <1095270> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:149351 Archived-At: >> > PS If you are not familiar with bzrmerge.el, the whole point is that it >> > does a real merge, then does some tricks to get an effect akin to >> > cherry-picking. >> That's not cherry-picking, it adds additional changes as part of the >> merge. This is an evil merge. > I agree. I have no idea what you guys are talking about. Stefan