emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: Rasmus <rasmus@gmx.us>
Cc: Kaushal Modi <kaushal.modi@gmail.com>,
	emacs-orgmode@gnu.org, emacs-devel@gnu.org
Subject: Re: Sync up the org in emacs master to org maint branch?
Date: Thu, 26 Jan 2017 01:19:33 -0500	[thread overview]
Message-ID: <87y3xys5qi.fsf@kyleam.com> (raw)
In-Reply-To: <87a8afaxlz.fsf@gmx.us> (rasmus@gmx.us's message of "Wed, 25 Jan 2017 17:54:48 +0100")

Rasmus <rasmus@gmx.us> writes:

> Kaushal Modi <kaushal.modi@gmail.com> writes:

[...]

>> As a precaution that that does not repeat when emacs 26.x is released,
>> should the org version in emacs master be synced with the now latest stable
>> org version 9.0.4?
>
> Yes.

We'd want at least one more release from maint, I think, so that'd be
9.0.5.

>> If we are able the release the new packaging method in emacs 26.x, then we
>> can remove org from emacs master completely, but if not, then at least as
>> backup we have a newer org version to go out with that release.
>
> What is the current status?  I am a bit confused about the policy at this
> point.  I'm happy to try to update master to 9.0.4, but I was somehow
> under the impression that we were waiting for a solution to include ELPA
> packages in the Emacs tarball.

Rasmus, I've pushed a branch (emacs-sync) to the Org repo that applies
several patches on top of maint.  These make a few changes to org.texi
and orgcard.tex that I think are appropriate for the sync.  Feel free to
ignore the branch if it's not helpful.

Thanks.

-- 
Kyle

  parent reply	other threads:[~2017-01-26  6:19 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-25 16:39 Sync up the org in emacs master to org maint branch? Kaushal Modi
2017-01-25 16:54 ` Rasmus
2017-01-25 20:31   ` Eli Zaretskii
     [not found]     ` <874m0maq9e.fsf@gmx.us>
     [not found]       ` <jwvwpdhj43d.fsf-monnier+gmane.emacs.devel@gnu.org>
2017-01-26 15:01         ` Kaushal Modi
2017-01-26 15:39           ` Kyle Meyer
2017-01-26 16:01             ` Kaushal Modi
2017-01-26 16:36               ` Eli Zaretskii
2017-01-29 19:06                 ` John Wiegley
2017-01-26  6:19   ` Kyle Meyer [this message]
2017-01-26  8:26   ` Michael Albinus
2017-01-29 19:15 ` John Wiegley
2017-01-30  1:07   ` Stefan Monnier
2017-01-30  7:47   ` David Engster
2017-01-30 15:59     ` John Wiegley
2017-01-30 18:51       ` Edward John Steere
2017-02-03  2:01         ` John Wiegley
2017-02-04 16:30           ` David Engster
2017-01-30 19:28       ` David Engster
2017-01-30 21:52         ` John Wiegley
2017-01-31 14:22           ` Lars Ingebrigtsen
2017-01-31 15:08             ` John Wiegley
2017-01-31 15:15               ` Lars Ingebrigtsen
2017-01-31 15:31                 ` David Engster
2017-01-31 15:33                   ` Lars Ingebrigtsen
2017-01-31 21:55             ` Stephen Leake
2017-02-01 18:48               ` Lars Ingebrigtsen
2017-01-31 23:19             ` Aaron Ecay
2017-02-01 18:51               ` Lars Ingebrigtsen
2017-02-01 23:21                 ` Phillip Lord
2017-02-02 14:37                   ` Stefan Monnier
2017-01-31 15:45           ` David Engster
2017-02-02  2:56             ` John Wiegley
2017-02-02 12:10               ` Lars Ingebrigtsen
2017-02-02 14:09                 ` John Wiegley
2017-02-02 14:34                   ` Lars Ingebrigtsen
2017-02-02 14:23                 ` Dmitry Gutov
2017-02-02 17:32                 ` Eli Zaretskii
2017-02-02 17:47                   ` David Engster
2017-02-02 20:37                     ` Eli Zaretskii
2017-02-02 20:57                       ` David Engster
2017-02-02 21:13                         ` Eli Zaretskii
2017-02-02 14:50               ` Stefan Monnier
2017-02-03  1:55                 ` Using CEDET modules from Emacs core John Wiegley
2017-02-03  4:24                   ` Stefan Monnier
2017-02-05  7:40                     ` Edward John Steere
2017-02-12  2:15                     ` John Wiegley
2017-02-12  3:33                       ` Stefan Monnier
2017-02-12 16:00                         ` Dmitry Gutov
2017-02-14 22:51                           ` Eric Ludlam
2017-02-14 23:45                             ` Stefan Monnier
2017-02-02 16:30               ` Sync up the org in emacs master to org maint branch? David Engster
2017-02-02 18:17                 ` Stefan Monnier
2017-02-03  1:54                 ` John Wiegley
2017-02-03  4:41                   ` Stefan Monnier
2017-02-03 16:05                   ` David Engster
2017-02-05  9:03                     ` Edward John Steere
2017-02-05 15:50                       ` Eli Zaretskii
2017-02-05 16:59                       ` David Engster
2017-02-05 20:36                         ` Edward John Steere
2017-02-06 22:03                           ` David Engster
2017-02-07 17:18                             ` Edward John Steere
2017-02-12  2:46                     ` John Wiegley
2017-02-12 15:34                       ` Eli Zaretskii
2017-02-12 23:33                         ` Stefan Monnier
2017-01-31 14:42         ` Stefan Monnier
     [not found]   ` <WM!417e241b26f9ffab5c4a5fb52e8ccb8dd78efd1b242df281924e708a87f0c07486b9d0c1eee555fb39c40d66f9d657b3!@mailhub-mx4.ncl.ac.uk>
2017-02-06 10:00     ` Phillip Lord
2017-02-12  2:22       ` John Wiegley

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=87y3xys5qi.fsf@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=emacs-devel@gnu.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=kaushal.modi@gmail.com \
    --cc=rasmus@gmx.us \
    /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).