all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Glenn Morris <rgm@gnu.org>
To: Kyle Meyer <kyle@kyleam.com>
Cc: Mark Oteiza <mvoteiza@udel.edu>, John Wiegley <johnw@gnu.org>,
	Emacs developers <emacs-devel@gnu.org>,
	Bastien Guerry <bzg@gnu.org>,
	Nicolas Goaziou <mail@nicolasgoaziou.fr>,
	Kaushal Modi <kaushal.modi@gmail.com>,
	Eli Zaretskii <eliz@gnu.org>
Subject: Re: Commit 49c0ff2 "Don't bind org-agenda .."
Date: Mon, 19 Jun 2017 18:00:53 -0400	[thread overview]
Message-ID: <g3a8538woa.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <8760frd53c.fsf@kyleam.com> (Kyle Meyer's message of "Mon, 19 Jun 2017 17:45:27 -0400")

Kyle Meyer wrote:

> 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.

That's only true if an Org "sync" is yet again going to be just a dump
of the files from Org on top of the ones in Emacs. As has been explained
before, this is not how to do it. In relevant branch of the Org repo,
construct the diff between the current revision and the last revision
that was synced with Emacs. Then apply that diff to Emacs.

It really seems to me that keeping code in two repositories does not
benefit either users or developers (witness the apparent problems caused
by one single, simple commit). Did the project to include elpa packages
in Emacs releases stall?



  parent reply	other threads:[~2017-06-19 22:00 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
2017-06-19 22:00         ` Bastien Guerry
2017-06-19 22:00         ` Glenn Morris [this message]
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=g3a8538woa.fsf@fencepost.gnu.org \
    --to=rgm@gnu.org \
    --cc=bzg@gnu.org \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=johnw@gnu.org \
    --cc=kaushal.modi@gmail.com \
    --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.