On Thu, Nov 5, 2020 at 10:08 AM brucew...@gmail.com <brucewestb...@gmail.com> wrote: > > This is off-topic but I don't know the right place to ask this question about > using git. > > I now have a detached HEAD at 9.3.beta0 > > I tried "git checkout master" and got some hints and then > fatal: 'master' matched multiple (2) remote tracking branches > > How do I get my develop branch back?
git branch lists all the local branches you have Then git checkout foo # or whatever will put you back to your (local) branch foo You probably want to merge 9.3.beta0 into your "develop" branch. Do git checkout develop git fetch trac develop # assuming "trac" is the name of git trac remote git merge trac/develop (the latter two commands can be combined into "git pull trac develop") HTH Dima > On Wednesday, 4 November 2020 at 23:10:23 UTC brucew...@gmail.com wrote: >> >> I removed libnauty (which was actually libnauty2) did "make libnauty" then >> "make giac" and finally "make build". >> It seems to have worked. That you all for your help and patience. >> >> On Wednesday, 4 November 2020 at 23:07:09 UTC dim...@gmail.com wrote: >>> >>> On Wed, Nov 4, 2020 at 10:00 PM Dima Pasechnik <dim...@gmail.com> wrote: >>> > >>> > On Wed, Nov 4, 2020 at 9:46 PM Matthias Koeppe <matthia...@gmail.com> >>> > wrote: >>> > > >>> > > On Wednesday, November 4, 2020 at 11:29:17 AM UTC-8, >>> > > brucew...@gmail.com wrote: >>> > >> >>> > >> "make giac" failed. I don't know why. >>> > >>> >>> > >>> >>> > > >>> > > From the log: >>> > > >>> > > /usr/bin/bash ../libtool --tag=CXX --mode=link g++ -std=gnu++11 -g -O2 >>> > > -fno-strict-aliasing -DGIAC_GENERIC_CONSTANTS -no-undefined >>> > > -Wl,-rpath-link,/home/bruce/sage-8.9.beta1/local/lib >>> > > -L/home/bruce/sage-8.9.beta1/local/lib >>> > > -Wl,-rpath,/home/bruce/sage-8.9.beta1/local/lib -o icas icas.o >>> > > libxcas.la -lreadline -lncurses -lcurl -lglpk -ldl -lm -lecm -lmpfi >>> > > -lmpfr -lgmp -L/home/bruce/sage-8.9.beta1/local/lib -lgsl -lm >>> > > -lopenblas -lm -L/home/bruce/sage-8.9.beta1/local/lib -lopenblas -lrt >>> > > -lpthread -lnauty -lcurl -lglpk -ldl -lm -lecm -lmpfi -lmpfr -lgmp >>> > > libtool: link: g++ -std=gnu++11 -g -O2 -fno-strict-aliasing >>> > > -DGIAC_GENERIC_CONSTANTS -Wl,-rpath-link >>> > > -Wl,/home/bruce/sage-8.9.beta1/local/lib -Wl,-rpath >>> > > -Wl,/home/bruce/sage-8.9.beta1/local/lib -o .libs/icas icas.o >>> > > -L/home/bruce/sage-8.9.beta1/local/lib ./.libs/libxcas.a >>> > > /home/bruce/sage-8.9.beta1/local/var/tmp/sage/build/giac-1.5.0.87p2.p1/src/src/.libs/libgiac.so >>> > > -lntl -lpari -lreadline -lncurses -lgsl -lopenblas -lrt -lpthread >>> > > -lnauty /usr/lib/x86_64-linux-gnu/libcurl.so -lglpk -ldl -lm -lecm >>> > > -lmpfi -lmpfr -lgmp -pthread -Wl,-rpath >>> > > -Wl,/home/bruce/sage-8.9.beta1/local/lib >>> > > /usr/bin/ld: >>> > > /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/libnauty.so: >>> > > undefined reference to `graph_free@CLIQUER_1' >>> > > /usr/bin/ld: >>> > > /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/libnauty.so: >>> > > undefined reference to `clique_unweighted_find_single@CLIQUER_1' >>> > > /usr/bin/ld: >>> > > /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/libnauty.so: >>> > > undefined reference to `graph_new@CLIQUER_1' >>> > > collect2: error: ld returned 1 exit status >>> > > >>> > > >>> > > Looks like the system libnauty is broken. What system is this? Try >>> > > removing the libnauty system package >>> > >>> > it is "mostly" Ubuntu 20.10, so >>> > https://ubuntu.pkgs.org/20.10/ubuntu-universe-arm64/libnauty2_2.7r1+ds-1_arm64.deb.html >>> > - with an interesting dependency, libcliquer >>> > Note that in Sage's configuration there is no such dependency, and >>> > this might be the problem here, I guess >>> >>> yes, that's how it looks like from the config.log posted here. I >>> suspect that it is a bug in giac, and >>> one has to link with libcliquer here too (is libnauty underlinked?) >>> >>> > >>> > >>> > > >>> > > -- >>> > > 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 view this discussion on the web visit >>> > > https://groups.google.com/d/msgid/sage-devel/2479bef3-22ef-48ec-a96b-7abdbdb53b37o%40googlegroups.com. > > -- > 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 view this discussion on the web visit > https://groups.google.com/d/msgid/sage-devel/46c65437-1729-48b3-9b4b-5305e7bfd20en%40googlegroups.com. -- 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 view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/CAAWYfq1OtUNtVv25DZEOMy5FH5RutPxkYg_FNypFdXxMVM3Bcg%40mail.gmail.com.
