Erik Iverson <er...@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


_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode

Reply via email to