From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Kyle Meyer Newsgroups: gmane.emacs.devel Subject: Re: org-merger questions Date: Wed, 21 Jun 2017 11:27:43 -0400 Message-ID: <87bmphtl74.fsf@kyleam.com> References: <874lv9fkdp.fsf@gmx.us> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1498058933 13199 195.159.176.226 (21 Jun 2017 15:28:53 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 21 Jun 2017 15:28:53 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Cc: bzg@gnu.org, Stromeko@Nexgo.DE, michael.albinus@gmx.de To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 21 17:28:46 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNhYj-00035V-Ve for ged-emacs-devel@m.gmane.org; Wed, 21 Jun 2017 17:28:46 +0200 Original-Received: from localhost ([::1]:54659 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNhYo-0005VI-Mr for ged-emacs-devel@m.gmane.org; Wed, 21 Jun 2017 11:28:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNhXr-0005Ti-Dl for emacs-devel@gnu.org; Wed, 21 Jun 2017 11:27:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNhXq-0004HK-JQ for emacs-devel@gnu.org; Wed, 21 Jun 2017 11:27:51 -0400 Original-Received: from pb-smtp2.pobox.com ([64.147.108.71]:52065 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 ) id 1dNhXm-0004EC-9I; Wed, 21 Jun 2017 11:27:46 -0400 Original-Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id DD46684A12; Wed, 21 Jun 2017 11:27:44 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=jVaMbFT5cfeR 1oZ+PbsPvyssbDs=; b=E55teiUTbUkRLYtwsEAdGnwVgl5g2hbx803ivh5R8akg PuvJ3ji4RfbOnRHfO/A9ySvtE6OM9VorWT9+Zh2LEIW3OiW+lN3e8uWbtfx1fk0U plFRd6ykYh9RBiiF4kMAXvm69DSeMnE1CKbAwCI68IbRdDXoyncdSG7SaZRqGEU= Original-Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id D380F84A11; Wed, 21 Jun 2017 11:27:44 -0400 (EDT) Original-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 4728784A10; Wed, 21 Jun 2017 11:27:44 -0400 (EDT) X-Attribution: Kyle In-Reply-To: <874lv9fkdp.fsf@gmx.us> (rasmus@gmx.us's message of "Wed, 21 Jun 2017 17:09:06 +0200") X-Pobox-Relay-ID: 2C194626-5696-11E7-A157-61520C78B957-24757444!pb-smtp2.pobox.com DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=kyleam.com; h=from:to:cc:subject:references:date:in-reply-to:message-id:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=jVaMbFT5cfeR1oZ+PbsPvyssbDs=; b=Bs3VJssHeFFt7cdvgek1ZQQ09aXzx/SOurKq7PS/BpKGRCcUo4j7C4y5ke7flkT9Usr1ySv152qwryb9cI+o4q1710DqAmiZZK99cqNWdcRyV1PnyAlnaOfmETFYKSFN1u8MtiVVrbQXd+CWhEyovjzpCt4fcu9nSGmj5L0HU+Y= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.108.71 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:215865 Archived-At: Rasmus writes: > As discussed, Org urgently needs to be merged into Emacs. I have started > a scratch branch with v9.0.8, although I haven=E2=80=99t 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. --=20 Kyle