From: Eric Schulte <eric.schulte@gmx.com>
To: Bastien <bzg@altern.org>
Cc: Chong Yidong <cyd@gnu.org>,
emacs-devel@gnu.org, Stefan Monnier <monnier@iro.umontreal.ca>,
schulte eric <schulte.eric@gmail.com>,
"Jambunathan K." <kjambunathan@gmail.com>
Subject: Re: Merging Org 7.8.02 before Emacs 24.1
Date: Sat, 31 Dec 2011 10:17:05 -0700 [thread overview]
Message-ID: <87r4zk8xv2.fsf@gmx.com> (raw)
In-Reply-To: <87sjk155p6.fsf@gnu.org> (Bastien's message of "Sat, 31 Dec 2011 12:41:25 +0100")
Bastien <bzg@altern.org> writes:
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>> I'd suggest you setup a regular "merge from Emacs trunk". So your
>> "maint" branch can simply be the Emacs trunk.
>
> Not sure I can parse this correctly.
>
> Your suggestion is to create a branch on org-mode.git that contains
> the latest org* files from the Emacs trunk? Then to patch the Emacs
> trunk with patches that go into that branch?
>
> Thanks for further explanations!
I believe the suggestion is to increase the frequency of merges with the
Emacs trunk s.t. every Org-mode major release is also a merge with the
Emacs trunk. Then we have no need for a release-specific maintenance
branch *and* a branch tracking the Emacs trunk as they will be one in
the same.
I do think that (after the feature freeze) a tighter coupling between
the Org-mode and Emacs development repositories with more frequent and
less dramatic merges would be a good thing. Although I don't know how
much manual work is required to accomplish each merge.
--
Eric Schulte
http://cs.unm.edu/~eschulte/
next prev parent reply other threads:[~2011-12-31 17:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-23 13:54 Merging Org 7.8.02 before Emacs 24.1 Bastien
2011-12-24 4:24 ` Jambunathan K
2011-12-24 7:31 ` Jambunathan K
2011-12-24 8:09 ` Bastien
2011-12-24 5:11 ` Leo
2011-12-26 7:44 ` Chong Yidong
2011-12-26 8:55 ` Bastien
2011-12-27 7:19 ` Jambunathan K
2011-12-27 10:47 ` Lennart Borgman
2011-12-29 4:42 ` Chong Yidong
2011-12-31 8:27 ` Bastien
2011-12-31 10:39 ` Stefan Monnier
2011-12-31 11:41 ` Bastien
2011-12-31 17:17 ` Eric Schulte [this message]
2011-12-26 21:32 ` Eric Schulte
2011-12-29 4:36 ` Chong Yidong
2011-12-29 16:41 ` Bastien
2012-01-03 19:45 ` Bastien
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=87r4zk8xv2.fsf@gmx.com \
--to=eric.schulte@gmx.com \
--cc=bzg@altern.org \
--cc=cyd@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kjambunathan@gmail.com \
--cc=monnier@iro.umontreal.ca \
--cc=schulte.eric@gmail.com \
/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.