all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kaushal Modi <kaushal.modi@gmail.com>
To: Kyle Meyer <kyle@kyleam.com>, Bastien Guerry <bzg@gnu.org>,
	Eli Zaretskii <eliz@gnu.org>, John Wiegley <johnw@gnu.org>
Cc: Mark Oteiza <mvoteiza@udel.edu>,
	Nicolas Goaziou <mail@nicolasgoaziou.fr>,
	Emacs developers <emacs-devel@gnu.org>
Subject: Re: Commit 49c0ff2 "Don't bind org-agenda .."
Date: Mon, 19 Jun 2017 19:36:15 +0000	[thread overview]
Message-ID: <CAFyQvY2KvL4YMwSQ=3vL4J-1gSkq4VmLi513=1uEbKD3jwe6rg@mail.gmail.com> (raw)
In-Reply-To: <87fuevdc6c.fsf@kyleam.com>

[-- Attachment #1: Type: text/plain, Size: 2135 bytes --]

On Mon, Jun 19, 2017 at 3:12 PM Kyle Meyer <kyle@kyleam.com> wrote:

>
> Right, but I think it's worth emphasizing that commits that are more
> than just fixes are much harder to deal with.  Under the current system
> for syncing Emacs and Org [*], bug fixes are (usually) trivial to
> backport to Org's maint branch, but changes that are appropriate for
> Org's master branch are more problematic because it's a release from the
> Org maint branch that will be synced with the Emacs master branch.
>

I believe that in that case, the user just uses the org master branch..
Just as people wanting the latest and greatest emacs use the emacs master
branch :)


> [*] As mentioned several times on this list, the Emacs repo is very
>     overdue for a sync with Org.  Aside from this commit, all
>     Org-related commits on Emacs's side have been backported (or
>     otherwise resolved) to Org's maint branch.  On the Org list, Kaushal
>     expressed interest in moving along the final step of syncing,


Yes!


> so
>     hopefully a sync isn't too far off.
>

It would need someone with Org authority to do the actual sync.. Bastein?
Nicolas? Looks like Bastein did the last Org sync (v8.2.10) onto Emacs
master in Oct 2014. We need to happen again; sync the latest release (9.0.8
as of now), and then keep on syncing the next Org release with Emacs master
each time.

I use emacs master + org master as my daily driver and they work in
harmony. Recently a commit in emacs master broke 'make test' on Org, but
that has been fixed. I think that the best time to sync Org 9.0.8 with
emacs master is *now*. Eli? John?


> > In this particular case, the commit should go on Org master.  (No
> > need to delete it from Emacs.)
> >
> > About the functionality itself, I just gave a quick look, but it
> > feels like (org-agenda-redo t) should be responsible for doing what
> > `org-agenda-redo-all' is doing, and we need to carefully check that
> > checking all buffers is a good idea.
>
> I think the options are
>
>  3. Revert this commit in Emacs and apply it to Org's master branch.
>

I would vote for this option.
-- 

Kaushal Modi

[-- Attachment #2: Type: text/html, Size: 3094 bytes --]

  reply	other threads:[~2017-06-19 19:36 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-17 18:17 Commit 49c0ff2 "Don't bind org-agenda .." Kaushal Modi
2017-06-18  8:45 ` Bastien Guerry
2017-06-19 19:12   ` Kyle Meyer
2017-06-19 19:36     ` Kaushal Modi [this message]
2017-06-19 19:49       ` Eli Zaretskii
2017-06-19 19:55         ` Kaushal Modi
2017-06-19 20:41           ` Bastien Guerry
2017-06-19 21:41             ` Kaushal Modi
2017-06-19 21:57               ` Bastien Guerry
2017-06-19 20:38         ` Bastien Guerry
2017-06-19 21:45       ` Kyle Meyer
2017-06-19 22:00         ` Bastien Guerry
2017-06-19 22:00         ` Glenn Morris
2017-06-19 22:34           ` Bastien Guerry
2017-06-19 23:16           ` Kyle Meyer
2017-06-20 16:30             ` Org contribution flow (Was: Commit 49c0ff2 "Don't bind org-agenda ..") Kaushal Modi
2017-06-21  6:57               ` Org contribution flow Bastien Guerry
2017-06-21 10:42                 ` Mark Oteiza
2017-06-21 12:23                   ` Bastien Guerry
2017-06-21 13:33                 ` Kyle Meyer
2017-06-19 21:47       ` Commit 49c0ff2 "Don't bind org-agenda .." Kyle Meyer
2017-06-19 22:02         ` Bastien Guerry
2017-06-21  8:36           ` Rasmus Pank Roulund
2017-06-21  8:57             ` Michael Albinus
2017-06-21  9:58               ` Bastien Guerry
2017-06-21 10:22                 ` Rasmus
2017-06-21 12:22                   ` Bastien Guerry
2017-06-21 12:32                     ` Michael Albinus
2017-06-21 15:16                     ` Rasmus
2017-06-21 18:00                 ` Eli Zaretskii
2017-06-22  8:34                   ` Bastien Guerry
2017-06-19 20:33     ` Bastien Guerry
2017-06-19 21:44       ` Kyle Meyer
2017-06-20  2:14         ` Mark Oteiza
2017-06-20  6:10           ` Bastien Guerry
2017-06-20 15:09       ` Eli Zaretskii
2017-06-20 15:59         ` Bastien Guerry

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

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

  git send-email \
    --in-reply-to='CAFyQvY2KvL4YMwSQ=3vL4J-1gSkq4VmLi513=1uEbKD3jwe6rg@mail.gmail.com' \
    --to=kaushal.modi@gmail.com \
    --cc=bzg@gnu.org \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=johnw@gnu.org \
    --cc=kyle@kyleam.com \
    --cc=mail@nicolasgoaziou.fr \
    --cc=mvoteiza@udel.edu \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.