From: Kyle Meyer <kyle@kyleam.com>
To: Rasmus <rasmus@gmx.us>, emacs-orgmode@gnu.org
Subject: Re: Upstream synchronization documentation
Date: Mon, 03 Jul 2017 15:36:42 -0400 [thread overview]
Message-ID: <87a84l8g8l.fsf@kyleam.com> (raw)
In-Reply-To: <87fuedyfij.fsf@gmx.us>
Rasmus <rasmus@gmx.us> writes:
> The documentation in README_maintainer is a bit outdated
> wrt. synchronizing with upstream Emacs.
Thanks for taking the time to update this.
> +** Backporting changes from upstream Emacs
> +To check for backports from the Emacs upstream repository, one can use
> +the following =git= command, cutesy of [[http://permalink.gmane.org/gmane.emacs.devel/215861][Kyle Meyer]],
^courtesy
> +
> +: git log $rev..origin/emacs-25 -- lisp/org doc/misc/org.texi etc/refcards/orgcard.tex
This pathspec will catch nearly all the changes that should be
considered for backporting. In the process of this sync, I realized
that the check should include a few more files for completeness. I now
add etc/ORG-NEWS and etc/org to the pathspec above. On top of that, the
latest sync introduces od-manifest-schema-v1.2-os.rnc and
od-schema-v1.2-os.rnc to Emacs's etc/schema directory, so I've added
those too.
Anyway, that's just for the record. Together these files should be the
source of very few backports, but I think they're worth monitoring to be
to make sure we don't need to deal with any changes on the Emacs-side.
I'm not sure if you want to document the extended and unwieldy pathspec
here, but it would be
-- lisp/org doc/misc/org.texi etc/refcards/orgcard.tex etc/ORG-NEWS etc/org \
etc/schema/od-manifest-schema-v1.2-os.rnc etc/schema/od-schema-v1.2-os.rnc
> +where =$rev= is the last commit from the =emacs-25= branch that was
> +backported. The same should be done for the =master= branch.
[...]
> +- =org.texi= :: Copy to =emacs/doc/misc=. It may be necessary to replace,
> + ~@include org-version.inc~ #+end_src with ~@set VERSION 9.0.9~
Leftover "#+end_src" from a previous edit?
> +** Outdated notes
Instead of creating this heading, should we just delete the outdated
notes?
--
Kyle
next prev parent reply other threads:[~2017-07-03 19:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 10:35 Upstream synchronization documentation Rasmus
2017-07-03 11:01 ` Neil Jerram
2017-07-03 15:06 ` Kyle Meyer
2017-07-03 17:31 ` Rasmus Pank Roulund
2017-07-04 0:39 ` Neil Jerram
[not found] ` <2c3a774dd5014c46983c98c8a00758e3@HE1PR01MB1898.eurprd01.prod.exchangelabs.com>
2017-07-03 12:11 ` Eric S Fraga
2017-07-03 19:36 ` Kyle Meyer [this message]
2017-07-04 6:50 ` Rasmus
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.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a84l8g8l.fsf@kyleam.com \
--to=kyle@kyleam.com \
--cc=emacs-orgmode@gnu.org \
--cc=rasmus@gmx.us \
/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/org-mode.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).