On Friday, August 12, 2016 at 10:53:10 AM UTC-4, Dima Pasechnik wrote: > > > > On Friday, August 12, 2016 at 3:41:07 PM UTC+1, Jeroen Demeyer wrote: >> >> Your email is quite vague (for example, what is "version 16821")? >> >> I guess it's the current branch on https://trac.sagemath.org/ticket/16821 > > Yes. Exactly.
Right. So, I ran git reset --hard HEAD make clean make doc-clean and am now back to a state where make works. hundleymac:sage jahundle$ git status On branch develop Your branch is up-to-date with 'origin/develop'. nothing to commit, working tree clean > Normally speaking, you want to continue working on this ticket on the > current beta (although 7.4.beta0 is a bit > broken, as happens with some betas). > > That is, you should rebase the branch over 7.4.beta0 > I.e., > git checkout -b new16821 7.4.beta0 > fatal: Cannot update paths and switch to branch 'new16821' at the same time. Did you intend to checkout '7.4.beta0' which can not be resolved as commit? > git fetch trac public/lie_algebras/classical-16821 > git merge FETCH_HEAD > (the latter may require further actions, be alert...) > > > >> As long as you're not checking out a very old version of Sage, running >> "make" should work except maybe in docbuilding. If docbuilding fails, >> then "make doc-clean; make" should work. >> >> Could you give more details with the *exact* commands that you ran with >> the *exact* output that those commands produced? >> > -- 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.
