From: Bastien <bzg@gnu.org>
To: Chong Yidong <cyd@gnu.org>
Cc: Stephen Berman <stephen.berman@gmx.net>, emacs-devel@gnu.org
Subject: Re: Is the 2012-04-01 Update to Org version 7.8.07 incomplete?
Date: Mon, 07 May 2012 09:47:41 +0200 [thread overview]
Message-ID: <87sjfc300y.fsf@altern.org> (raw)
In-Reply-To: <878vh4wnjz.fsf@gnu.org> (Chong Yidong's message of "Mon, 07 May 2012 13:46:40 +0800")
Chong Yidong <cyd@gnu.org> writes:
> Bastien <bzg@gnu.org> 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
next prev parent reply other threads:[~2012-05-07 7:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-21 19:38 Is the 2012-04-01 Update to Org version 7.8.07 incomplete? Stephen Berman
2012-04-21 19:53 ` Achim Gratz
2012-04-21 20:02 ` Stephen Berman
2012-04-21 23:07 ` Bastien
2012-05-05 11:44 ` Stephen Berman
2012-05-05 13:44 ` Bastien
2012-05-05 19:14 ` Stephen Berman
2012-05-05 22:57 ` Bastien
2012-05-05 23:04 ` Stephen Berman
2012-05-07 5:46 ` Chong Yidong
2012-05-07 7:47 ` Bastien [this message]
2012-05-07 9:05 ` Chong Yidong
2012-05-07 10:13 ` Bastien
2012-05-07 7:52 ` Stephen Berman
2012-05-07 8:21 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sjfc300y.fsf@altern.org \
--to=bzg@gnu.org \
--cc=cyd@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=stephen.berman@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).