From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Xue Fuqiao Newsgroups: gmane.emacs.devel Subject: Re: Emacs branches in git Date: Tue, 18 Feb 2014 06:51:27 +0800 Organization: The Church of Emacs Message-ID: <87txbxnyj4.fsf@gnu.org> References: <3188.1392526217@olgas.newt.com> <87eh33irbn.fsf@yandex.ru> <87eh32rf64.fsf@olgas.newt.com> <877g8ux15e.fsf@fencepost.gnu.org> <878utapu6p.fsf@olgas.newt.com> <87txbyd38j.fsf@yandex.ru> <19051.1392597409@olgas.newt.com> <53017273.10304@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1392677511 1780 80.91.229.3 (17 Feb 2014 22:51:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Feb 2014 22:51:51 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 17 23:52:00 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WFX2d-000216-F1 for ged-emacs-devel@m.gmane.org; Mon, 17 Feb 2014 23:51:59 +0100 Original-Received: from localhost ([::1]:44745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFX2d-0000dM-3K for ged-emacs-devel@m.gmane.org; Mon, 17 Feb 2014 17:51:59 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFX2V-0000X4-6e for emacs-devel@gnu.org; Mon, 17 Feb 2014 17:51:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFX2Q-0005vZ-Av for emacs-devel@gnu.org; Mon, 17 Feb 2014 17:51:51 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:48138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFX2Q-0005vS-54 for emacs-devel@gnu.org; Mon, 17 Feb 2014 17:51:46 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WFX2H-0001Yq-Bu for emacs-devel@gnu.org; Mon, 17 Feb 2014 23:51:42 +0100 Original-Received: from 58.128.2.155 ([58.128.2.155]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Feb 2014 23:51:37 +0100 Original-Received: from xfq by 58.128.2.155 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Feb 2014 23:51:37 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 28 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 58.128.2.155 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:u5W5wPPCVhBawWJ/NfwDUVpy//4= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:169721 Archived-At: Dmitry Gutov writes: > As far as I'm concerned, it subverts the meaning of "master". That's > just one opinion, though. In the famous "Pro Git"[fn:1]: [...] Many Git developers have a workflow that embraces this approach, such as having only code that is entirely stable in their `master' branch — possibly only code that has been or will be released. They have another parallel branch named develop or next that they work from or use to test stability — it isn’t necessarily always stable, but whenever it gets to a stable state, it can be merged into `master'. [...] You can keep doing this for several levels of stability. Some larger projects also have a `proposed' or `pu' (proposed updates) branch that has integrated branches that may not be ready to go into the `next' or `master' branch. The idea is that your branches are at various levels of stability; when they reach a more stable level, they’re merged into the branch above them. Footnotes: [fn:1] http://git-scm.com/book/en/Git-Branching-Branching-Workflows -- http://www.gnu.org/software/emacs/