emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Markus Heller <hellerm2@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: Org-mode release 7.01
Date: Mon, 19 Jul 2010 11:45:47 -0700	[thread overview]
Message-ID: <0vaapnpaxw.fsf@gmail.com> (raw)
In-Reply-To: 4C449BB6.4090508@ccbr.umn.edu

Erik Iverson <eriki@ccbr.umn.edu> 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:

<quote>
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.
</quote>

> 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

  parent reply	other threads:[~2010-07-19 18:46 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-19  6:43 Org-mode release 7.01 Carsten Dominik
2010-07-19  8:22 ` Christian Moe
2010-07-19 10:38   ` Stefan Vollmar
2010-07-19  8:36 ` Eric S Fraga
2010-07-19 17:52   ` Eric Schulte
2010-07-19 12:47 ` Matt Lundin
2010-07-20  7:49   ` Colin Fraizer
2010-07-19 13:47 ` Ista Zahn
2010-07-19 15:48   ` Carsten Dominik
2010-07-19 14:55 ` Manish
2010-07-19 15:31   ` Scott Randby
2010-07-19 15:49     ` Carsten Dominik
2010-07-19 17:15 ` Markus Heller
2010-07-19 17:38   ` Andreas Burtzlaff
2010-07-19 17:46     ` Markus Heller
2010-07-19 18:23       ` Andreas Burtzlaff
2010-07-19 18:33         ` Markus Heller
2010-07-19 18:38           ` Erik Iverson
2010-07-19 18:45             ` Carsten Dominik
2010-07-19 18:45             ` Markus Heller [this message]
2010-07-19 19:27               ` David Maus
2010-07-20 11:37                 ` Bernt Hansen
2010-07-19 23:29 ` Sebastian Rose
2010-07-20 13:40 ` Peter Westlake

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

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0vaapnpaxw.fsf@gmail.com \
    --to=hellerm2@gmail.com \
    --cc=emacs-orgmode@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 public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).