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 16:36:49 -0800 Organization: Newt Software Message-ID: <19051.1392597409@olgas.newt.com> 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> NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1392597416 3275 80.91.229.3 (17 Feb 2014 00:36:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Feb 2014 00:36:56 +0000 (UTC) Cc: emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Feb 17 01:37:05 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 1WFCCm-0001U5-79 for ged-emacs-devel@m.gmane.org; Mon, 17 Feb 2014 01:37:04 +0100 Original-Received: from localhost ([::1]:35773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFCCl-0004iW-P6 for ged-emacs-devel@m.gmane.org; Sun, 16 Feb 2014 19:37:03 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFCCe-0004gH-K5 for emacs-devel@gnu.org; Sun, 16 Feb 2014 19:37:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFCCZ-0003AY-Sr for emacs-devel@gnu.org; Sun, 16 Feb 2014 19:36:56 -0500 Original-Received: from tassie.newt.com ([66.135.33.59]:58355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFCCZ-00039D-Ng for emacs-devel@gnu.org; Sun, 16 Feb 2014 19:36:51 -0500 Original-Received: from olgas.newt.com (c-24-6-50-86.hsd1.ca.comcast.net [24.6.50.86]) by tassie.newt.com (Postfix) with ESMTPSA id 81564681034; Sun, 16 Feb 2014 16:36:50 -0800 (PST) Original-Received: by olgas.newt.com (Postfix, from userid 1000) id 7BB70156123; Sun, 16 Feb 2014 16:36:49 -0800 (PST) Original-Received: from olgas.newt.com (localhost [127.0.0.1]) by olgas.newt.com (Postfix) with ESMTP id 638811560CB; Sun, 16 Feb 2014 16:36:49 -0800 (PST) In-reply-to: <87txbyd38j.fsf@yandex.ru> Comments: In-reply-to Dmitry Gutov message dated "Mon, 17 Feb 2014 01:53:00 +0200." X-Mailer: MH-E 8.5+bzr; nmh 1.5; GNU Emacs 23.4.1 X-Image-URL: http://www.newt.com/wohler/images/bill-diving.png Mail-Followup-To: emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 66.135.33.59 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:169674 Archived-At: Dmitry Gutov wrote: > Bill Wohler writes: > > >>> Please see http://nvie.com/posts/a-successful-git-branching-model/ for > >>> the rationale. > > I don't see any justification there, except "We consider origin/master > to be ... a production-ready state." Which is just an arbitrary opinion. OK, it might not have justification, but it isn't arbitrary. What is the justification for *not* doing this? > >>> Also, in git, release branches are deleted when they are > >>> no longer needed. > > So what? Tags can live on. Except you will no longer see them in git log output. > >> You are talking past each other. You want to organize tags into a > >> directory of tags, > > > > s/tags/branches/ > > ?? I was suggesting directories of branches, not tags. Regardless of where you tag, creating a hierarchy of branches would help clean things up and make things easier to find. Can you organize tags into a directory, and would "git tag" only list the directory? That would be neat, because then I could put, for example, the MH-E tags into a subdirectory so Emacs users would not have them in their "git tags" output. > >> Dmitry is talking about placing tags all into a > >> single branch. Which makes very little sense. > > If master is to be used "for tagged releases", all release-tagged > revisions have to be able to line up in one branch. Interspersed with > plain revisions, of course. > > > Except that's not the point, but rather a side-effect. The point is that > > master holds the production-ready commits. > > Yes, and why do we need that? If one wants to use the latest release, > they can just fetch the list of tags, and then checkout the one with the > greatest number. While an expert might have a lot more reasons, a couple of things that come to mind are: - Looking for and checking out a tag is more work than "git checkout master". - Conversely, if master tracked the release version, you just have to do a "git pull" to stay up to date with the latest released version. - Checking out a tag doesn't work if you have continuous integration. Granted, you wouldn't have CI with master in this scheme, but the generalization may apply elsewhere. - Checking out a tagged version puts you in a "detached HEAD" state for better or for worse. - git log master would yield a concise history of releases. Since branches are cheap, why not? > >> But it's not obvious to > >> casual users of gits that you can have tags in a directory structure > >> that has nothing to do with either the work directory or the commit > >> tree. > > > > Can you expound on that? > > Yes, please. -- Bill Wohler aka http://www.newt.com/wohler/ GnuPG ID:610BD9AD