And, by the way, what is the remote you are pulling from? On Sat, Sep 22, 2018 at 7:33 PM Dima Pasechnik <dimp...@gmail.com> wrote: > > On Sat, Sep 22, 2018 at 7:27 PM Emmanuel Charpentier > <emanuel.charpent...@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 how about u/embray/python3/sage-rings-polynomial-polydict/misc ? > Does it exist? If yes, I'd try removing it and pull again... > > > > > 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+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.
-- 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.
