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: Commit 49c0ff2 "Don't bind org-agenda .." Date: Mon, 19 Jun 2017 19:16:52 -0400 Message-ID: <87y3snbmaj.fsf@kyleam.com> References: <87a855of9m.fsf@bzg.fr> <87fuevdc6c.fsf@kyleam.com> <8760frd53c.fsf@kyleam.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1497914237 18548 195.159.176.226 (19 Jun 2017 23:17:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 19 Jun 2017 23:17:17 +0000 (UTC) Cc: Mark Oteiza , John Wiegley , Emacs developers , Bastien Guerry , Nicolas Goaziou , Kaushal Modi , Eli Zaretskii To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jun 20 01:17:10 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 1dN5uw-0004Rw-5C for ged-emacs-devel@m.gmane.org; Tue, 20 Jun 2017 01:17:10 +0200 Original-Received: from localhost ([::1]:44728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN5v1-0008Oq-Cz for ged-emacs-devel@m.gmane.org; Mon, 19 Jun 2017 19:17:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN5uq-0008OZ-Qu for emacs-devel@gnu.org; Mon, 19 Jun 2017 19:17:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dN5up-0000Ge-TH for emacs-devel@gnu.org; Mon, 19 Jun 2017 19:17:04 -0400 Original-Received: from pb-smtp1.pobox.com ([64.147.108.70]:59811 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 1dN5ui-0000DN-Uo; Mon, 19 Jun 2017 19:16:57 -0400 Original-Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 27EE98DE0D; Mon, 19 Jun 2017 19:16:54 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=QdH9+chYgiERaU75pXzmxOhTjAg=; b=AErvQ7 wVJEnfhhmFs9g35H0bfPygqylrITi6+GWIG1JkxUM7vW5PBYj1MdirB6D4Tz2sEh 2ULyfPYI3Gp94VZVbJlRQU5rHkQXVuTxqvTVrCpo3tJ8BCPKbThlkTcSVGPzKwjY 90UdJp6TgoxwlezMy7TyeB+YPOnZWotoKLDcY= Original-Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 203738DE0C; Mon, 19 Jun 2017 19:16:54 -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 957548DE0B; Mon, 19 Jun 2017 19:16:53 -0400 (EDT) In-Reply-To: X-Pobox-Relay-ID: 619389D0-5545-11E7-8AF5-EFB41968708C-24757444!pb-smtp1.pobox.com DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=kyleam.com; h=from:to:cc:subject:in-reply-to:references:date:message-id:mime-version:content-type; s=mesmtp; bh=QdH9+chYgiERaU75pXzmxOhTjAg=; b=zfCf4q/hiPv/GptYx7fkeIuzUErWT0bXS4VpnllW/1bQLcRoQcHwx3o34fiecdxkTzbJ/kh4IUyQ/SIsbmWxtTNV4xSTt20TAjwaXIMo3h7JjP7Ealgx8pLousPlETdLb4iULw6L91r8IdGwl9/WO4L464P2x09HCRQg3BDHh+o= 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:215810 Archived-At: Glenn Morris writes: > Kyle Meyer wrote: > >> The issue is that, if we backport to Org's master branch, the changes in >> Emacs's master branch will be reverted when synced with the release from >> Org's maint branch. > > That's only true if an Org "sync" is yet again going to be just a dump > of the files from Org on top of the ones in Emacs. As has been explained > before, this is not how to do it. In relevant branch of the Org repo, > construct the diff between the current revision and the last revision > that was synced with Emacs. Then apply that diff to Emacs. No, you face the same problem either way. You have commit X in Emacs's master branch and in Org's master branch, but not Org's maint branch. Because the goal is to update Emacs to the latest Org release from Org's maint [*], commit X would be reverted in the sync. Sure, you could selectively ignore the hunk that reverts back to maint's state (i.e. keep the changes from commit X), but then you create a situation where Emacs's Org files are a weird mix between the released version of Org (maint) and the developmental version (Org's master). -- Kyle