From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bill Wohler Newsgroups: gmane.emacs.devel Subject: Re: Emacs branches in git Date: Sun, 16 Feb 2014 12:11:31 -0800 Organization: Newt Software Message-ID: <87eh32rf64.fsf@olgas.newt.com> References: <3188.1392526217@olgas.newt.com> <87eh33irbn.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1392581519 9314 80.91.229.3 (16 Feb 2014 20:11:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 16 Feb 2014 20:11:59 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 16 21:12:08 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 1WF84J-0005vR-SU for ged-emacs-devel@m.gmane.org; Sun, 16 Feb 2014 21:12:03 +0100 Original-Received: from localhost ([::1]:34859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WF84J-0008NY-DB for ged-emacs-devel@m.gmane.org; Sun, 16 Feb 2014 15:12:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WF84C-0008Lj-9D for emacs-devel@gnu.org; Sun, 16 Feb 2014 15:12:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WF847-0007z7-J5 for emacs-devel@gnu.org; Sun, 16 Feb 2014 15:11:56 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:36092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WF847-0007yr-CN for emacs-devel@gnu.org; Sun, 16 Feb 2014 15:11:51 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1WF844-0005cI-Rl for emacs-devel@gnu.org; Sun, 16 Feb 2014 21:11:48 +0100 Original-Received: from c-24-6-50-86.hsd1.ca.comcast.net ([24.6.50.86]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Feb 2014 21:11:48 +0100 Original-Received: from wohler by c-24-6-50-86.hsd1.ca.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 16 Feb 2014 21:11:48 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 32 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-24-6-50-86.hsd1.ca.comcast.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) Cancel-Lock: sha1:JN/7Gllq22TbMglJzrMppihvdp4= 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:169663 Archived-At: Dmitry Gutov writes: > Bill Wohler writes: > >> master: For tagged releases. >> >> dev: How trunk is used now. > > Why is that? > > 1. People can put tags on revisions in release branches. Why dedicate a > branch just for release tags? Please see http://nvie.com/posts/a-successful-git-branching-model/ for the rationale. Also, in git, release branches are deleted when they are no longer needed. > 2. I suspect that at least some releases won't be direct descendants of > one another. I.e. there won't be a way to have all release revisions on > one branch. Yes, that is one reason why you want to tag on master. As a related aside, I find that after tagging a release on master, it is helpful to merge master into the release branch and then in into dev. That way, "git describe" can refer to a reasonable tag no matter which branch you are on. -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD