From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Missing patch from Eric Schulte from 2013-10-09 Date: Mon, 06 Jan 2014 19:35:08 +0100 Message-ID: <8761px9cwz.fsf@Rainer.invalid> References: <87a9fz7jb0.fsf@somewhere.org> <87txe18e95.fsf@bzg.ath.cx> <87lhyt88jr.fsf@somewhere.org> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0F1P-0004iE-VE for emacs-orgmode@gnu.org; Mon, 06 Jan 2014 13:35:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0F1J-0006L5-AQ for emacs-orgmode@gnu.org; Mon, 06 Jan 2014 13:35:31 -0500 Received: from plane.gmane.org ([80.91.229.3]:53376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0F1J-0006Kp-3s for emacs-orgmode@gnu.org; Mon, 06 Jan 2014 13:35:25 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0F1F-0002yN-Dt for emacs-orgmode@gnu.org; Mon, 06 Jan 2014 19:35:21 +0100 Received: from pd9eb0c6f.dip0.t-ipconnect.de ([217.235.12.111]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Jan 2014 19:35:21 +0100 Received: from Stromeko by pd9eb0c6f.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Jan 2014 19:35:21 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.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