unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Rasmus <rasmus@gmx.us>
To: bzg@gnu.org
Cc: emacs-devel@gnu.org
Subject: Re: org-merger questions
Date: Thu, 22 Jun 2017 12:31:45 +0200	[thread overview]
Message-ID: <87injotisu.fsf@gmx.us> (raw)
In-Reply-To: <87vanp5na3.fsf@bzg.fr> (Bastien Guerry's message of "Wed, 21 Jun 2017 18:16:36 +0200")

> The idea would be to release 9.0.9 from maint just before the merge
> to merge a clean version.

I have pushed to scratch/org-mode-merge on Emacs.git.

I had to do a few whitespace cleanup to be able to commit.  We should
backport those, I guess.  Other than that, it seemed to compile and work
without issues on my system (GNU/Linux).

Re: schemas.xml files, the Org one contained <?xml version="1.0"?>, which
I have left out.  I added the Org location rules to bottom.

Note that http://thaiopensource.com/ns/locating-rules/1.0 isn’t
accessible.

It does not include tests for now.

Rasmus



  reply	other threads:[~2017-06-22 10:31 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 [this message]
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 ` org-merger questions Kyle Meyer

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=87injotisu.fsf@gmx.us \
    --to=rasmus@gmx.us \
    --cc=bzg@gnu.org \
    --cc=emacs-devel@gnu.org \
    /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).