From: Bastien Guerry <bzg@gnu.org>
To: Kaushal Modi <kaushal.modi@gmail.com>
Cc: Glenn Morris <rgm@gnu.org>, John Wiegley <johnw@gnu.org>,
Emacs developers <emacs-devel@gnu.org>,
Mark Oteiza <mvoteiza@udel.edu>,
Nicolas Goaziou <mail@nicolasgoaziou.fr>,
Kyle Meyer <kyle@kyleam.com>, Eli Zaretskii <eliz@gnu.org>
Subject: Re: Org contribution flow
Date: Wed, 21 Jun 2017 08:57:03 +0200 [thread overview]
Message-ID: <87y3slomkg.fsf@bzg.fr> (raw)
In-Reply-To: <CAFyQvY1YcEeWyDAHy=6FDhHEO_wzhMFatHuFHf=1Ho2Hg8ZFuA@mail.gmail.com> (Kaushal Modi's message of "Tue, 20 Jun 2017 16:30:31 +0000")
Hi Kaushal,
the diagram looks neat, thanks! It would be useful to have it, with
some contextual explanations on Worg.
Modi <kaushal.modi@gmail.com> 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
next prev parent reply other threads:[~2017-06-21 6:57 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-17 18:17 Commit 49c0ff2 "Don't bind org-agenda .." Kaushal Modi
2017-06-18 8:45 ` Bastien Guerry
2017-06-19 19:12 ` Kyle Meyer
2017-06-19 19:36 ` Kaushal Modi
2017-06-19 19:49 ` Eli Zaretskii
2017-06-19 19:55 ` Kaushal Modi
2017-06-19 20:41 ` Bastien Guerry
2017-06-19 21:41 ` Kaushal Modi
2017-06-19 21:57 ` Bastien Guerry
2017-06-19 20:38 ` Bastien Guerry
2017-06-19 21:45 ` Kyle Meyer
2017-06-19 22:00 ` Bastien Guerry
2017-06-19 22:00 ` Glenn Morris
2017-06-19 22:34 ` Bastien Guerry
2017-06-19 23:16 ` Kyle Meyer
2017-06-20 16:30 ` Org contribution flow (Was: Commit 49c0ff2 "Don't bind org-agenda ..") Kaushal Modi
2017-06-21 6:57 ` Bastien Guerry [this message]
2017-06-21 10:42 ` Org contribution flow Mark Oteiza
2017-06-21 12:23 ` Bastien Guerry
2017-06-21 13:33 ` Kyle Meyer
2017-06-19 21:47 ` Commit 49c0ff2 "Don't bind org-agenda .." Kyle Meyer
2017-06-19 22:02 ` Bastien Guerry
2017-06-21 8:36 ` Rasmus Pank Roulund
2017-06-21 8:57 ` Michael Albinus
2017-06-21 9:58 ` Bastien Guerry
2017-06-21 10:22 ` Rasmus
2017-06-21 12:22 ` Bastien Guerry
2017-06-21 12:32 ` Michael Albinus
2017-06-21 15:16 ` Rasmus
2017-06-21 18:00 ` Eli Zaretskii
2017-06-22 8:34 ` Bastien Guerry
2017-06-19 20:33 ` Bastien Guerry
2017-06-19 21:44 ` Kyle Meyer
2017-06-20 2:14 ` Mark Oteiza
2017-06-20 6:10 ` Bastien Guerry
2017-06-20 15:09 ` Eli Zaretskii
2017-06-20 15:59 ` Bastien Guerry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y3slomkg.fsf@bzg.fr \
--to=bzg@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=johnw@gnu.org \
--cc=kaushal.modi@gmail.com \
--cc=kyle@kyleam.com \
--cc=mail@nicolasgoaziou.fr \
--cc=mvoteiza@udel.edu \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.