From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kyle Meyer <kyle@kyleam.com>
Subject: Re: Merge 9.0.5 to emacs master?
Date: Mon, 13 Feb 2017 13:04:08 -0500
Message-ID: <87wpcuotlz.fsf@kyleam.com>
References: <8737fmxibv.fsf@gnu.org>
	<CAFyQvY2ccxv+=2m1-Q+y7=ZyWSCqbPqzguNTPvgWOuTzC95bkQ@mail.gmail.com>
	<871sv3q8nh.fsf@kyleam.com> <871sv2wjdl.fsf@bzg.fr>
	<87y3xaoxuz.fsf@kyleam.com> <87r332ni27.fsf@gmx.us>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42378)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kyle@kyleam.com>) id 1cdKz2-0008GB-5h
	for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 13:04:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kyle@kyleam.com>) id 1cdKyy-0000vT-90
	for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 13:04:16 -0500
Received: from pb-smtp2.pobox.com ([64.147.108.71]:57272
	helo=sasl.smtp.pobox.com)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <kyle@kyleam.com>) id 1cdKyy-0000vC-2e
	for emacs-orgmode@gnu.org; Mon, 13 Feb 2017 13:04:12 -0500
Received: from sasl.smtp.pobox.com (unknown [127.0.0.1])
	by pb-smtp2.pobox.com (Postfix) with ESMTP id 4ED3967864
	for <emacs-orgmode@gnu.org>; Mon, 13 Feb 2017 13:04:10 -0500 (EST)
Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1])
	by pb-smtp2.pobox.com (Postfix) with ESMTP id 47C0567862
	for <emacs-orgmode@gnu.org>; Mon, 13 Feb 2017 13:04:10 -0500 (EST)
Received: from localhost (unknown [24.60.167.92])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pb-smtp2.pobox.com (Postfix) with ESMTPSA id B4B7F67860
	for <emacs-orgmode@gnu.org>; Mon, 13 Feb 2017 13:04:09 -0500 (EST)
In-Reply-To: <87r332ni27.fsf@gmx.us>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode/>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: "Emacs-orgmode"
	<emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
To: emacs-orgmode@gnu.org

Rasmus <rasmus@gmx.us> writes:

[...]

> I think we have discussed it before, but the best way seems to just copy
> the Org tree to the Emacs tree, right?

Given the current setup, I think copying the files is best.  I've
already resolved the conflicts when backporting Org-related commits from
the Emacs repo.

-- 
Kyle