Re: Release 9.5
Merçi beaucoup Bastien! One of those who does not contribute to the code but loves Orgmode El jue, 30-09-2021 a las 13:11 +0530, Pankaj Jangid escribió: > Bastien writes: > > > Org 9.5 is out, available from GNU ELPA. > > > > Thanks a lot to every contributor. > > > > Thanks a lot for your work, Bastien. I want to thank all the > contributors. > > One Q: what is the schedule for 9.5 to be included in Emacs-28? > > Regards ~Pankaj > >
Re: Release 9.5
Max Nikulin writes: On 01/10/2021 10:53, Jarmo Hurri wrote: Bastien writes: I just ran 'git pull' and got a warning and an error: warning: redirecting to https://git.savannah.gnu.org/git/emacs/org-mode.git/ Your configuration specifies to merge with the ref 'refs/heads/maint' from the remote, but no such ref was fetched. Maybe you are trying to pull while you are on master branch from old orgmode.org repository. You should either remove or rename old remote git remote rm origin I found these instructions (including the ones in the rest of the message) very helpful. Thanks! All the best, Tom -- Thomas S. Dye https://tsdye.online/tsdye
Re: Release 9.5
On 01/10/2021 10:53, Jarmo Hurri wrote: Bastien writes: I just ran 'git pull' and got a warning and an error: warning: redirecting to https://git.savannah.gnu.org/git/emacs/org-mode.git/ Your configuration specifies to merge with the ref 'refs/heads/maint' from the remote, but no such ref was fetched. Maybe you are trying to pull while you are on master branch from old orgmode.org repository. You should either remove or rename old remote git remote rm origin or git remote rename origin orgmode_org and git remote add origin https://git.savannah.gnu.org/git/emacs/org-mode.git git fetch origin git checkout main # or bugfix Even if you already added new repository earlier then maybe you are still on the master branch from old repository. Run "git fetch" with proper remote name and git checkout main git pull (not "maint" that is "bugfix" now) should help. The commands that should help to determine current state of your repository git remote -v show git status -sb Do I need to start a new clone from scratch, or is there a fix for this? Git may works with several remotes, so it is not necessary. (I honestly have _no recollection_ of what changes I have made, and what changes need to be made, to the cloned repository locally in order for 'make' to run successfully.) If you have a personal local branch, checkout it and rebase to "main" or "bugfix". If it is (or was) tracking remote changes, it may require adjustment.
Re: Release 9.5
Hi Jarmo, Jarmo Hurri writes: > warning: redirecting to https://git.savannah.gnu.org/git/emacs/org-mode.git/ > Your configuration specifies to merge with the ref 'refs/heads/maint' > from the remote, but no such ref was fetched. > > Do I need to start a new clone from scratch, or is there a fix for this? Perhaps ~$ git fetch --prune so that your local branches are sync'ed with the (new) remote ones? But starting from a fresh clone would do too, of course. -- Bastien
Re: Release 9.5
Bastien writes: > Pankaj Jangid writes: > >> One Q: what is the schedule for 9.5 to be included in Emacs-28? > > Org 9.5 have been merged in the Emacs master branch, from which the > Emacs release branch for 28.1 will be cut anytime soon. > > Then we will work on 9.5.1 for important bugfixes and merge 9.5.1 > in the Emacs release branch. > > I don't know when Emacs 28.1 will be released. Thanks a lot for your work, Bastien. I am already using it from master. Time to explore manual now. :-) Regards
Re: Release 9.5
Bastien writes: > Org 9.5 is out, available from GNU ELPA. Exciting! I just ran 'git pull' and got a warning and an error: warning: redirecting to https://git.savannah.gnu.org/git/emacs/org-mode.git/ Your configuration specifies to merge with the ref 'refs/heads/maint' from the remote, but no such ref was fetched. Do I need to start a new clone from scratch, or is there a fix for this? (I honestly have _no recollection_ of what changes I have made, and what changes need to be made, to the cloned repository locally in order for 'make' to run successfully.) Have fun and stay safe. Jarmo
Re: Release 9.5
> Org 9.5 is out, available from GNU ELPA. I bow to the ground in utter and humble gratitude! > Enjoy! I will, that is as certain as taxes and death! Cheers Rasmus
Re: Release 9.5
Hi Pankaj, Pankaj Jangid writes: > One Q: what is the schedule for 9.5 to be included in Emacs-28? Org 9.5 have been merged in the Emacs master branch, from which the Emacs release branch for 28.1 will be cut anytime soon. Then we will work on 9.5.1 for important bugfixes and merge 9.5.1 in the Emacs release branch. I don't know when Emacs 28.1 will be released. HTH, -- Bastien
Re: Release 9.5
Bastien writes: > Org 9.5 is out, available from GNU ELPA. > > Thanks a lot to every contributor. > Thanks a lot for your work, Bastien. I want to thank all the contributors. One Q: what is the schedule for 9.5 to be included in Emacs-28? Regards ~Pankaj
Re: Release 9.5 tomorrow
Hi Yasushi, Yasushi SHOJI writes: > It's not that important, but if you have time would you please take a > look at this: > https://list.orgmode.org/44f768b5-bade-e07a-29a7-15999eefd...@binghamton.edu/t/#mc90ae0a5266fe201d44e6f8f174b2d874f7c57fd I applied the three patches, with some modifications in the commit message. Please check https://orgmode.org/worg/org-contribute.html for further contributions. Thank you for the contribution! -- Bastien
Re: Release 9.5 tomorrow
Hi Bastien, It's not that important, but if you have time would you please take a look at this: https://list.orgmode.org/44f768b5-bade-e07a-29a7-15999eefd...@binghamton.edu/t/#mc90ae0a5266fe201d44e6f8f174b2d874f7c57fd Thanks, -- yashi On Tue, Sep 28, 2021 at 11:44 PM Bastien wrote: > > Hi all, > > I'll release Org 9.5 tomorrow between 2pm and 3pm, Paris time. > > Feel free to email me at b...@gnu.org if there is an important bugfix > (or a forgotten low-hanging patch) that needs to be committed. > > Thanks, > > -- > Bastien >
