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: Thu, 22 Jun 2017 12:01:50 -0400 Message-ID: <87mv906mfl.fsf@kyleam.com> References: <874lv9fkdp.fsf@gmx.us> <87vanp5na3.fsf@bzg.fr> <87injotisu.fsf@gmx.us> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1498147503 27361 195.159.176.226 (22 Jun 2017 16:05:03 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 22 Jun 2017 16:05:03 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Cc: bzg@gnu.org To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 22 18:04:55 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 1dO4bF-0006cs-OC for ged-emacs-devel@m.gmane.org; Thu, 22 Jun 2017 18:04:54 +0200 Original-Received: from localhost ([::1]:59847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO4bK-0008Ml-PH for ged-emacs-devel@m.gmane.org; Thu, 22 Jun 2017 12:04:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO4YS-0005qV-9o for emacs-devel@gnu.org; Thu, 22 Jun 2017 12:02:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dO4YR-0002MX-Hm for emacs-devel@gnu.org; Thu, 22 Jun 2017 12:02:00 -0400 Original-Received: from pb-smtp1.pobox.com ([64.147.108.70]:52254 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 1dO4YN-0002L8-MC; Thu, 22 Jun 2017 12:01:55 -0400 Original-Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 6B0A292442; Thu, 22 Jun 2017 12:01:53 -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; s=sasl; bh=O+eBoqw/kTv6oDiPASjUf1f/Q3k=; b=S2KTz6 mivN9hE8hZaAyecuFeOknxeSSFEjS6UKZc5f+Dmkt34HFiu+GDdw3E75HyVgn7Cr ueRrxFKOjljTLp3pc1jwq7TiOnJzWs9Yqhmr3EcEmQYXWPM+YR6Ftbub+YNNMU10 ZxkUKw1L3996cZeTvN2Chou3zHKHFYgLO2iPY= Original-Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 632EE92441; Thu, 22 Jun 2017 12:01:53 -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-smtp1.pobox.com (Postfix) with ESMTPSA id D1FA892440; Thu, 22 Jun 2017 12:01:52 -0400 (EDT) X-Attribution: Kyle In-Reply-To: <87injotisu.fsf@gmx.us> (rasmus@gmx.us's message of "Thu, 22 Jun 2017 12:31:45 +0200") X-Pobox-Relay-ID: 1B8DDD16-5764-11E7-A639-EFB41968708C-24757444!pb-smtp1.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; s=mesmtp; bh=O+eBoqw/kTv6oDiPASjUf1f/Q3k=; b=YCTaTuQYqmCJBs2pi8CmmzKnJN/sSF2CiVDkexJotxwqphfOkNAxxnHutXUu2O7ebjIR5LaV9StAacubheJ4NewAoDfpnFGpWb49ip/q7jms/krv7wV4USiJtWrGF7crhNvRXVLXmwTnpxM5XOAbAUtXvW4n52CjaCVrOapW53g= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.108.70 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:215886 Archived-At: Rasmus writes: >> 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. Thanks. > I had to do a few whitespace cleanup to be able to commit. We should > backport those, I guess. Hmm, I was hoping I had already caught most of them, but maybe the issues you encountered were in the few files changed in scratch/org-mode-merge that I didn't look at. I only checked lisp/org/*.el, lisp/doc/misc/org.texi, and etc/refcards/orgcard.tex. A few problems in scratch/org-mode-merge: * scratch/org-mode-merge reverts Emacs-specific changes in etc/refcards/orgcard.tex. This same mistake was made in a previous sync and fixed with Emacs's e90dec2be1. Since then, there have been additional Emacs-specific changes added to orgcard.tex, and these are all included in Org's emacs-sync branch. * I made the mistake of not looking at ORG-NEWS for backports, so scratch/org-mode-merge is reverting a few Emacs commits here. I'll backport these, and I can also add your ORG-NEWS formatting changes to the Org repo. * The copyright years in Org's etc/styles/README have not been kept up to date, so scratch/org-mode-merge is overwriting the updated years in Emacs's etc/org/README. And a question: * Should we include the "@set DATE ..." when we replace "@include org-version.inc" in Emacs's org.texi? It doesn't seem like we have in the past (e.g., in Emacs's 6f66f53f65). -- Kyle