emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: Bastien Guerry <bzg@gnu.org>
Cc: emacs-orgmode@gnu.org, Nicolas Goaziou <mail@nicolasgoaziou.fr>,
	Kaushal Modi <kaushal.modi@gmail.com>
Subject: Re: Merge 9.0.5 to emacs master?
Date: Mon, 13 Feb 2017 11:32:20 -0500	[thread overview]
Message-ID: <87y3xaoxuz.fsf@kyleam.com> (raw)
In-Reply-To: <871sv2wjdl.fsf@bzg.fr>

Hi Bastien,

Bastien Guerry <bzg@gnu.org> writes:

> Kyle Meyer <kyle@kyleam.com> writes:
>
>> Kaushal Modi <kaushal.modi@gmail.com> writes:
>>
>>> Kyle -- Would this be a good time to start the merge to emacs master?
>>
>>From my standpoint, that'd be fine.  I'm not aware of any outstanding
>> patches that need to be backported from the Emacs repo.
>
> Before undertaking this, we need to make sure the Emacs maintainers
> are fine with it -- I'm late in reading the related discussions.
>
> Can you wait a few days for my "go" ?

I'll do better than that and wait indefinitely since the plan isn't for
me to do the syncing :)

To give a bit more context to Kaushal's question, when he asked the list
previously [*1*] about syncing 9.0.4 with the Emacs repo, I replied
[*2*, *3*] that we should wait for the next release because there were
Emacs commits that still needed to be backported, as well as white space
touch-ups that were needed in order for the Org files to pass Emacs's
pre-commit check.

I also mentioned [*2*] that I had created a branch, emacs-sync, in the
Org repo that contains a few extra changes that I think are appropriate
for the sync.  That branch is up-to-date with 9.0.5.


[*1*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00551.html
[*2*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00571.html
[*3*] https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00584.html

-- 
Kyle

  reply	other threads:[~2017-02-13 16:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-10 13:53 Release 9.0.5 Bastien
2017-02-10 19:50 ` Jorge Morais Neto
2017-02-10 20:05   ` Bastien Guerry
2017-02-26 12:03   ` location of clocking out notes (was: Re: Release 9.0.5) Gregor Zattler
2017-02-26 13:21     ` location of clocking out notes Nicolas Goaziou
2017-02-10 20:25 ` Release 9.0.5 Fabrice Popineau
2017-02-10 21:37   ` Fabrice Popineau
2017-02-10 22:44     ` Fabrice Popineau
2017-02-11  0:47       ` Nicolas Goaziou
2017-02-11 15:37         ` Fabrice Popineau
2017-02-13 16:26           ` Nicolas Goaziou
2017-02-11  9:29     ` Colin Baxter
2017-02-10 22:12 ` Russell Adams
2017-02-12 22:29 ` Merge 9.0.5 to emacs master? (Was: Release 9.0.5) Kaushal Modi
2017-02-12 23:41   ` Kyle Meyer
2017-02-13  9:05     ` Merge 9.0.5 to emacs master? Bastien Guerry
2017-02-13 16:32       ` Kyle Meyer [this message]
2017-02-13 16:58         ` Rasmus
2017-02-13 18:04           ` Kyle Meyer
2017-04-18 13:02             ` Kaushal Modi

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.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87y3xaoxuz.fsf@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=bzg@gnu.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=kaushal.modi@gmail.com \
    --cc=mail@nicolasgoaziou.fr \
    /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/org-mode.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).