[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: org-merger questions

From: Kyle Meyer
Subject: Re: org-merger questions
Date: Wed, 21 Jun 2017 11:27:43 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux)

Rasmus <address@hidden> 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,

    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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]