On Friday, August 12, 2016 at 1:15:44 PM UTC-4, leif wrote: > > Joseph Hundley wrote: > > > > 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 > > <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? > > Did you pull 'develop' before running 'make' again?
No. I have in fact never used "git pull" at all. So, I guess develop would be the same thing it was initiated to when I ran git clone git://github.com/sagemath/sage.git [user@localhost ~]$ cd sage [user@localhost sage]$ git checkout develop (which was one or two days ago.) (I.e., is develop > at 7.4.beta0? -> 'git branch -v') > > hundleymac:sage jahundle$ git branch -v develop b630b41 Updated SageMath version to 7.3 master b630b41 Updated SageMath version to 7.3 * new16821 b630b41 Updated SageMath version to 7.3 t/16821/public/lie_algebras/classical-16821 abcf1e5 Fix citation problem > If so, you can > > git checkout -b new_16821 develop > > or > > git checkout -b new_16821 refs/tags/7.4.beta0 > > > (Or simply do the same with 7.3 / master if you prefer, and/or already > have that rather than 7.4.beta0 anyway.) > > > Thanks everyone very much for your help today. (And all summer.) Best, JH > -leif > > > > 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.
