Well... on a machine that was stille at 8.4.beta4, I stumble on the same point :
charpent@p-202-021:/usr/local/sage-8$ git pull error: cannot lock ref 'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict/misc': 'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict' existe ; impossible de créer 'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict/misc' Depuis git.sagemath.org:sage ! [nouvelle branche] u/embray/python3/sage-rings-polynomial-polydict/misc -> origin/u/embray/python3/sage-rings-polynomial-polydict/misc (impossible de mettre à jour la référence locale) * [nouvelle étiquette] 8.4.beta5 -> 8.4.beta5 * [nouvelle étiquette] 8.4.beta6 -> 8.4.beta6 More pruning seems needed... I got unwedged by Volker's "git remote update origin --prune". Thanks again, Volker ! Le vendredi 28 septembre 2018 14:53:57 UTC+2, Erik Bray a écrit : > > Yes, I think you're right. I deleted the problematic branch from that > repository and restarted the mirroring so we'll see. GitLab even > reported "Invalid reference name" as the relevant error. > > Well, hopefully I won't make that mistake again! > On Fri, Sep 28, 2018 at 2:49 PM Dima Pasechnik <dim...@gmail.com > <javascript:>> wrote: > > > > By the way, I would not be surprised if the mirror > > https://gitlab.com/sagemath/dev/trac > > failed to update due to the same problem on git.sagemath.org > > > > Read-only mirror of all the branches that are on trac.sagemath.org > > > > Project ID: 6249490 > > > > Mirrored from git://git.sagemath.org/sage.git. > > The repository failed to update 1 week ago. > > Repository mirroring has been paused due to too many failed attempts, > and can be resumed by a project maintainer. > > Last successful update 2 weeks ago. > > > > > > On Saturday, September 22, 2018 at 9:19:32 PM UTC+1, Erik Bray wrote: > >> > >> Try > >> > >> $ git branch -d origin/u/embray/python3/sage-rings-polynomial-polydict > >> > >> You wouldn't have the above branch without "origin" unless you created > a remote tracking branch. It's only remote branches which you're having a > problem with > >> > >> (note: this happened because I had an older branch named > u/embray/python3/sage-rings-polynomial-polydict, which I deleted, but then > I added a new branch called ...polydict/misc, and git gets ornery about > cases like that). > >> > >> Also, if I were you, I'd update my remote refspec to only fetch your > own branches. E.g., I only sync my branches by default like > >> > >> [remote "origin"] > >> url = g...@git.sagemath.org:sage.git > >> fetch = +refs/heads/u/embray/*:refs/remotes/u/embray > >> > >> In the (typically less common) case where you want to fetch someone > else's branch you can still give the branch name manually with the `git > fetch` command. > >> > >> > >> On Sat, Sep 22, 2018, 20:27 Emmanuel Charpentier < > emanuel.c...@gmail.com> wrote: > >>> > >>> Thanks, Dimitri ! > >>> > >>> But I'm not out of the woods : I do not know how to delete this > branch. Git tells me it doesn't know about it : > >>> > >>> charpent@asus16-ec:/usr/local/sage-8$ git branch -d > u/embray/python3/sage-rings-polynomial-polydict > >>> error: branche 'u/embray/python3/sage-rings-polynomial-polydict' non > trouvée. > >>> > >>> And indeed : > >>> > >>> charpent@asus16-ec:/usr/local/sage-8$ git branch --list > >>> * develop > >>> master > >>> r344_8_2 > >>> r344_8_3b0 > >>> t/24107/inclusion_of_openssl__stage_1 > >>> > >>> How can I proceed ? > >>> > >>> Le samedi 22 septembre 2018 20:11:17 UTC+2, Dima Pasechnik a écrit : > >>>> > >>>> On Sat, Sep 22, 2018 at 7:10 PM Dima Pasechnik <dim...@gmail.com> > wrote: > >>>> > > >>>> > You are not the one hit by this particular branch of our vast git > tree. See > >>>> > >>>> "the one" -> "the only one" > >>>> > >>>> > https://trac.sagemath.org/ticket/24762#comment:15 > >>>> > and the following comments. > >>>> > > >>>> > > >>>> > > >>>> > On Sat, 22 Sep 2018, 18:53 Emmanuel Charpentier, < > emanuel.c...@gmail.com> wrote: > >>>> >> > >>>> >> I wanted to update my (current) sage 8.4-beta4 to beta6 > >>>> >> > >>>> >> Fetch works okay. Then : > >>>> >> > >>>> >> charpent@asus16-ec:/usr/local/sage-8$ git status > >>>> >> Sur la branche develop > >>>> >> Votre branche est en retard sur 'origin/develop' de 652 commits, > et peut être mise à jour en avance rapide. > >>>> >> (utilisez "git pull" pour mettre à jour votre branche locale) > >>>> >> > >>>> >> Fichiers non suivis: > >>>> >> (utilisez "git add <fichier>..." pour inclure dans ce qui sera > validé) > >>>> >> > >>>> >> src/sage/libs/cypari2/ > >>>> >> > >>>> >> (Note : I have had this one for a long time. It seems to be a > sequel of a booboo in Sages git history. It is probablu *not* relevant to > my current problem).. > >>>> >> > >>>> >> aucune modification ajoutée à la validation mais des fichiers non > suivis sont présents (utilisez "git add" pour les suivre) > >>>> >> charpent@asus16-ec:/usr/local/sage-8$ git pull > >>>> >> error: cannot lock ref > 'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict/misc': > 'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict' > existe ; impossible de créer > 'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict/misc' > >>>> >> Depuis git.sagemath.org:sage > >>>> >> ! [nouvelle branche] > u/embray/python3/sage-rings-polynomial-polydict/misc -> > origin/u/embray/python3/sage-rings-polynomial-polydict/misc (impossible de > mettre à jour la référence locale) > >>>> >> > >>>> >> I do not know how to proceed. Suggestions ? > >>>> >> > >>>> >> -- > >>>> >> You received this message because you are subscribed to the Google > Groups "sage-devel" group. > >>>> >> To unsubscribe from this group and stop receiving emails from it, > send an email to sage-devel+...@googlegroups.com. > >>>> >> To post to this group, send email to sage-...@googlegroups.com. > >>>> >> Visit this group at https://groups.google.com/group/sage-devel. > >>>> >> For more options, visit https://groups.google.com/d/optout. > >>> > >>> -- > >>> You received this message because you are subscribed to the Google > Groups "sage-devel" group. > >>> To unsubscribe from this group and stop receiving emails from it, send > an email to sage-devel+...@googlegroups.com. > >>> To post to this group, send email to sage-...@googlegroups.com. > >>> Visit this group at https://groups.google.com/group/sage-devel. > >>> For more options, visit https://groups.google.com/d/optout. > > > > -- > > You received this message because you are subscribed to the Google > Groups "sage-devel" group. > > To unsubscribe from this group and stop receiving emails from it, send > an email to sage-devel+...@googlegroups.com <javascript:>. > > To post to this group, send email to sage-...@googlegroups.com > <javascript:>. > > Visit this group at https://groups.google.com/group/sage-devel. > > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
