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 > > 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).
IMHO it's pretty ok (and sometimes even better) to rebase a branch on the latest *stable* version (i.e., pull/fetch and [or just] checkout master, here 7.3), unless the beta(s) already contain changes you have to rebase your branch on. It's often enough a headache to pull lots of completely unrelated stuff with a branch for trivial changes, causing need to rebuild for no real reason. Then switching back and having to rebuild a lot again. (And currently IPython 5.0 in beta0 is a specifically nice one for at least some.) > That is, you should rebase the branch over 7.4.beta0 > I.e.., > git checkout -b new16821 7.4.beta0 > git fetch trac public/lie_algebras/classical-16821 > git merge FETCH_HEAD > (the latter may require further actions, be alert...) If it doesn't, that's equivalent to just 'git pull ...'. For a merge (with or without conflicts to be manually solved), the working tree has to be clean, hence 'git stash' (or reset hard) before trying. -leif > 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.
