From: Bill Wohler <wohler@newt.com>
To: emacs-devel@gnu.org
Subject: Emacs branches in git
Date: Sat, 15 Feb 2014 20:50:17 -0800 [thread overview]
Message-ID: <3188.1392526217@olgas.newt.com> (raw)
I missed the transition discussion in January, but it doesn't look like
I missed the transition :-).
I didn't see any discussion about branching conventions in regards to
release strategy and branch namespaces. I apologize if I missed it.
For a release strategy, the one espoused in this page is popular:
http://nvie.com/posts/a-successful-git-branching-model/
I'd also recommend against a flat branch namespace in the upstream
repository. Here are some thoughts on dividing the branches, including
dev and master for completeness:
master: For tagged releases.
dev: How trunk is used now.
releases: Release branches, such as releases/emacs-24
features: Larger features, such as features/gnus or features/mh-e.
topics: Ephemeral feature or bugfix branches, such as topics/vc-git or
topics/16694.
bugs: Perhaps folks might prefer bugs/16694 instead.
The latter two namespaces would mostly only live in the developer's
repository, but it would be good to have a convention in case they are
pushed for sharing.
--
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD
next reply other threads:[~2014-02-16 4:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-16 4:50 Bill Wohler [this message]
2014-02-16 5:01 ` Emacs branches in git Dmitry Gutov
2014-02-16 20:11 ` Bill Wohler
2014-02-16 20:17 ` David Kastrup
2014-02-16 22:30 ` Bill Wohler
2014-02-16 23:53 ` Dmitry Gutov
2014-02-17 0:36 ` Bill Wohler
2014-02-17 2:22 ` Dmitry Gutov
2014-02-17 9:11 ` Andreas Schwab
2014-02-17 12:51 ` Thien-Thi Nguyen
2014-02-17 22:51 ` Xue Fuqiao
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=3188.1392526217@olgas.newt.com \
--to=wohler@newt.com \
--cc=emacs-devel@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.