From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Is the 2012-04-01 Update to Org version 7.8.07 incomplete? Date: Mon, 07 May 2012 09:47:41 +0200 Organization: GNU Message-ID: <87sjfc300y.fsf@altern.org> References: <874nscri2d.fsf@escher.home> <871ungdfq4.fsf@Rainer.invalid> <87zka4q2ek.fsf@escher.home> <87ipgswuo2.fsf@gnu.org> <87fwbelumk.fsf@escher.home> <8762caslj9.fsf@altern.org> <8762cal9t2.fsf@escher.home> <87zk9mjkwe.fsf@gnu.org> <878vh4wnjz.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1336376830 6843 80.91.229.3 (7 May 2012 07:47:10 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 7 May 2012 07:47:10 +0000 (UTC) Cc: Stephen Berman , emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 07 09:47: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 1SRIex-0005kC-N5 for ged-emacs-devel@m.gmane.org; Mon, 07 May 2012 09:47:07 +0200 Original-Received: from localhost ([::1]:35979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRIex-00079f-4g for ged-emacs-devel@m.gmane.org; Mon, 07 May 2012 03:47:07 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRIep-00079W-Jh for emacs-devel@gnu.org; Mon, 07 May 2012 03:47:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SRIek-0002Dp-U5 for emacs-devel@gnu.org; Mon, 07 May 2012 03:46:59 -0400 Original-Received: from mail-we0-f169.google.com ([74.125.82.169]:39626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRIee-0002DE-JX; Mon, 07 May 2012 03:46:48 -0400 Original-Received: by werc12 with SMTP id c12so182407wer.0 for ; Mon, 07 May 2012 00:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:organization:references :user-agent:date:message-id:mime-version:content-type; bh=/gRkRq8ZNu2SA1vdClLmCO8nibwXNAlVrtP/eEJdBsg=; b=Y82DFO/4bdW6p3P02P33/ANnzoman5g3EC1+swlauR3ryXf2qK+ab/qpZWAn2oDZp8 T1kclLU7MYEShhXxMFuY/XUbRcw/AZWxNubNhCCWtpUmG4qZF1K9g9nhhpuN58y8H94P w4QhAm3LcDcW4Ng3aG9C3ADCT0YW7PpGfrknMhyjUBXh6MCTUAcPl6PbNjyDWBgBTdNA kC6yQv+tDsPpLeGqDbMxvQBUU3MlEZrldvqZkvD916XCPZFt8fPtS3mRShymO66M/2RA WKaSQKa/3s3pXgzxSU6QhVEEkXt/W3sB8pU/Ni0w6uZF6PierhdVoTlgYPRUHLwIIytW uYdA== Original-Received: by 10.180.24.103 with SMTP id t7mr7539767wif.16.1336376805829; Mon, 07 May 2012 00:46:45 -0700 (PDT) Original-Received: from myhost.localdomain (93.140.114.78.rev.sfr.net. [78.114.140.93]) by mx.google.com with ESMTPS id r2sm13487978wif.7.2012.05.07.00.46.44 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 May 2012 00:46:45 -0700 (PDT) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id 06B5F8777; Mon, 7 May 2012 09:47:41 +0200 (CEST) In-Reply-To: <878vh4wnjz.fsf@gnu.org> (Chong Yidong's message of "Mon, 07 May 2012 13:46:40 +0800") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.169 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:150337 Archived-At: Chong Yidong writes: > Bastien writes: > >> Okay. This is now both in the maint branch and the master branch of >> the git repository of Org-mode. The maint branch will be merged into >> Emacs before the next Emacs pretest -- which AFAIK is not planned yet. > > There may not be a next pretest, only the release candidate. Yes, that's what I meant, sorry. > In any case, this late in the pretest process I'm not sure another big > merge from Org upstream is appropriate. "Org upstream" is either the maint branch or the master branch: I plan to merge changes from the maint branch, which are mainly bug fixes. I don't plan to merge changes from master. I will send a patch first. > If there is a critical bug that needs to be fixed, cherry-pick it into > the emacs-24 branch. Other fixes should go into the trunk. You mean "manually cherry-pick"? Is there a simple way to cherry-pick with bzr? -- Bastien