On Aug 28, Dima Pasechnik wrote:
On Fri, Aug 28, 2020 at 1:23 PM 'Reimundo Heluani' via sage-devel <sage-devel@googlegroups.com> wrote:Thanks, I guess recompilation is unavoidable then, the worst part is that it was one of my own tickets :)well, why, just doing git diff against another branch does not touch your current tree. But, well, you are better off closely following the current beta.
I didn't pull, just fetch and tried the merge against FETCH_HEAD R
R. On Aug 28, Dima Pasechnik wrote: >On Fri, Aug 28, 2020 at 12:39 PM 'Reimundo Heluani' via sage-devel ><sage-devel@googlegroups.com> wrote: >> >> Hello, I am not familiar with the Trac server, I have a branch based on >> 9.2.beta2 locally that fails the automerge on trac. I suppose something >> changed between 9.2.beta2 and 9.2.beta10. Is there any way of seeing the logs >> to check what are the conflicts on the Trac server instead of trying to merge in my >> local copy? this is my working copy of Sage and I would not want to trigger >> recompilation of a bunch of packages that I've changed. > >your best bet is to git fetch the current development branch and >locally do a git diff against it. >Trac git server is pretty basic, there are no GitHub/GitLab-like >features for online diffs. > >HTH >Dima > >> >> R. >> >> -- >> 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/20200828113913.GA3893914%40vertex. > >-- >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/CAAWYfq1RXqSB%3Dqq5_kF9_OLmh815%2B1LhkZcNPFxCeXpp4u-BuA%40mail.gmail.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/20200828122340.GA39916%40rye.-- 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/CAAWYfq0v5dutrpCeQgtsUmrzkY6ie%2BM1QqbNkONNxCeExOTAcQ%40mail.gmail.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/20200828124057.GC3893914%40vertex.
signature.asc
Description: PGP signature
