From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Bastien Guerry Newsgroups: gmane.emacs.devel Subject: Re: Org contribution flow Date: Wed, 21 Jun 2017 08:57:03 +0200 Message-ID: <87y3slomkg.fsf@bzg.fr> References: <87a855of9m.fsf@bzg.fr> <87fuevdc6c.fsf@kyleam.com> <8760frd53c.fsf@kyleam.com> <87y3snbmaj.fsf@kyleam.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1498028279 6440 195.159.176.226 (21 Jun 2017 06:57:59 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 21 Jun 2017 06:57:59 +0000 (UTC) User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/26.0 (gnu/linux) Cc: Glenn Morris , John Wiegley , Emacs developers , Mark Oteiza , Nicolas Goaziou , Kyle Meyer , Eli Zaretskii To: Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jun 21 08:57: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 1dNZaM-0001Si-ON for ged-emacs-devel@m.gmane.org; Wed, 21 Jun 2017 08:57:54 +0200 Original-Received: from localhost ([::1]:52106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNZaR-00047x-W6 for ged-emacs-devel@m.gmane.org; Wed, 21 Jun 2017 02:58:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNZZt-00047h-Iq for emacs-devel@gnu.org; Wed, 21 Jun 2017 02:57:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNZZp-0000ig-Nn for emacs-devel@gnu.org; Wed, 21 Jun 2017 02:57:25 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:51814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNZZf-0000hO-CI; Wed, 21 Jun 2017 02:57:11 -0400 Original-Received: from [78.192.157.63] (port=48182 helo=bzg.fr) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.82) (envelope-from ) id 1dNZZa-0000XA-Dm; Wed, 21 Jun 2017 02:57:06 -0400 Original-Received: by bzg.fr (Postfix, from userid 1000) id 9DD8038BAED; Wed, 21 Jun 2017 08:57:03 +0200 (CEST) In-Reply-To: (Kaushal Modi's message of "Tue, 20 Jun 2017 16:30:31 +0000") 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:215849 Archived-At: Hi Kaushal, the diagram looks neat, thanks! It would be useful to have it, with some contextual explanations on Worg. Modi writes: > And thus to prevent this mix, Org related commits should not happen > directly to emacs master. They must go to either org maint or org > master. I don't want to ask Emacs developers not to commit Org-related changes to the Emacs repo. All those commits are very useful since ~10 years, and we cannot force developers to use another repo. We need to make it easier for Org maintainers to know when a commit hit the org/ directory in the Emacs repo though. An email would be nice. But it's not a big issue. Something I do before copying Org files into Emacs master branch: in org-mode/, I do a "git checkout release_8.2.10" (using the tag of the latest Org version sync'd), then I copy Org .el files to Emacs, then I check the diff from Emacs to see what changed. In general, most of these changes are already backported to Org, but this helped me spotting a few mistakes in the past. Anyway -- I have some time for the merge today and tomorrow. The next time window for me is next monday. Best, -- Bastien