From: Kyle Meyer <kyle@kyleam.com>
To: emacs-devel@gnu.org
Cc: bzg@gnu.org, Stromeko@Nexgo.DE, michael.albinus@gmx.de
Subject: Re: org-merger questions
Date: Wed, 21 Jun 2017 11:27:43 -0400 [thread overview]
Message-ID: <87bmphtl74.fsf@kyleam.com> (raw)
In-Reply-To: <874lv9fkdp.fsf@gmx.us> (rasmus@gmx.us's message of "Wed, 21 Jun 2017 17:09:06 +0200")
Rasmus <rasmus@gmx.us> writes:
> As discussed, Org urgently needs to be merged into Emacs. I have started
> a scratch branch with v9.0.8, although I haven’t pushed it yet.
>
> So far, I do the following changes from the Org release tarball:
>
> - Necessary white-space cleanup, required by probably some git hook to let
> me commit. We will have to do this on the Org repo as well.
> - Hardcode version in org.texi to remove dependency of "org-version.inc".
The emacs-sync branch in the Org repo contains the changes above, as
well as a few other Emacs-specific changes that should not be in Org's
maint branch but should be in the synced files.
Even if you don't sync from emacs-sync rather than release_9.0.8,
running
git diff release_9.0.8..origin/emacs-sync
in the Org repo can help you see the other Emacs-specific changes that
you shouldn't overwrite.
--
Kyle
prev parent reply other threads:[~2017-06-21 15:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 15:09 org-merger questions Rasmus
2017-06-21 15:23 ` Kaushal Modi
2017-06-21 16:16 ` Bastien Guerry
2017-06-22 10:31 ` Rasmus
2017-06-22 10:46 ` Yuri Khan
2017-06-22 16:01 ` Kyle Meyer
2017-06-22 18:11 ` Kyle Meyer
2017-06-23 9:04 ` Rasmus
2017-06-23 14:19 ` Kyle Meyer
2017-06-23 8:47 ` Rasmus
2017-06-23 14:30 ` Kyle Meyer
2017-06-23 14:37 ` Rasmus
2017-06-25 16:10 ` Kaushal Modi
2017-06-29 8:54 ` Rasmus
2017-06-29 9:12 ` Bastien Guerry
2017-06-29 16:13 ` John Wiegley
2017-07-03 7:19 ` Bastien
2017-07-03 15:56 ` Emacs master now updated to Org 9.0.9 (Was: org-merger questions) Kaushal Modi
2017-07-04 7:54 ` Emacs master now updated to Org 9.0.9 Bastien Guerry
2017-07-13 0:36 ` numbchild
2017-10-02 9:25 ` org-merger questions Bastien Guerry
2017-10-02 9:41 ` Rasmus
2017-10-02 9:46 ` Rasmus
2017-10-02 16:05 ` Eli Zaretskii
2017-10-11 22:31 ` Org mode update missing in NEWS (Was: Re: org-merger questions) Kaushal Modi
2017-10-12 7:54 ` Eli Zaretskii
2017-10-15 10:37 ` Org mode update missing in NEWS Rasmus
2017-06-21 15:27 ` Kyle Meyer [this message]
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=87bmphtl74.fsf@kyleam.com \
--to=kyle@kyleam.com \
--cc=Stromeko@Nexgo.DE \
--cc=bzg@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=michael.albinus@gmx.de \
/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.