unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: Kaushal Modi <kaushal.modi@gmail.com>
Cc: Bastien Guerry <bzg@gnu.org>, John Wiegley <johnw@gnu.org>,
	Emacs developers <emacs-devel@gnu.org>,
	Mark Oteiza <mvoteiza@udel.edu>,
	Nicolas Goaziou <mail@nicolasgoaziou.fr>,
	Eli Zaretskii <eliz@gnu.org>
Subject: Re: Commit 49c0ff2 "Don't bind org-agenda .."
Date: Mon, 19 Jun 2017 17:45:27 -0400	[thread overview]
Message-ID: <8760frd53c.fsf@kyleam.com> (raw)
In-Reply-To: <CAFyQvY2KvL4YMwSQ=3vL4J-1gSkq4VmLi513=1uEbKD3jwe6rg@mail.gmail.com>

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

> 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 :)

The issue is that, if we backport to Org's master branch, the changes in
Emacs's master branch will be reverted when synced with the release from
Org's maint branch.

-- 
Kyle



  parent reply	other threads:[~2017-06-19 21:45 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
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 [this message]
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

  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=8760frd53c.fsf@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=bzg@gnu.org \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=johnw@gnu.org \
    --cc=kaushal.modi@gmail.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 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).