* Missing patch from Eric Schulte from 2013-10-09 @ 2013-12-17 12:28 Francesco Pizzolante 2013-12-22 8:46 ` Bastien 0 siblings, 1 reply; 5+ messages in thread From: Francesco Pizzolante @ 2013-12-17 12:28 UTC (permalink / raw) To: mailing-list-org-mode 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Missing patch from Eric Schulte from 2013-10-09 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> 0 siblings, 1 reply; 5+ messages in thread From: Bastien @ 2013-12-22 8:46 UTC (permalink / raw) To: Francesco Pizzolante; +Cc: mailing-list-org-mode 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <87txe18e95.fsf-E3UqQZAQFPqWIDz0JBNUog@public.gmane.org>]
* Re: Missing patch from Eric Schulte from 2013-10-09 [not found] ` <87txe18e95.fsf-E3UqQZAQFPqWIDz0JBNUog@public.gmane.org> @ 2014-01-06 14:54 ` Francesco Pizzolante 2014-01-06 18:35 ` Achim Gratz 0 siblings, 1 reply; 5+ messages in thread From: Francesco Pizzolante @ 2014-01-06 14:54 UTC (permalink / raw) To: Bastien; +Cc: mailing-list-org-mode, 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Missing patch from Eric Schulte from 2013-10-09 2014-01-06 14:54 ` Francesco Pizzolante @ 2014-01-06 18:35 ` Achim Gratz [not found] ` <8761px9cwz.fsf-9O0xPIFIXLULmYpASZe/Uw@public.gmane.org> 0 siblings, 1 reply; 5+ messages in thread From: Achim Gratz @ 2014-01-06 18:35 UTC (permalink / raw) To: emacs-orgmode 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <8761px9cwz.fsf-9O0xPIFIXLULmYpASZe/Uw@public.gmane.org>]
* Re: Missing patch from Eric Schulte from 2013-10-09 [not found] ` <8761px9cwz.fsf-9O0xPIFIXLULmYpASZe/Uw@public.gmane.org> @ 2014-01-07 12:58 ` Francesco Pizzolante 0 siblings, 0 replies; 5+ messages in thread From: Francesco Pizzolante @ 2014-01-07 12:58 UTC (permalink / raw) To: Achim Gratz; +Cc: emacs-orgmode-mXXj517/zsQ 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-07 12:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
[not found] ` <8761px9cwz.fsf-9O0xPIFIXLULmYpASZe/Uw@public.gmane.org>
2014-01-07 12:58 ` Francesco Pizzolante
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).