Re: [O] Org release 7.8.04 (BUGFIX-only release)
Bastien writes: > Thanks a lot. Can you tell me how you created this patches and > what is the commit maint and master will correspond to after we > apply it? I've sent you a mail with the details. > Are there patches that have been applied and should be reapplied > in case we use your patches to get a fresh start? No, there's been no new commits since I made these patches and I've included everything commited during and after the faulty merge, so they should be good to go. But please check again, particularly for files that should or should not be in the respective branches. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf rackAttack V1.04R1: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Hi Achim, Achim Gratz writes: > Curses... here are the two patches Thanks a lot. Can you tell me how you created this patches and what is the commit maint and master will correspond to after we apply it? Are there patches that have been applied and should be reapplied in case we use your patches to get a fresh start? Best, -- Bastien
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Martyn Jago writes: > Since all the `errors' are whitespace it may be better to work around > the release? Nope, Gnus was sending the message before it was correctly composed. Since Gmane doesn't seem to want to post them to the list (or it does take wuite a bit onger than usual), here are the two fixed branches: git://repo.or.cz/org-mode/org-tableheadings.git/newmaster git://repo.or.cz/org-mode/org-tableheadings.git/newmaint You'll see that there aren't only white-space changes... Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ DIY Stuff: http://Synth.Stromeko.net/DIY.html
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Hi Since all the `errors' are whitespace it may be better to work around the release? Best Martyn Achim Gratz writes: > Achim Gratz writes: >> Well, all this "manual reverting" messed up master quite royally. I >> haven't checked maint, but things might be a bit easier there. I'm >> currently trying to re-trace what master and maint should have been and >> make a patch on top of the mangled versions... > > Here are two patches to clean up master and maint to where they should > be (IMHO, please check). Needless to say, you _will_ have to do another > release with these fixes. > > diff --git a/contrib/babel/langs/ob-oz.el b/contrib/babel/langs/ob-oz.el > index > 2482ed61685cde75f38f803f564ed128e1063e68..b778b4a228c6e75d982db81f280515806cbed4d6 > 100644 > --- a/contrib/babel/langs/ob-oz.el > +++ b/contrib/babel/langs/ob-oz.el > @@ -1,6 +1,6 @@ > ;;; ob-oz.el --- org-babel functions for Oz evaluation > > -;; Copyright (C) 2009-2012 Torsten Anders and Eric Schulte > +;; Copyright (C) 2009-2012 Torsten Anders and Eric Schulte > > ;; Author: Torsten Anders and Eric Schulte > ;; Keywords: literate programming, reproducible research > diff --git a/contrib/scripts/StartOzServer.oz > b/contrib/scripts/StartOzServer.oz > index > 9d41e838dc121b8a82e1516cb0e0d7fb7d0e6b72..db12dec58d783992529aa51273eeaf2e8e5fba38 > 100644 > --- a/contrib/scripts/StartOzServer.oz > +++ b/contrib/scripts/StartOzServer.oz > @@ -1,5 +1,5 @@ > %%% * > -%%% Copyright (C) 2009-2012 Torsten Anders (www.torsten-anders.de) > +%%% Copyright (C) 2009-2012 Torsten Anders (www.torsten-anders.de) > %%% This program is free software; you can redistribute it and/or > %%% modify it under the terms of the GNU General Public License > %%% as published by the Free Software Foundation; either version 2 > diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el > index > 2299dd47f4117ad16f3368f2c56df4b72dcd3424..06d193a1a17ce1054086c1a6e1386de3a3989593 > 100644 > --- a/lisp/ob-exp.el > +++ b/lisp/ob-exp.el > @@ -120,7 +120,7 @@ (defun org-babel-exp-src-block (body &rest headers) > (org-babel-noweb-wrap) "" (nth 1 info)) > (if (org-babel-noweb-p (nth 2 info) :export) > (org-babel-expand-noweb-references > - info (org-babel-exp-get-export-buffer)) > + info (org-babel-exp-get-export-buffer)) > (nth 1 info > (org-babel-exp-do-export info 'block hash) > > diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el > index > dbb9b22ef3cb825cd603c766d2a7ce47e63cea1c..d969a29213a0b92635afc4350ec7a722f1c7350d > 100644 > --- a/lisp/org-inlinetask.el > +++ b/lisp/org-inlinetask.el > @@ -90,7 +90,7 @@ (defgroup org-inlinetask nil > > (defcustom org-inlinetask-min-level 15 >"Minimum level a headline must have before it is treated as an inline task. > -Don't set it to something higher than `29' or clocking will break since this > +Don't set it to something higher than `29' or clocking will break since this > is the hardcoded maximum number of stars `org-clock-sum' will work with. > > It is strongly recommended that you set `org-cycle-max-level' not at all, > diff --git a/lisp/org-vm.el b/lisp/org-vm.el > index > 16987495b142fb10c81f4d61e21c6b43eda2b97b..b509c4108d16819bcb383ac89810484d9473f789 > 100644 > --- a/lisp/org-vm.el > +++ b/lisp/org-vm.el > @@ -71,7 +71,7 @@ (defun org-vm-store-link () > (save-excursion >(vm-select-folder-buffer) >(let* ((message (car vm-message-pointer)) > -(subject (vm-su-subject message)) > + (subject (vm-su-subject message)) >(to (vm-get-header-contents message "To")) >(from (vm-get-header-contents message "From")) > (message-id (vm-su-message-id message)) > diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el > index > f86d84ae336f940f5096007fad8a65e43a75ab68..342ebed0bf5e24a16d5d32f6732f48d3483c5530 > 100644 > --- a/testing/lisp/test-ob-exp.el > +++ b/testing/lisp/test-ob-exp.el > @@ -267,3 +267,4 @@ > (provide 'test-ob-exp) > > ;;; test-ob-exp.el ends here > + > diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el > index > 5f9e29cb4e2bf03044cefe6a0e7318a6faf8f497..b01e4b2ba2b8c350f1b81991b76a7a45050122cb > 100644 > --- a/testing/lisp/test-ob.el > +++ b/testing/lisp/test-ob.el > @@ -875,7 +875,7 @@ (defun test-ob-verify-result-and-removed-result (result > buffer-text) >(re-search-forward "\\#\\+results:" nil t) >(forward-line) >(should (string= > -"" > +"" > (buffer-substring-no-properties (point-at-bol) > (point-at-eol)) >(org-test-with-temp-text-in-file " > #+begin_src emacs-lisp :var a=2 > @@ -887,7 +887,7 @@ (defun test-ob-verify-result-and-removed-result (result > buffer-text) >(re-search-forward "\\#\\+results:" nil t) >
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Achim Gratz writes: > Here are two patches to clean up master and maint to where they should > be (IMHO, please check). Needless to say, you _will_ have to do another > release with these fixes. These aren't the patches you're looking for... I have sent the correct files already, but so far they didn't show up, probably because they are large. Hope they make it through... Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf microQ V2.22R2: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Achim Gratz writes: > Well, all this "manual reverting" messed up master quite royally. I > haven't checked maint, but things might be a bit easier there. I'm > currently trying to re-trace what master and maint should have been and > make a patch on top of the mangled versions... Here are two patches to clean up master and maint to where they should be (IMHO, please check). Needless to say, you _will_ have to do another release with these fixes. diff --git a/contrib/babel/langs/ob-oz.el b/contrib/babel/langs/ob-oz.el index 2482ed61685cde75f38f803f564ed128e1063e68..b778b4a228c6e75d982db81f280515806cbed4d6 100644 --- a/contrib/babel/langs/ob-oz.el +++ b/contrib/babel/langs/ob-oz.el @@ -1,6 +1,6 @@ ;;; ob-oz.el --- org-babel functions for Oz evaluation -;; Copyright (C) 2009-2012 Torsten Anders and Eric Schulte +;; Copyright (C) 2009-2012 Torsten Anders and Eric Schulte ;; Author: Torsten Anders and Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/contrib/scripts/StartOzServer.oz b/contrib/scripts/StartOzServer.oz index 9d41e838dc121b8a82e1516cb0e0d7fb7d0e6b72..db12dec58d783992529aa51273eeaf2e8e5fba38 100644 --- a/contrib/scripts/StartOzServer.oz +++ b/contrib/scripts/StartOzServer.oz @@ -1,5 +1,5 @@ %%% * -%%% Copyright (C) 2009-2012 Torsten Anders (www.torsten-anders.de) +%%% Copyright (C) 2009-2012 Torsten Anders (www.torsten-anders.de) %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License %%% as published by the Free Software Foundation; either version 2 diff --git a/lisp/ob-exp.el b/lisp/ob-exp.el index 2299dd47f4117ad16f3368f2c56df4b72dcd3424..06d193a1a17ce1054086c1a6e1386de3a3989593 100644 --- a/lisp/ob-exp.el +++ b/lisp/ob-exp.el @@ -120,7 +120,7 @@ (defun org-babel-exp-src-block (body &rest headers) (org-babel-noweb-wrap) "" (nth 1 info)) (if (org-babel-noweb-p (nth 2 info) :export) (org-babel-expand-noweb-references - info (org-babel-exp-get-export-buffer)) + info (org-babel-exp-get-export-buffer)) (nth 1 info (org-babel-exp-do-export info 'block hash) diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index dbb9b22ef3cb825cd603c766d2a7ce47e63cea1c..d969a29213a0b92635afc4350ec7a722f1c7350d 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -90,7 +90,7 @@ (defgroup org-inlinetask nil (defcustom org-inlinetask-min-level 15 "Minimum level a headline must have before it is treated as an inline task. -Don't set it to something higher than `29' or clocking will break since this +Don't set it to something higher than `29' or clocking will break since this is the hardcoded maximum number of stars `org-clock-sum' will work with. It is strongly recommended that you set `org-cycle-max-level' not at all, diff --git a/lisp/org-vm.el b/lisp/org-vm.el index 16987495b142fb10c81f4d61e21c6b43eda2b97b..b509c4108d16819bcb383ac89810484d9473f789 100644 --- a/lisp/org-vm.el +++ b/lisp/org-vm.el @@ -71,7 +71,7 @@ (defun org-vm-store-link () (save-excursion (vm-select-folder-buffer) (let* ((message (car vm-message-pointer)) -(subject (vm-su-subject message)) + (subject (vm-su-subject message)) (to (vm-get-header-contents message "To")) (from (vm-get-header-contents message "From")) (message-id (vm-su-message-id message)) diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el index f86d84ae336f940f5096007fad8a65e43a75ab68..342ebed0bf5e24a16d5d32f6732f48d3483c5530 100644 --- a/testing/lisp/test-ob-exp.el +++ b/testing/lisp/test-ob-exp.el @@ -267,3 +267,4 @@ (provide 'test-ob-exp) ;;; test-ob-exp.el ends here + diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el index 5f9e29cb4e2bf03044cefe6a0e7318a6faf8f497..b01e4b2ba2b8c350f1b81991b76a7a45050122cb 100644 --- a/testing/lisp/test-ob.el +++ b/testing/lisp/test-ob.el @@ -875,7 +875,7 @@ (defun test-ob-verify-result-and-removed-result (result buffer-text) (re-search-forward "\\#\\+results:" nil t) (forward-line) (should (string= - "" + "" (buffer-substring-no-properties (point-at-bol) (point-at-eol)) (org-test-with-temp-text-in-file " #+begin_src emacs-lisp :var a=2 @@ -887,7 +887,7 @@ (defun test-ob-verify-result-and-removed-result (result buffer-text) (re-search-forward "\\#\\+results:" nil t) (forward-line) (should (string= - ": 2" + ": 2" (buffer-substring-no-properties (point-at-bol) (point-at-eol))) (defun test-ob-verify-result-and-removed-result (result buffer-text) @@ -903,7 +903,7 @@ (defun test-ob-verify-result-and-removed-result (result buffer-text) (org-babel-next-src-block) (org-ctrl-c-ctrl-c) (org-ctrl-c-ctrl-c) (should (re-search-forward "\\#\\+results:"
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Bastien writes: >>> I released Org 7.8.05. >> >> Maint still needs to be merged back into master, otherwise master picks up >> 7.8.04 as the release version. > > Done, thanks for the heads up. Well, all this "manual reverting" messed up master quite royally. I haven't checked maint, but things might be a bit easier there. I'm currently trying to re-trace what master and maint should have been and make a patch on top of the mangled versions... Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf microQ V2.22R2: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Achim Gratz writes: > Bastien writes: >> There was something wrong in the process of releasing 7.8.04 >> (the release relied on the wrong branch.) >> >> I released Org 7.8.05. > > Maint still needs to be merged back into master, otherwise master picks up > 7.8.04 as the release version. Done, thanks for the heads up. > Also, you need to fix that version > script (still inserting the french month for the release date, maybe > wrap with LANG=C?). I usually run the script from the orgmode.org server, which is in english. I will think of LANG=C next time I run it from my computer, which should hopefully not happen soon. Thanks! -- Bastien
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Bastien writes: > There was something wrong in the process of releasing 7.8.04 > (the release relied on the wrong branch.) > > I released Org 7.8.05. Maint still needs to be merged back into master, otherwise master picks up 7.8.04 as the release version. Also, you need to fix that version script (still inserting the french month for the release date, maybe wrap with LANG=C?). Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Samples for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra
Re: [O] Org release 7.8.04 (BUGFIX-only release)
Hi all, Bastien writes: > I have just released Org 7.8.04 -- a BUGFIX-only release. There was something wrong in the process of releasing 7.8.04 (the release relied on the wrong branch.) I released Org 7.8.05. Thanks, -- Bastien
[O] Org release 7.8.04 (BUGFIX-only release)
Hi all, I have just released Org 7.8.04 -- a BUGFIX-only release. This is the version that we will merge into Emacs' trunk, and the one that will probably be shipped with Emacs 24.1 (soon to be released.) Org 7.8.04 does not contains the latest git version of the master branch, only that of the maint branch. If there are critical bugs that need to be fixed before Emacs 24.1, please point to them right now -- I will do the merge tomorrow at noon. Thanks to everyone who contributed to this release. And special thanks to Eric who did all the maintainance work behind the scene. Enjoy! http://orgmode.org/org-7.8.04.zip http://orgmode.org/org-7.8.04.tar.gz http://orgmode.org/org-mode-download.html -- Bastien
