On Saturday, February 6, 2016 at 9:28:36 AM UTC, jhonrubia6 wrote: > > So, if I understand you correctly, say I have sage 7.0 on my machine and > try to review some old ticket, do you recommend me to merge the ticket > branch with my copy > git merge tiket_branch > and then review it? > If the ticket does not compile ok for whatever reason, there will be no > way to get rid of it on my copy or am I wrong? >
# this is how to do this with plain git: git checkout -b tiket_brunch develop # now we are on a copy of develop, called tiket_brunch (or whatever) git fetch trac tiket_brunch git merge FETCH_HEAD # now we have merged branch from trac into tiket_brunch # now do make test stuff, etc git checkout develop make # now we are back to our develop # (you can now remove your local tiket_brunch using appropriate git commands) > > > El jueves, 4 de febrero de 2016, 21:49:36 (UTC+1), Volker Braun escribió: >> >> Just to point out the obvious: If you check out #18408 then you get >> Sage-6.8.beta7 >> >> You should merge in the latest Sage if you want to review that ticket; >> Its likely that there are merge conflicts anyways which need to be resolved >> first. >> >> On Thursday, February 4, 2016 at 7:52:20 PM UTC+1, Jeroen Demeyer wrote: >>> >>> On 2016-02-04 19:32, jhonrubia6 wrote: >>> > I passed that point and now fails building ecm,... >>> > I do not understand what I am making wrong. I had a working >>> installation >>> > on 7.0, then after checking out a ticket to review (#18408)I tried to >>> > build again and I'm having a lot of problems to get the installation >>> > working again >>> >>> This should be fixed by >>> http://trac.sagemath.org/ticket/19233 >>> >>> Which version of Sage is that? >>> >> -- 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.
