From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: Missing patch from Eric Schulte from 2013-10-09
Date: Mon, 06 Jan 2014 19:35:08 +0100 [thread overview]
Message-ID: <8761px9cwz.fsf@Rainer.invalid> (raw)
In-Reply-To: 87lhyt88jr.fsf@somewhere.org
Francesco Pizzolante writes:
> I understand, but I find it weird that a same version number (like
> 8.2.4) gives different functionalities/fixes/patches according to the
> git branch you take the sources from.
You don't understand what the version numbers mean.
> Shouldn't the maintenance branch keep the same version number until
> a new release is made (i.e. until the master branch is fully merged into
> the maint branch)?
The maint branch contains the release (8.2.4 for your example) plus
those patches that are purely bugfixes (i.e. do not alter, remove or
introduce features). In your example, eight such patches had
accumulated, placing you at commit f1b933: release_8.2.4-8-gf1b9339.
The master branch includes everything on maint plus any patches that
alter, remove or introduce features. That amounted to 350 commits past
the 8.2.4 release at the merge into master (d55f06), including those
eight from maint: release_8.2.4-350-gd55f063.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
next prev parent reply other threads:[~2014-01-06 18:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 12:28 Missing patch from Eric Schulte from 2013-10-09 Francesco Pizzolante
2013-12-22 8:46 ` Bastien
[not found] ` <87txe18e95.fsf-E3UqQZAQFPqWIDz0JBNUog@public.gmane.org>
2014-01-06 14:54 ` Francesco Pizzolante
2014-01-06 18:35 ` Achim Gratz [this message]
[not found] ` <8761px9cwz.fsf-9O0xPIFIXLULmYpASZe/Uw@public.gmane.org>
2014-01-07 12:58 ` Francesco Pizzolante
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=8761px9cwz.fsf@Rainer.invalid \
--to=stromeko@nexgo.de \
--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).