From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Release branch plans Date: Tue, 03 Apr 2012 12:00:34 +0200 Message-ID: References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> <83ty12hxoa.fsf@gnu.org> <83zkauc96p.fsf@gnu.org> <83y5qec658.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333447835 25301 80.91.229.3 (3 Apr 2012 10:10:35 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 10:10:35 +0000 (UTC) Cc: Eli Zaretskii , cyd@gnu.org, emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 12:10:34 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 1SF0h5-0006rH-Or for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 12:10:31 +0200 Original-Received: from localhost ([::1]:57884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF0h5-0000R5-1n for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 06:10:31 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF0gx-0000Py-VF for emacs-devel@gnu.org; Tue, 03 Apr 2012 06:10:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF0gt-0001qZ-8Y for emacs-devel@gnu.org; Tue, 03 Apr 2012 06:10:23 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:39664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF0gk-0001jH-20; Tue, 03 Apr 2012 06:10:10 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3VMQyw2WqNz4Kh2B; Tue, 3 Apr 2012 12:09:59 +0200 (CEST) Original-Received: from linux.local (ppp-88-217-112-235.dynamic.mnet-online.de [88.217.112.235]) by mail.mnet-online.de (Postfix) with ESMTPA id 3VMQyv08mdz4KK7L; Tue, 3 Apr 2012 12:09:58 +0200 (CEST) Original-Received: by linux.local (Postfix, from userid 501) id 7EB0B1E52AE; Tue, 3 Apr 2012 12:00:34 +0200 (CEST) X-Yow: --- I have seen the FUN --- In-Reply-To: (Glenn Morris's message of "Mon, 02 Apr 2012 21:26:08 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.95 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 212.18.0.9 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:149319 Archived-At: Glenn Morris writes: > 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. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."