Missing patch from Eric Schulte from 2013-10-09

Missing patch from Eric Schulte from 2013-10-09

[Francesco Pizzolante]

Hi,

I noticed that I miss the following patch from Eric Schulte (from 2
months ago):
http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=15847336c39e7219e1c51c55d487f99956a06e34

I have Org-mode version 8.2.4 (8.2.4-8-gf1b933-elpaplus @
c:/Users/fpz/Documents/home/.emacs.d/elpa/org-plus-contrib-20131216/)
taken from elpa.

When I download the current stable release of Org-mode (version 8.2.4
from http://orgmode.org/) I see that this patch is missing too (the
org-babel-tangle-use-relative-file-links variable is missing).

Any chance to get this patch in elpa (without having to clone the git
master branch)?

Thanks a lot for your help,
 Francesco

Re: Missing patch from Eric Schulte from 2013-10-09

[Bastien]

Hi Francesco,

"Francesco Pizzolante"
<fpz-djc/iPCCuDYQheJpep6IedvLeJWuRmrY@public.gmane.org> writes:

> I noticed that I miss the following patch from Eric Schulte (from 2
> months ago):
> http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=15847336c39e7219e1c51c55d487f99956a06e34
>
> I have Org-mode version 8.2.4 (8.2.4-8-gf1b933-elpaplus @
> c:/Users/fpz/Documents/home/.emacs.d/elpa/org-plus-contrib-20131216/)
> taken from elpa.
>
> When I download the current stable release of Org-mode (version 8.2.4
> from http://orgmode.org/) I see that this patch is missing too (the
> org-babel-tangle-use-relative-file-links variable is missing).
>
> Any chance to get this patch in elpa (without having to clone the git
> master branch)?

The patch is in the master branch only, your best move is to clone
org-mode and follow that branch -- or wait until we make another
major release.

Thanks,

-- 
 Bastien

Re: Missing patch from Eric Schulte from 2013-10-09

[Francesco Pizzolante]

Hi Bastien,

>> I noticed that I miss the following patch from Eric Schulte (from 2
>> months ago):
>> http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=15847336c39e7219e1c51c55d487f99956a06e34
>>
>> I have Org-mode version 8.2.4 (8.2.4-8-gf1b933-elpaplus @
>> c:/Users/fpz/Documents/home/.emacs.d/elpa/org-plus-contrib-20131216/)
>> taken from elpa.
>>
>> When I download the current stable release of Org-mode (version 8.2.4
>> from http://orgmode.org/) I see that this patch is missing too (the
>> org-babel-tangle-use-relative-file-links variable is missing).
>>
>> Any chance to get this patch in elpa (without having to clone the git
>> master branch)?
>
> The patch is in the master branch only, your best move is to clone
> org-mode and follow that branch -- or wait until we make another
> major release.

Thanks for your answer.

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.

If I clone the master branch, I'll have version 8.2.4 with every patch.
While if I download a version (or take it from elpa), I will also have
version 8.2.4 --- but coming from the maint branch and thus with certain
patches (not all).

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)?

Maybe I'm wrong on certain points... any help on this is welcome.

Best regards,
 Francesco

Re: Missing patch from Eric Schulte from 2013-10-09

[Achim Gratz]

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

Re: Missing patch from Eric Schulte from 2013-10-09

[Francesco Pizzolante]

Hi Achim,

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

Thanks a lot for these clear explanations.

If I understand well, to find patches from the master branch in the
maint branch, I'll need to wait until the next major release, i.e.
release 8.3. Am I right?

Regards,
 Francesco