Re: Switching to new Git repositories

2021-09-25 Thread Bastien
Hi Éibhear, Éibhear writes: > We're the tags missed in the migration across to savannah? Indeed they were, fixed now. Thanks a lot!

Re: Switching to new Git repositories

2021-09-25 Thread Bastien
Hi Marco, Marco Wahl writes: > Further I'll also try to have a look at the CONTRIBUTE file after it > will have been updated. Of course! I just updated it, applying a patch from Timothy, you can refer to it from now on. https://git.savannah.gnu.org/cgit/emacs/org-mode.git/tree/CONTRIBUTE --

Re: Switching to new Git repositories

2021-09-24 Thread Eric S Fraga
On Thursday, 23 Sep 2021 at 14:06, William Denton wrote: > Error (use-package): org/:catch: Invalid version syntax: ‘9.5-dev’ Minor aside: this version number causes problems with org-caldav-sync as well. It doesn't enable "(version< ...)" and related to work properly. -- : Eric S Fraga via

Re: Switching to new Git repositories

2021-09-23 Thread William Denton
On 23 September 2021, No Wayman wrote: There is a bug in mk/targets.mk introduced by 61336f80dc. As others have pointed out, the new repository does not have tags. As a fallback, org.el's version is read in it's header. However, it looks like Kyle forgot to trim that string so we get ORGVERSION

Re: Switching to new Git repositories

2021-09-23 Thread Kyle Meyer
No Wayman writes: > Out of curiosity I ran this against the repo to see if the > "Version" metadata had always followed its current convention: > > git grep "Version:" $(git rev-list --all) -- lisp/org.el > > Looks like the "-dev" suffix goes back to "9.4-dev" and before > that we have

Re: Switching to new Git repositories

2021-09-23 Thread Kyle Meyer
On 09/23/21 17:17:48 -0400, No Wayman wrote: >> Sounds like a weird issue. I don't think this 9.5-dev tag is >> something from the Org repo. > > There is a bug in mk/targets.mk introduced by 61336f80dc. Quoting that commit message for context: mk/targets.mk: Add version fallback for tag-less

Re: Switching to new Git repositories

2021-09-23 Thread No Wayman
Sounds like a weird issue. I don't think this 9.5-dev tag is something from the Org repo. There is a bug in mk/targets.mk introduced by 61336f80dc. As others have pointed out, the new repository does not have tags. As a fallback, org.el's version is read in it's header. However, it looks like

Re: Switching to new Git repositories

2021-09-23 Thread Marco Wahl
William Denton writes: > I'm seeing exactly the same, and the suggested rebase commands didn't change > it. > > I wonder if it's related to a problem I have on one of the two > machines (both Ubuntu, with identical setups) where I run Org from > source. > > On one, when I switched to the new

Re: Switching to new Git repositories

2021-09-23 Thread Colin Baxter
> Éibhear writes: > On 23/09/2021 19:06, William Denton wrote: >> I'm seeing exactly the same, and the suggested rebase commands >> didn't change it. > I'm guessing it's just that in the migration from code.orgmode.org > to git.savannah.gnu.org, the step to push the

Re: Switching to new Git repositories

2021-09-23 Thread Marco Wahl
Hi! Colin Baxter writes: >> Nick Dokos writes: > > > FWIW, I get $ git remote -v upstream > > https://git.savannah.gnu.org/git/emacs/org-mode.git (fetch) > > upstream https://git.savannah.gnu.org/git/emacs/org-mode.git > > (push) > > > $ git tag | wc -l 386 > > >

Re: Switching to new Git repositories

2021-09-23 Thread Éibhear
On 23/09/2021 19:06, William Denton wrote: > I'm seeing exactly the same, and the suggested rebase commands didn't > change it. I'm guessing it's just that in the migration from code.orgmode.org to git.savannah.gnu.org, the step to push the tags was not performed:

Re: Switching to new Git repositories

2021-09-23 Thread William Denton
I'm seeing exactly the same, and the suggested rebase commands didn't change it. I wonder if it's related to a problem I have on one of the two machines (both Ubuntu, with identical setups) where I run Org from source. On one, when I switched to the new repo, I got this on startup: Error

Re: Switching to new Git repositories

2021-09-23 Thread Colin Baxter
> Nick Dokos writes: > FWIW, I get $ git remote -v upstream > https://git.savannah.gnu.org/git/emacs/org-mode.git (fetch) > upstream https://git.savannah.gnu.org/git/emacs/org-mode.git > (push) > $ git tag | wc -l 386 > Maybe do > $ git remote update $ git

Re: Switching to new Git repositories

2021-09-23 Thread Nick Dokos
FWIW, I get $ git remote -v upstreamhttps://git.savannah.gnu.org/git/emacs/org-mode.git (fetch) upstreamhttps://git.savannah.gnu.org/git/emacs/org-mode.git (push) $ git tag | wc -l 386 Maybe do $ git remote update $ git rebase and try again? -- Nick "There are only two hard

Re: Switching to new Git repositories

2021-09-23 Thread Éibhear
On 20/09/2021 05:37, Bastien wrote: > Hi all, > > from now on, here are the official Org repositories: > > - org-mode: https://git.savannah.gnu.org/cgit/emacs/org-mode.git > - worg: https://git.sr.ht/~bzg/worg > - orgweb: https://git.sr.ht/~bzg/orgweb Hi, We're the tags missed in the migration

Re: Switching to new Git repositories

2021-09-20 Thread Eric S Fraga
Bastien, thank you. My bad: I tried to simply change the url in the .git/config but hadn't realised that the branch information etc. was different. I've cloned anew and everything is fine. -- : Eric S Fraga via Emacs 28.0.50, Org release_9.4.6-637-gd70f28 : Latest paper written in org:

Re: Switching to new Git repositories

2021-09-20 Thread Marco Wahl
Thanks you both! Thanks to you I use a suitable reference to the repo now! My first tiny commit landed in the new repo AFAICS. Note that I had wrongly filled out the form for the ssh-key on the savannah platform. Clearly this is my fault. BTW the documentation is all there on the savannah

Re: Switching to new Git repositories

2021-09-20 Thread Bastien
Hi Éric, Eric S Fraga writes: > On Monday, 20 Sep 2021 at 11:27, Bastien wrote: >> You need to create an account on https://savannah.gnu.org and have >> your username there being accepted in the Emacs group: > > What about those of us that do not wish to have write access but do want > to

Re: Switching to new Git repositories

2021-09-20 Thread Eric S Fraga
On Monday, 20 Sep 2021 at 11:27, Bastien wrote: > You need to create an account on https://savannah.gnu.org and have > your username there being accepted in the Emacs group: What about those of us that do not wish to have write access but do want to simply track the development? Neither of the

Re: Switching to new Git repositories

2021-09-20 Thread Bastien
Hi Marco, Marco Wahl writes: > My first attempt to commit to the new repo > https://git.savannah.gnu.org/cgit/emacs/org-mode.git failed. You need to create an account on https://savannah.gnu.org and have your username there being accepted in the Emacs group:

Re: Switching to new Git repositories

2021-09-20 Thread Timothy
Hi Marco, > My first attempt to commit to the new repo > failed. > > Would you mind to describe what preconditions are needed to be able to > commit? Is it just a question of using the right URL at clone time? > > Would you even update file

Re: Switching to new Git repositories

2021-09-20 Thread Marco Wahl
Hi Bastien, Thanks for all! > from now on, here are the official Org repositories: > > - org-mode: https://git.savannah.gnu.org/cgit/emacs/org-mode.git > - worg: https://git.sr.ht/~bzg/worg > - orgweb: https://git.sr.ht/~bzg/orgweb > > org-contrib will continue to be on