From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Commit 49c0ff2 "Don't bind org-agenda .." Date: Mon, 19 Jun 2017 18:00:53 -0400 Message-ID: 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 1497909674 11992 195.159.176.226 (19 Jun 2017 22:01:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 19 Jun 2017 22:01:14 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: Mark Oteiza , John Wiegley , Emacs developers , Bastien Guerry , Nicolas Goaziou , Kaushal Modi , Eli Zaretskii To: Kyle Meyer Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jun 20 00:01: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 1dN4jO-0002sc-4K for ged-emacs-devel@m.gmane.org; Tue, 20 Jun 2017 00:01:10 +0200 Original-Received: from localhost ([::1]:44500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN4jT-00057k-C0 for ged-emacs-devel@m.gmane.org; Mon, 19 Jun 2017 18:01:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN4jE-00054a-En for emacs-devel@gnu.org; Mon, 19 Jun 2017 18:01:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dN4jD-0006aD-P2 for emacs-devel@gnu.org; Mon, 19 Jun 2017 18:01:00 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN4j8-0006Wc-RI; Mon, 19 Jun 2017 18:00:54 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1dN4j7-0004YU-AS; Mon, 19 Jun 2017 18:00:53 -0400 X-Spook: Area 51 Vaccine Stranded Agro Terror espionage AQIM Port X-Ran: iX4,W-Q7}/T5zj<3*@ZV:lXjq@?7G0D~yaG:&{9UbwJ)&!)Y;$}[H:ng"U,n7v (Kyle Meyer's message of "Mon, 19 Jun 2017 17:45:27 -0400") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:215807 Archived-At: 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. It really seems to me that keeping code in two repositories does not benefit either users or developers (witness the apparent problems caused by one single, simple commit). Did the project to include elpa packages in Emacs releases stall?