From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Heller Subject: Re: Org-mode release 7.01 Date: Mon, 19 Jul 2010 11:45:47 -0700 Message-ID: <0vaapnpaxw.fsf@gmail.com> References: <4EED441F-C7A5-43DD-A3C1-3BF478BAAFD2@gmail.com> <0vmxtnpf4i.fsf@gmail.com> <87tynv1ido.fsf@gmx.net> <0viq4bpdo6.fsf@gmail.com> <87lj97fi0l.fsf@gmx.net> <0veiezpbik.fsf@gmail.com> <4C449BB6.4090508@ccbr.umn.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from [140.186.70.92] (port=46493 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OavLx-0000eW-Ai for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:46:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OavLw-0003Di-0e for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:46:13 -0400 Received: from lo.gmane.org ([80.91.229.12]:43764) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OavLv-0003DV-Q2 for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 14:46:11 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OavLq-0002Gn-3M for emacs-orgmode@gnu.org; Mon, 19 Jul 2010 20:46:06 +0200 Received: from mail.cdrd.ca ([142.103.191.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 19 Jul 2010 20:46:06 +0200 Received: from hellerm2 by mail.cdrd.ca with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 19 Jul 2010 20:46:06 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Erik Iverson writes: >> >> I assumed I had to switch to the maint branch in order to get the 7.01 >> release. How could I have done this while staying on the master branch? > > Basically, as long as you're on master, you'll always have the latest > and greatest, which may or may not be what you want. I am confused now. Carsten said is his announcement that master did NOT contain the 7.01 release: P.S. If you are trying to find the 7.01 release on the master branch in the repository, you will not. The releases are now on a new branch, called "maint", which will contain only commits that are also releases. This will make it easier to make minor fixes to a release while development continues on the master branch. > At certain times, including in the past few days, 'master' is deemed > release-worthy, and a stable release is produced. However, > development goes on in the master branch. > > The maint branch was created so that small bugs in the latest release > could be fixed and updated, without having to include whatever major > developments might have happened on master in the mean time. Would this explanation be correct then: Right now, 7.01 is in the maint branch, for a few days/weeks or so, until the small nags have been resolved; the master branch is the last 6.36 release. Once the little bugs/issues have been resolved, 7.01 will be merged with the master branch, and everything will be back to (my) normal? Is this correct? Thanks Markus